Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 2 years ago
parent
f68f2b2a21
commit
583be33714
13 changed files with 125 additions and 27 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.185bfae08cd5e37eab9656beb3a35810.css
  3. 0 0
      dist/static/css/app.185bfae08cd5e37eab9656beb3a35810.css.map
  4. 0 0
      dist/static/css/app.cf2c478c19aaf3bbd43bd8337f572a91.css
  5. 0 0
      dist/static/css/app.cf2c478c19aaf3bbd43bd8337f572a91.css.map
  6. 0 0
      dist/static/js/app.aef0ce3edc11b4438708.js
  7. 0 0
      dist/static/js/app.aef0ce3edc11b4438708.js.map
  8. 0 0
      dist/static/js/app.c806d9bb4cf7468242dc.js
  9. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  10. 106 19
      src/components/pages/addCourse.vue
  11. 8 3
      src/components/pages/easy/addCourse.vue
  12. 1 1
      src/components/pages/evaluation.vue
  13. 9 3
      src/components/pages/task/addCourse.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       height: 100%;
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.185bfae08cd5e37eab9656beb3a35810.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.c806d9bb4cf7468242dc.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.cf2c478c19aaf3bbd43bd8337f572a91.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.aef0ce3edc11b4438708.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


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


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


+ 106 - 19
src/components/pages/addCourse.vue
View File 

@@ -566,16 +566,16 @@
 
                             dragOverBottom: newIndex === tIndex && typeIndex == 'task-'+tIndex && oldIndex < tIndex && stageIndex == checkUnitIndex && dragType == 'task',
 
                             dragOverBottom: newIndex === tIndex && typeIndex == 'task-'+tIndex && oldIndex < tIndex && stageIndex == checkUnitIndex && dragType == 'task',
 
                           }" :style="{display:stage.toolOpen ? 'block' : 'none'}">
 
                           }" :style="{display:stage.toolOpen ? 'block' : 'none'}">
 
                         <div @dragstart="dragTaskStart(t, tIndex, stageIndex)" @dragover.prevent="dragTaskOver(tIndex, stageIndex)"
 
                         <div @dragstart="dragTaskStart(t, tIndex, stageIndex)" @dragover.prevent="dragTaskOver(tIndex, stageIndex)"
 
-                            @dragend="dragTaskEnd()" draggable @click="goToTask2(tIndex, stageIndex)" class="navTask" :class="{
 
+                            @dragend="dragTaskEnd()" draggable @click="goToTask2(tIndex, stageIndex)" class="navTask" style="padding-left: 12px;" :class="{
 
                           isNavTask:
 
                           isNavTask:
 
                             isClickColor > 0 && isClickColor == tIndex + 1 && stageIndex == unitIndex,
 
                             isClickColor > 0 && isClickColor == tIndex + 1 && stageIndex == unitIndex,
 
                           isNavOpen: t.toolOpen
 
                           isNavOpen: t.toolOpen
 
                         }">
 
                         }">
 
                           <div
 
                           <div
 
-                          style="left: 12px;"
 
+                          style="left: 20px;"
 
                             class="chapter_upload_drag"
 
                             class="chapter_upload_drag"
 
                           ></div>
 
                           ></div>
 
-                          <div class="nt_taskBox">
 
+                          <div class="nt_taskBox" style="width: calc(100% - 52px);">
 
                             <div class="nt_taskTitle">任务{{ tIndex + 1 }}：</div>
 
                             <div class="nt_taskTitle">任务{{ tIndex + 1 }}：</div>
 
                             <div class="nt_taskName">
 
                             <div class="nt_taskName">
 
                               <el-tooltip effect="light" :content="t.task ? t.task : '未命名任务'" placement="top">
 
                               <el-tooltip effect="light" :content="t.task ? t.task : '未命名任务'" placement="top">
 
@@ -2471,20 +2471,20 @@
 
                               <div v-if="itemTask.eList && itemTask.eList.length" class="elist_input">
 
                               <div v-if="itemTask.eList && itemTask.eList.length" class="elist_input">
 
                                 <div v-for="(eItem, eIndex) in itemTask.eList" :key="eIndex" class="elist_input_box">
 
                                 <div v-for="(eItem, eIndex) in itemTask.eList" :key="eIndex" class="elist_input_box">
 
                                   <span>评价名称：</span>
 
                                   <span>评价名称：</span>
 
-                                  <el-tooltip effect="dark" :content="itemTask.eList[eIndex].value || '填写评价名称'" placement="top" popper-class="text_tooltip2">
 
+                                  <!-- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].value || '填写评价名称'" placement="top" popper-class="text_tooltip2"> -->
 
                                     <input type="input" v-model="itemTask.eList[eIndex].value" placeholder="填写评价名称" />
 
                                     <input type="input" v-model="itemTask.eList[eIndex].value" placeholder="填写评价名称" />
 
-                                  </el-tooltip>
 
-                                  <span>评星等级：</span>
 
+                                  <!-- </el-tooltip> -->
 
+                                  <!-- <span>评星等级：</span>
 
                                   <el-rate v-model="itemTask.eList[eIndex].score" @change="setEListStar()"
 
                                   <el-rate v-model="itemTask.eList[eIndex].score" @change="setEListStar()"
 
-                                    disabled></el-rate>
 
+                                    disabled></el-rate> -->
 
                                   <div class="remove" @click="
 
                                   <div class="remove" @click="
 
                                     deletEList(unitIndex, itemTaskIndex, eIndex)
 
                                     deletEList(unitIndex, itemTaskIndex, eIndex)
 
                                     "></div>
 
                                     "></div>
 
                                   <div class="elist_inptu_text">
 
                                   <div class="elist_inptu_text">
 
                                     <span>评价描述：</span>
 
                                     <span>评价描述：</span>
 
-                                    <el-tooltip effect="dark" :content="itemTask.eList[eIndex].detail || '填写评价描述'" placement="top" popper-class="text_tooltip2">
 
+                                    <!-- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].detail || '填写评价描述'" placement="top" popper-class="text_tooltip2"> -->
 
                                       <input type="input" v-model="itemTask.eList[eIndex].detail" placeholder="填写评价描述" />
 
                                       <input type="input" v-model="itemTask.eList[eIndex].detail" placeholder="填写评价描述" />
 
-                                    </el-tooltip>
 
+                                    <!-- </el-tooltip> -->
 
                                   </div>
 
                                   </div>
 
                                   <div class="elist_inptu_text" v-if="evalua">
 
                                   <div class="elist_inptu_text" v-if="evalua">
 
                                     <span>目标：</span>
 
                                     <span>目标：</span>
 
@@ -2813,9 +2813,13 @@
 
               </div>
 
               </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
-          <div class="people_nav">选择成员</div>
 
+          <div class="people_nav" style="display: flex;align-items: center;">
 
+            <div class="check_class_left_title">选择成员</div>
 
+            <div style="display:flex;align-items:center;margin-left:auto;"><el-checkbox v-model="checkAll2"
 
+                @change="handleCheckAllChange2" class="all_check">全选</el-checkbox></div>
 
+          </div>
 
         </div>
 
         </div>
 
-        <el-checkbox-group v-model="checkboxList3" class="people_name" v-if="teacherJuri.length">
 
+        <el-checkbox-group v-model="checkboxList3" class="people_name" v-if="teacherJuri.length"  @change="InviteChange2">
 
           <el-checkbox v-for="item in teacherJuri" :key="item.userid" :label="item.userid">
 
           <el-checkbox v-for="item in teacherJuri" :key="item.userid" :label="item.userid">
 
             <div class="t_j_box">
 
             <div class="t_j_box">
 
               <el-tooltip placement="top" :content="item.name ? item.name : '暂无姓名'">
 
               <el-tooltip placement="top" :content="item.name ? item.name : '暂无姓名'">
 
@@ -3909,9 +3913,11 @@ export default {
 
   data() {
 
   data() {
 
     return {
 
     return {
 
       checkAll: false,
 
       checkAll: false,
 
+      checkAll2: false,
 
       chooseType: 1,
 
       chooseType: 1,
 
       checkedCities: [],
 
       checkedCities: [],
 
       isIndeterminate: true,
 
       isIndeterminate: true,
 
+      isIndeterminate2: true,
 
       isSysPic: false,
 
       isSysPic: false,
 
       isSysPic2: false,
 
       isSysPic2: false,
 
       steps: 1,
 
       steps: 1,
 
@@ -6228,6 +6234,20 @@ export default {
 
             }
 
             }
 
           }
 
           }
 
           this.teacherJuri = teacherJuri;
 
           this.teacherJuri = teacherJuri;
 
+
 
+          let _check = []
 
+          let _check2 = []
 
+          for (var i = 0; i < this.teacherJuri.length; i++) {
 
+            var gid = this.teacherJuri[i].userid
 
+            _check.push(gid)
 
+          }
 
+          for (var i = 0; i < this.checkboxList3.length; i++) {
 
+            var _id = this.checkboxList3[i]
 
+              if (_check.indexOf(_id) !== -1) {
 
+                _check2.push(_id)
 
+              }
 
+          }
 
+          this.checkAll2 = _check2.length === _check.length;
 
         })
 
         })
 
         .catch((err) => {
 
         .catch((err) => {
 
           console.error(err);
 
           console.error(err);
 
@@ -9544,6 +9564,34 @@ export default {
 
         this.getInviteCode(array[i]);
 
         this.getInviteCode(array[i]);
 
       }
 
       }
 
     },
 
     },
 
+    InviteChange2(val) {
 
+      console.log(val);
 
+      let _check = []
 
+      let _check2 = []
 
+      for (var i = 0; i < this.teacherJuri.length; i++) {
 
+        var gid = this.teacherJuri[i].userid
 
+        _check.push(gid)
 
+      }
 
+      for (var i = 0; i < this.checkboxList3.length; i++) {
 
+        var _id = this.checkboxList3[i]
 
+          if (_check.indexOf(_id) !== -1) {
 
+            _check2.push(_id)
 
+          }
 
+      }
 
+      this.checkAll2 = _check2.length === _check.length;
 
+      this.setMan();
 
+      return;
 
+      let array = JSON.parse(JSON.stringify(val));
 
+      this.inviteCode = this.inviteCode.filter((el) => {
 
+        if (val.indexOf(el.cid) != -1) {
 
+          array.splice(array.indexOf(el.cid), 1);
 
+          return el;
 
+        }
 
+      });
 
+      for (var i = 0; i < array.length; i++) {
 
+        this.getInviteCode(array[i]);
 
+      }
 
+    },
 
     handleCheckAllChange(val) {
 
     handleCheckAllChange(val) {
 
       if (val) {
 
       if (val) {
 
         for (var i = 0; i < this.grade2.length; i++) {
 
         for (var i = 0; i < this.grade2.length; i++) {
 
@@ -9569,6 +9617,31 @@ export default {
 
       }
 
       }
 
       this.isIndeterminate = false;
 
       this.isIndeterminate = false;
 
     },
 
     },
 
+    handleCheckAllChange2(val) {
 
+      if (val) {
 
+        for (var i = 0; i < this.teacherJuri.length; i++) {
 
+          var gid = this.teacherJuri[i].userid
 
+          if (this.checkboxList3.indexOf(gid) === -1) {
 
+            this.checkboxList3.push(gid)
 
+          }
 
+        }
 
+      } else {
 
+        let _check = []
 
+        let _check2 = []
 
+        for (var i = 0; i < this.teacherJuri.length; i++) {
 
+          var gid = this.teacherJuri[i].userid
 
+          _check.push(gid)
 
+        }
 
+        for (var i = 0; i < this.checkboxList3.length; i++) {
 
+          var _id = this.checkboxList3[i]
 
+          if (_check.indexOf(_id) === -1) {
 
+            _check2.push(_id)
 
+          }
 
+        }
 
+        this.checkboxList3 = _check2
 
+      }
 
+      this.isIndeterminate2 = false;
 
+    },
 
     async getInviteCode(cid) {
 
     async getInviteCode(cid) {
 
       let code = this.randomNumber();
 
       let code = this.randomNumber();
 
       let params = {
 
       let params = {
 
@@ -9912,9 +9985,15 @@ export default {
 
       this.oldIndex = i;
 
       this.oldIndex = i;
 
       this.oldData = val;
 
       this.oldData = val;
 
     },
 
     },
 
-    dragUnitOver(i, j) {
 
+    dragUnitOver(i) {
 
       this.typeIndex = "Unit-" + i
 
       this.typeIndex = "Unit-" + i
 
       this.newIndex = i;
 
       this.newIndex = i;
 
+      console.log(i,this.unitJson[i].toolOpen)
 
+      if(!this.unitJson[i].toolOpen && this.dragType == 'task'){
 
+        this.unitJson[i].toolOpen = true
 
+        this.updateWork()
 
+        this.$forceUpdate()
 
+      }
 
     },
 
     },
 
     dragUnitEnd() {
 
     dragUnitEnd() {
 
       if(this.dragType != 'Unit'){
 
       if(this.dragType != 'Unit'){
 
@@ -10912,14 +10991,14 @@ export default {
 
 
 
 .people_search>>>.el-input__inner {
 
 .people_search>>>.el-input__inner {
 
   /* height: 25px; */
 
   /* height: 25px; */
 
-  width: 95%;
 
+  width: 100%;
 
 }
 
 }
 
 
 
 .search_img {
 
 .search_img {
 
   width: 20px;
 
   width: 20px;
 
   height: 20px;
 
   height: 20px;
 
   position: absolute;
 
   position: absolute;
 
-  right: 30px;
 
+  right: 10px;
 
   top: 50%;
 
   top: 50%;
 
   transform: translateY(-50%);
 
   transform: translateY(-50%);
 
 }
 
 }
 
@@ -12280,7 +12359,9 @@ ol {
 
   margin-bottom: 10px;
 
   margin-bottom: 10px;
 
 }
 
 }
 
 
 
-.elist_input {}
 
+.elist_input {
 
+  width: 100%;
 
+}
 
 
 
 .elist_input_box {
 
 .elist_input_box {
 
   display: flex;
 
   display: flex;
 
@@ -12296,7 +12377,8 @@ ol {
 
   font: inherit;
 
   font: inherit;
 
   color: currentColor;
 
   color: currentColor;
 
   width: 100%;
 
   width: 100%;
 
-  max-width: calc(100% - 385px);
 
+  /* max-width: calc(100% - 385px); */
 
+  max-width: calc(100% - 70px);
 
   padding: 8px 14px;
 
   padding: 8px 14px;
 
   display: block;
 
   display: block;
 
   min-width: 0;
 
   min-width: 0;
 
@@ -13489,14 +13571,19 @@ ol {
 
   /* max-width: 130px; */
 
   /* max-width: 130px; */
 
   /* width: 100%; */
 
   /* width: 100%; */
 
   max-width: calc(100% - 66px);
 
   max-width: calc(100% - 66px);
 
-  white-space: nowrap;
 
-  overflow: hidden;
 
-  text-overflow: ellipsis;
 
   font-size: 16px;
 
   font-size: 16px;
 
   color: #060E17;
 
   color: #060E17;
 
   /* color: #0E1E33; */
 
   /* color: #0E1E33; */
 
 }
 
 }
 
 
 
+.navTask .nt_taskName span{
 
+  width: 100%;
 
+  white-space: nowrap;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  display:block;
 
+}
 
+
 
 .gjBox {
 
 .gjBox {
 
   width: calc(100% - 25px);
 
   width: calc(100% - 25px);
 
   padding: 0 0 0 0;
 
   padding: 0 0 0 0;

+ 8 - 3
src/components/pages/easy/addCourse.vue
View File 

@@ -13276,14 +13276,19 @@ ol {
 
   /* max-width: 130px; */
 
   /* max-width: 130px; */
 
   /* width: 100%; */
 
   /* width: 100%; */
 
   max-width: calc(100% - 66px);
 
   max-width: calc(100% - 66px);
 
-  white-space: nowrap;
 
-  overflow: hidden;
 
-  text-overflow: ellipsis;
 
   font-size: 16px;
 
   font-size: 16px;
 
   color: #060E17;
 
   color: #060E17;
 
   /* color: #0E1E33; */
 
   /* color: #0E1E33; */
 
 }
 
 }
 
 
 
+.navTask .nt_taskName span{
 
+  width: 100%;
 
+  white-space: nowrap;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  display:block;
 
+}
 
+
 
 .gjBox {
 
 .gjBox {
 
   width: calc(100% - 25px);
 
   width: calc(100% - 25px);
 
   padding: 0 0 0 0;
 
   padding: 0 0 0 0;

+ 1 - 1
src/components/pages/evaluation.vue
View File 

@@ -76,7 +76,7 @@
 
                   type="primary"
 
                   type="primary"
 
                   size="small"
 
                   size="small"
 
                   @click="checkE(scope.row)"
 
                   @click="checkE(scope.row)"
 
-                  >查看</el-button
 
+                  >编辑</el-button
 
                 >
 
                 >
 
                 <el-button
 
                 <el-button
 
                   class="de_button"
 
                   class="de_button"

+ 9 - 3
src/components/pages/task/addCourse.vue
View File 

@@ -16944,14 +16944,20 @@ ol {
 
   /* max-width: 130px; */
 
   /* max-width: 130px; */
 
   /* width: 100%; */
 
   /* width: 100%; */
 
   max-width: calc(100% - 66px);
 
   max-width: calc(100% - 66px);
 
-  white-space: nowrap;
 
-  overflow: hidden;
 
-  text-overflow: ellipsis;
 
   font-size: 16px;
 
   font-size: 16px;
 
   color: #060e17;
 
   color: #060e17;
 
   /* color: #0E1E33; */
 
   /* color: #0E1E33; */
 
 }
 
 }
 
 
 
+.navTask .nt_taskName span{
 
+  width: 100%;
 
+  white-space: nowrap;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  display:block;
 
+}
 
+
 
+
 
 .gjBox {
 
 .gjBox {
 
   width: calc(100% - 25px);
 
   width: calc(100% - 25px);
 
   padding: 0 0 0 0;
 
   padding: 0 0 0 0;

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