Browse Source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table

zengyicheng 2 years ago
parent
commit
cc381b77b4

+ 1 - 1
dist/index.html

@@ -25,4 +25,4 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.0e5f4483e237e450ba1e629a9d714a79.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.e8eb4c1cc481dbb543fc.js></script><script type=text/javascript src=./static/js/app.17066728673071b55b79.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
+    }</style><link href=./static/css/app.ccd952a755c7d35d013db8e7f6e10f71.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.e8eb4c1cc481dbb543fc.js></script><script type=text/javascript src=./static/js/app.1571d691593ed2a96759.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.0e5f4483e237e450ba1e629a9d714a79.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.ccd952a755c7d35d013db8e7f6e10f71.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.ccd952a755c7d35d013db8e7f6e10f71.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.1571d691593ed2a96759.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.1571d691593ed2a96759.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.17066728673071b55b79.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 89 - 111
src/components/pages/GM/school.vue

@@ -1,76 +1,45 @@
 <template>
-  <div
-    class="pb_content"
-    style="
+  <div class="pb_content" style="
       overflow: auto;
       margin: 0px;
       box-sizing: border-box;
       width: 100%;
       height: 100%;
-    "
-  >
+    ">
     <div>
-      <div
-        class="pb_content_body"
-        style="
+      <div class="pb_content_body" style="
           background: #fff;
           padding: 0px 25px;
           box-sizing: border-box;
           margin: 10px auto 0;
-        "
-      >
+        ">
         <div class="pb_head">
           <span>学校管理</span>
           <!-- <span>备注:教师可以根据课程、班级条件筛选学生并查看该学生信息</span> -->
         </div>
         <div class="student_head">
           <div class="student_search">
-            <el-button
-                class="btnClassGM"
-              size="small"
-              type="primary"
-              @click="dialogVisible = true"
-              v-if="step == 0"
-              >添加学校</el-button
-            >
+            <el-button class="btnClassGM" size="small" type="primary" @click="dialogVisible = true" v-if="step == 0">
+              添加学校</el-button>
           </div>
         </div>
       </div>
       <div class="pb_content_body" style="margin: 0 auto 10px;">
         <div class="student_table">
-          <el-table
-            ref="table"
-            :data="tableData"
-            stripe
-            border
-            :header-cell-style="{
-              background: '#f1f1f1',
-              'text-align': 'center',
-            }"
-            :cell-style="{ 'text-align': 'center' }"
-            style="width: 100%"
-            :height="tableHeight"
-            v-loading="isLoading"
-          >
+          <el-table ref="table" :data="tableData" stripe border :header-cell-style="{
+            background: '#f1f1f1',
+            'text-align': 'center',
+          }" :cell-style="{ 'text-align': 'center' }" style="width: 100%" :height="tableHeight"
+            v-loading="isLoading">
             <el-table-column prop="name" label="学校名称" min-width="70">
             </el-table-column>
             <el-table-column prop="date" label="操作" min-width="30">
               <template slot-scope="scope">
                 <div class="pb_buttonBox">
-                  <el-button
-                  class="btnClassGM"
-                    size="mini"
-                    type="primary"
-                    @click="updateS(scope.row.id, scope.row.name)"
-                    >修改</el-button
-                  >
-                  <el-button
-                  class="btnClassGM"
-                    size="mini"
-                    type="primary"
-                    @click="deleteSchool(scope.row.id)"
-                    >删除</el-button
-                  >
+                  <el-button class="btnClassGM" size="mini" type="primary"
+                    @click="updateS(scope.row.id, scope.row.name)">修改</el-button>
+                  <el-button class="btnClassGM" size="mini" type="primary" @click="deleteSchool(scope.row.id)">删除
+                  </el-button>
                 </div>
               </template>
             </el-table-column>
@@ -78,52 +47,26 @@
         </div>
       </div>
       <div class="student_page">
-        <el-pagination
-          background
-          layout="prev, pager, next"
-          :page-size="10"
-          :total="total"
-          v-if="page"
-          @current-change="handleCurrentChange"
-        ></el-pagination>
+        <el-pagination background layout="prev, pager, next" :page-size="10" :total="total" v-if="page"
+          @current-change="handleCurrentChange"></el-pagination>
       </div>
     </div>
-    <el-dialog
-      title="添加学校"
-      :visible.sync="dialogVisible"
-      width="500px"
-      :before-close="handleClose"
-      class="dialog_diy"
-      center
-    >
+    <el-dialog title="添加学校" :visible.sync="dialogVisible" width="500px" :before-close="handleClose" class="dialog_diy"
+      center>
       <div class="addBox">
         <span class="tian1">学校名称</span>
-        <el-input
-          v-model="schoolName"
-          style="width: 250px; margin: 15px 0px"
-          placeholder="请输入学校名称"
-        ></el-input>
+        <el-input v-model="schoolName" style="width: 250px; margin: 15px 0px" placeholder="请输入学校名称"></el-input>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button class="btnClassGM" type="primary" @click="addSchool">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="修改学校"
-      :visible.sync="dialogVisible1"
-      width="500px"
-      :before-close="handleClose"
-      class="dialog_diy"
-      center
-    >
+    <el-dialog title="修改学校" :visible.sync="dialogVisible1" width="500px" :before-close="handleClose" class="dialog_diy"
+      center>
       <div class="addBox">
         <span class="tian1">学校名称</span>
-        <el-input
-          v-model="schoolName"
-          style="width: 250px; margin: 15px 0px"
-          placeholder="请输入学校名称"
-        ></el-input>
+        <el-input v-model="schoolName" style="width: 250px; margin: 15px 0px" placeholder="请输入学校名称"></el-input>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible1 = false">取 消</el-button>
@@ -133,7 +76,7 @@
   </div>
 </template>
   
-  <script>
+<script>
 export default {
   data() {
     return {
@@ -354,7 +297,7 @@ export default {
                 });
             }
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         var list = this.fileList;
         if (list.length == 0) {
@@ -480,21 +423,34 @@ export default {
           id: id,
         },
       ];
-      this.ajax
-        .post(this.$store.state.api + "deleteSchoolAdmin", params)
-        .then((res) => {
-          this.$message({
-            message: "删除成功",
-            type: "success",
-          });
-          this.updateId = "";
-          this.schoolName = "";
-          this.selectSchool();
+      let _this = this
+      _this
+        .$confirm("确定删除此学校吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch((err) => {
-          this.$message.error("删除成功");
-          console.error(err);
+        .then(() => {
+          _this.ajax
+            .post(this.$store.state.api + "deleteSchoolAdmin", params)
+            .then((res) => {
+              _this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              _this.updateId = "";
+              _this.schoolName = "";
+              _this.selectSchool();
+            })
+            .catch((err) => {
+              _this.$message.error("删除成功");
+              console.error(err);
+            });
+        })
+        .catch(() => {
+          return;
         });
+
     },
     selectType(id) {
       this.tableData1 = [];
@@ -718,45 +674,55 @@ export default {
 };
 </script>
   
-  <style scoped>
-.pb_head > span:nth-child(2) {
+<style scoped>
+.pb_head>span:nth-child(2) {
   font-size: 16px;
   margin-left: 80px;
   color: #ab582f;
 }
+
 .addBox {
   display: flex;
   align-items: center;
   justify-content: center;
 }
+
 .tian1 {
   /* font-size: 16px; */
   margin-right: 10px;
 }
+
 .pb_head {
   margin: 0 !important;
   width: 100% !important;
 }
+
 .student_page {
   margin: 10px 0 0 45px;
 }
-.disUoloadSty >>> .el-upload--picture-card {
-  display: none; /* 上传按钮隐藏 */
+
+.disUoloadSty>>>.el-upload--picture-card {
+  display: none;
+  /* 上传按钮隐藏 */
 }
+
 .dialogBox {
   display: flex;
   align-items: center;
   justify-content: center;
 }
+
 .dialogBox span {
   margin: 0 20px;
 }
+
 .student_head {
   margin-top: 10px;
   padding-bottom: 15px;
   display: flex;
   justify-content: space-between;
 }
+
 .student_search,
 .student_search1 {
   display: flex;
@@ -772,43 +738,50 @@ export default {
   justify-content: space-between;
 }
 
-.student_table >>> .el-table--border td {
+.student_table>>>.el-table--border td {
   border-right: 0px !important;
 }
 
-.student_table >>> .el-table,
-.student_table >>> .el-table__body-wrapper {
+.student_table>>>.el-table,
+.student_table>>>.el-table__body-wrapper {
   height: auto !important;
 }
 
-.el-table >>> .even_row {
+.el-table>>>.even_row {
   background-color: #f1f1f1 !important;
 }
 
-.dialog_diy >>> .el-dialog__header {
+.dialog_diy>>>.el-dialog__header {
   padding: 9px 20px 10px;
   background: #32455b !important;
 }
-.dialog_diy >>> .el-dialog__title {
+
+.dialog_diy>>>.el-dialog__title {
   color: #fff;
   font-size: 15px;
 }
-.dialog_diy >>> .el-dialog__headerbtn {
+
+.dialog_diy>>>.el-dialog__headerbtn {
   top: 14px;
 }
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close {
+
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close {
   color: #fff;
 }
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
+
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close:hover {
   color: #fff;
 }
-.dialog_diy >>> .el-dialog__body,
-.dialog_diy >>> .el-dialog__footer {
+
+.dialog_diy>>>.el-dialog__body,
+.dialog_diy>>>.el-dialog__footer {
   background: #fafafa;
 }
-.r_diy >>> .el-dialog__footer {
+
+.r_diy>>>.el-dialog__footer {
   padding: 0;
 }
+
 .a_addBox {
   height: 570px;
   overflow: auto;
@@ -827,6 +800,7 @@ export default {
   padding: 20px;
   box-sizing: border-box;
 }
+
 .cancelbox {
   position: absolute;
   z-index: 2;
@@ -838,17 +812,21 @@ export default {
   padding: 0 90px 0px 0px;
   box-sizing: border-box;
 }
+
 .cardList {
   font-size: 14px;
   height: 360px;
   overflow: auto;
 }
+
 .cardList div {
   margin-bottom: 18px;
 }
+
 .cardList div:last-child {
   margin-bottom: 0;
 }
+
 .cardHead {
   display: flex;
 }

+ 1 - 1
src/components/pages/GM/teacher.vue

@@ -342,7 +342,7 @@ export default {
       this.ajax
         .post(this.$store.state.api + "batchRegistration1", params)
         .then((res) => {
-          debugger;
+          // debugger;
           let params = [
             {
               userid: res.data.uid,

File diff suppressed because it is too large
+ 204 - 514
src/components/pages/addCourse.vue


File diff suppressed because it is too large
+ 186 - 478
src/components/pages/addCourseGM.vue


+ 1 - 1
src/components/pages/worksDetail.vue

@@ -711,7 +711,7 @@ export default {
             } else {
               value.tType = 1;
             }
-            debugger;
+            // debugger;
             for (let j = 0; j < askArray.length; j++) {
               if (askArray[j].stage == value.stage) {
                 var _a = [];

+ 1 - 1
src/components/tools/jsmind.vue

@@ -320,7 +320,7 @@ export default {
       }
     },
     zoomOut() {
-      debugger;
+      // debugger;
       if (this.jm.view.zoomOut()) {
         this.isZoomIn = false;
       } else {

+ 1 - 1
src/components/tools/jsmind2.vue

@@ -225,7 +225,7 @@ export default {
       }
     },
     zoomOut() {
-      debugger;
+      // debugger;
       if (this.jm.view.zoomOut()) {
         this.isZoomIn = false;
       } else {

+ 1 - 1
src/components/tools/sunburst.vue

@@ -52,7 +52,7 @@ export default {
       });
     },
     setData() {
-      debugger
+      // debugger
 
       if (!Object.keys(this.Josn).length) {
         this.mindV = true;

+ 35 - 20
src/components/tools/wangEnduit.vue

@@ -1,10 +1,10 @@
-<template lang="html">  
-  <div class="editor"  >  
-    <div ref="toolbar" class="toolbar">  
-    </div>  
-    <div ref="editor" class="text">  
-    </div>  
-  </div>  
+<template lang="html">
+  <div class="editor">
+    <div ref="toolbar" class="toolbar">
+    </div>
+    <div ref="editor" class="text">
+    </div>
+  </div>
 </template>  
   
 <script>
@@ -34,9 +34,9 @@ export default {
       type: Boolean,
       default: false,
     },
-    placeholder:{
-      type:String,
-      default:"请输入正文"
+    placeholder: {
+      type: String,
+      default: "请输入正文"
     }
   },
   watch: {
@@ -68,25 +68,25 @@ export default {
         "head", //标题
         "bold", //加粗
         "fontSize", //字体大小
-        "fontName", //字体
-        "italic", //斜体
-        "underline", //下划线
-        "strikeThrough", //删除线
+        // "fontName", //字体
+        // "italic", //斜体
+        // "underline", //下划线
+        // "strikeThrough", //删除线
         "indent", //缩进
-        "lineHeight", //行高
+        // "lineHeight", //行高
         // "foreColor",
         // "backColor",
         // "link",
         "list",
-        "todo",
+        // "todo",
         "justify",
-        "quote",
+        // "quote",
         // "emoticon",
         "image",
         // "video",
         "table",
         // "code",
-        "splitLine",
+        // "splitLine",
         "undo",
         "redo",
       ];
@@ -120,7 +120,7 @@ export default {
                 file.name.split(".")[0] +
                 new Date().getTime() +
                 "." +
-                file.name.split(".")[file.name.split(".").length-1],
+                file.name.split(".")[file.name.split(".").length - 1],
               ContentType: file.type,
               Body: file,
               "Access-Control-Allow-Credentials": "*",
@@ -138,7 +138,7 @@ export default {
                 // console.log("Uploaded : " + parseInt((evt.loaded * 80) / evt.total) + '%');
               })
               .send(function (err, data) {
-                 loading.close();
+                loading.close();
                 if (err) {
                   that.$message.error("上传失败");
                 } else {
@@ -149,6 +149,19 @@ export default {
           }
         }
       };
+      //配置 自定义处理粘贴的文本内容
+      this.editor.config.pasteTextHandle = function (content) {
+        if (content == '' && !content) return ''
+        var str = content
+        str = str.replace(/<xml>[\s\S]*?<\/xml>/ig, '')
+        str = str.replace(/<style>[\s\S]*?<\/style>/ig, '')
+        str = str.replace(/<\/?[^>]*>/g, '')
+        str = str.replace(/[ | ]*\n/g, '\n')
+        str = str.replace(/&nbsp;/ig, '')
+        // console.log('****', content)
+        // console.log('****', str)
+        return str
+      };
       this.editor.config.onchange = (html) => {
         this.info_ = html; // 绑定当前逐渐地值
         this.$emit("change", this.info_); // 将内容同步到父组件中
@@ -167,9 +180,11 @@ export default {
   position: relative;
   z-index: 0;
 }
+
 .toolbar {
   border: 1px solid #ccc;
 }
+
 .text {
   border: 1px solid #ccc;
   height: 230px;

Some files were not shown because too many files changed in this diff