update

src/components/courseDetail.vue

@@ -2011,6 +2011,9 @@ export default {
   background: #fff;
   display: flex;
   align-items: center;
+  height: 46px;
+  line-height: 46px;
+  box-sizing: border-box;
 }
 
 .statebox div + div {

src/components/easy2/studyStudent.vue

@@ -1508,7 +1508,7 @@
 
                       <div class="comment" style="min-width: 200px">
                         <div class="worksName">
-                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex)">
+                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex,w.userid)">
                             {{ w.sName }}
                           </div>
                         </div>
@@ -2773,7 +2773,7 @@
 
                       <div class="comment" style="min-width: 200px">
                         <div class="worksName">
-                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex)">
+                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex,w.userid)">
                             {{ w.sName }}
                           </div>
                         </div>
@@ -4170,7 +4170,7 @@
 
                       <div class="comment" style="min-width: 200px">
                         <div class="worksName">
-                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex)">
+                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex,w.userid)">
                             {{ w.sName }}
                           </div>
                         </div>
@@ -6900,12 +6900,13 @@
                 placeholder="请输入学生名字"
                 style="margin-top: 10px"
               ></el-input> -->
-
-              <el-select style="margin-top: 10px" v-model="item.username" filterable allow-create placeholder="请选择学生">
+              <div class="pl_select_box" @click="getUpdateMore(true, checkUpload(), item.username, index)">{{
+                getSName(item.username) }}</div>
+              <!-- <el-select style="margin-top: 10px" v-model="item.username" filterable allow-create placeholder="请选择学生">
                 <el-option v-for="item1 in checkUpload" :key="item1.userid"
                   :label="item1.name ? item1.name : item1.username" :value="item1.userid">
                 </el-option>
-              </el-select>
+              </el-select> -->
 
               <div class="deleteWord" @click="clean2(index)">
                 <img src="../../assets/icon/deleteWorks.png" alt />
@@ -6930,14 +6931,16 @@
     </el-dialog>
     <el-dialog title="修改名称" :visible.sync="dialogVisibleSname" width="500px" :before-close="handleClose"
       class="dialog_diy" center>
-      <div style="text-align: center">
+      <div style="text-align: center;display: flex;align-items: center;justify-content: center;">
         <span class="tian1">名称</span>
-        <el-select v-model="worksSName" filterable allow-create style="width: 250px; margin: 15px 0px"
+        <div class="pl_select_box" style="margin-left:10px;width:200px"
+          @click="getUpdateMore(true, uploadStudentJuri, worksSid)">{{ getSName(worksSName) }}</div>
+        <!-- <el-select v-model="worksSName" filterable allow-create style="width: 250px; margin: 15px 0px"
           placeholder="请选择学生">
           <el-option v-for="item in uploadStudentJuri" :key="item.userid" :label="item.name ? item.name : item.username"
             :value="item.userid">
           </el-option>
-        </el-select>
+        </el-select> -->
         <!-- <el-input
           v-model="worksSName"
           style="width: 250px; margin: 15px 0px"
@@ -6950,6 +6953,8 @@
     </el-dialog>
     <interVideo :dialogVisibleVideo.sync="dialogVisibleVideo" :videoJson="videoJson" :userid="userid" :id="id"
       :courseType="courseType" :taskCount="taskCount" :toolindex="toolindex"></interVideo>
+    <UpdateMore :dialogVisibleMember.sync="dialogVisibleMember" :cList="uploadStudentJuri" :userid="userid"
+      :searchTN="worksSName2" @setPlname="setPlname"></UpdateMore>
   </div>
 </template>
 
@@ -6973,6 +6978,7 @@ import ImgDraw from "../tools/imgDraw/imgDraw";
 import { Empty } from "element-ui";
 import RecordRTC from "recordrtc";
 import interVideo from "../interVideo/index.vue"
+import UpdateMore from "../updateMore/updateMore.vue";
 
 export default {
   components: {
@@ -6989,7 +6995,8 @@ export default {
     Audio,
     ImgDraw,
     Table,
-    interVideo
+    interVideo,
+    UpdateMore
   },
   data() {
     return {
@@ -7287,13 +7294,30 @@ export default {
       checktoolArray: [],
       vChapterData: [],
       isUpdateToolDetail: false,
-      updateToolDetailInner: ''
+      updateToolDetailInner: '',
+      plIndex: "",
+      worksSName2: "",
+      worksSid: "",
     };
   },
   methods: {
     jump() {
       window.parent.postMessage({ tools: "43" }, "*");
     },
+    getUpdateMore(f, checkboxList, searchTN, index) {
+      this.dialogVisibleMember = f;
+      this.checkboxList = checkboxList;
+      this.worksSName2 = JSON.parse(JSON.stringify(searchTN));
+      this.plIndex = index;
+    },
+    setPlname(a) {
+      if (this.plworkFile.length) {
+        this.plworkFile[this.plIndex].username = a
+      } else {
+        this.worksSName = a
+      }
+      this.dialogVisibleMember = false
+    },
     previewImg(url) {
       this.$hevueImgPreview(url);
     },
@@ -7891,15 +7915,20 @@ export default {
           console.error(err);
         });
     },
-    selectUploadStudent() {
+    selectUploadStudent(type) {
+      const loading = this.$loading.service({
+        background: "rgba(255, 255, 255, 0.7)",
+        target: document.body,
+      });
       let params = {
-        cid: this.tcid ? this.tcid : this.courseDetail.juri,
+        cid: this.uploadCid,
         oid: this.oid,
-        cn: '',
+        cn: "",
       };
       this.ajax
         .get(this.$store.state.api + "selectSnameByCidGroup", params)
         .then((res) => {
+          loading.close();
           var studentK = [];
           if (this.isWorksS[this.toolindex].length > 0) {
             for (var z = 0; z < this.isWorksS[this.toolindex].length; z++) {
@@ -7908,10 +7937,23 @@ export default {
             studentK = studentK.join(",");
           }
           this.uploadStudentJuri = res.data[0].filter((el) => {
-            return studentK.indexOf(el.userid) == -1
+            return studentK.indexOf(el.userid) == -1;
           });
+          if (this.worksSName && this.worksSid) {
+            this.uploadStudentJuri.push({
+              userid: this.worksSid,
+              name: this.worksSName,
+            })
+          }
+          if(type == 1){
+            this.plworkFile = []
+            this.dialogVisibleSname = true;
+          }else if(type == 2){
+            this.dialogVisiblePl = true;
+          }
         })
         .catch((err) => {
+          loading.close();
           console.error(err);
         });
     },
@@ -11619,8 +11661,7 @@ export default {
           this.$message.error("提示：批量上传未添加班级权限，请添加班级或从班级入口进入。");
           return;
         }
-        this.selectUploadStudent();
-        this.dialogVisiblePl = true;
+        this.selectUploadStudent(2);
       } else if (t == 8) {
         if (this.libraryCount > 0) {
           this.updateCount(this.libraryCount, t);
@@ -12222,17 +12263,19 @@ export default {
       this.fulltype = type;
       this.fullUrl = url;
     },
-    openSname(n, id, i) {
+    openSname(n, id, i, uid) {
       this.snameWid = id;
       this.worksSName = n;
-      this.toolindex = i
-      this.uploadCid = this.tcid ? this.tcid : this.courseDetail.juri
+      this.worksSid = uid == n ? "" : uid;
+      this.toolindex = i;
+      this.uploadCid = this.tcid ? this.tcid : this.courseDetail.juri;
       if (!this.uploadCid) {
-        this.$message.error("提示：批量上传未添加班级权限，请添加班级或从班级入口进入。");
+        this.$message.error(
+          "提示：批量上传未添加班级权限，请添加班级或从班级入口进入。"
+        );
         return;
       }
-      this.selectUploadStudent()
-      this.dialogVisibleSname = true;
+      this.selectUploadStudent(1);
     },
     updateName() {
       let params = {
@@ -13020,6 +13063,18 @@ export default {
         });
         return a
       }
+    },
+    getSName() {
+      return function (name) {
+        var check = name;
+
+        this.uploadStudentJuri.forEach((el) => {
+          if (el.userid == check) {
+            check = el.name ? el.name : el.username
+          }
+        });
+        return check;
+      };
     }
   },
   mounted() {
@@ -16611,4 +16666,20 @@ ol {
   font-size: 14px;
   color: #868686;
 }
+
+.pl_select_box {
+  height: 40px;
+  line-height: 40px;
+  width: 100%;
+  cursor: pointer;
+  padding: 0 20px;
+  box-sizing: border-box;
+  border-radius: 5px;
+  border: 1px solid #d6d6d6;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  background: #fff;
+  text-align: left;
+}
 </style>

src/components/easy3/studyStudent.vue

@@ -1506,7 +1506,7 @@
 
                       <div class="comment" style="min-width: 200px">
                         <div class="worksName">
-                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex)">
+                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex,w.userid)">
                             {{ w.sName }}
                           </div>
                         </div>
@@ -2771,7 +2771,7 @@
 
                       <div class="comment" style="min-width: 200px">
                         <div class="worksName">
-                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex)">
+                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex,w.userid)">
                             {{ w.sName }}
                           </div>
                         </div>
@@ -4168,7 +4168,7 @@
 
                       <div class="comment" style="min-width: 200px">
                         <div class="worksName">
-                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex)">
+                          <div style="cursor: pointer" @click="openSname(w.sName, w.wid, toolIndex,w.userid)">
                             {{ w.sName }}
                           </div>
                         </div>
@@ -6898,12 +6898,13 @@
                 placeholder="请输入学生名字"
                 style="margin-top: 10px"
               ></el-input> -->
-
-              <el-select style="margin-top: 10px" v-model="item.username" filterable allow-create placeholder="请选择学生">
+              <div class="pl_select_box" @click="getUpdateMore(true, checkUpload(), item.username, index)">{{
+                getSName(item.username) }}</div>
+              <!-- <el-select style="margin-top: 10px" v-model="item.username" filterable allow-create placeholder="请选择学生">
                 <el-option v-for="item1 in checkUpload" :key="item1.userid"
                   :label="item1.name ? item1.name : item1.username" :value="item1.userid">
                 </el-option>
-              </el-select>
+              </el-select> -->
 
               <div class="deleteWord" @click="clean2(index)">
                 <img src="../../assets/icon/deleteWorks.png" alt />
@@ -6928,14 +6929,16 @@
     </el-dialog>
     <el-dialog title="修改名称" :visible.sync="dialogVisibleSname" width="500px" :before-close="handleClose"
       class="dialog_diy" center>
-      <div style="text-align: center">
+      <div style="text-align: center;display: flex;align-items: center;justify-content: center;">
         <span class="tian1">名称</span>
-        <el-select v-model="worksSName" filterable allow-create style="width: 250px; margin: 15px 0px"
+        <div class="pl_select_box" style="margin-left:10px;width:200px"
+          @click="getUpdateMore(true, uploadStudentJuri, worksSid)">{{ getSName(worksSName) }}</div>
+        <!-- <el-select v-model="worksSName" filterable allow-create style="width: 250px; margin: 15px 0px"
           placeholder="请选择学生">
           <el-option v-for="item in uploadStudentJuri" :key="item.userid" :label="item.name ? item.name : item.username"
             :value="item.userid">
           </el-option>
-        </el-select>
+        </el-select> -->
         <!-- <el-input
           v-model="worksSName"
           style="width: 250px; margin: 15px 0px"
@@ -6948,6 +6951,8 @@
     </el-dialog>
     <interVideo :dialogVisibleVideo.sync="dialogVisibleVideo" :videoJson="videoJson" :userid="userid" :id="id"
       :courseType="courseType" :taskCount="taskCount" :toolindex="toolindex"></interVideo>
+    <UpdateMore :dialogVisibleMember.sync="dialogVisibleMember" :cList="uploadStudentJuri" :userid="userid"
+      :searchTN="worksSName2" @setPlname="setPlname"></UpdateMore>
   </div>
 </template>
 
@@ -6971,6 +6976,7 @@ import ImgDraw from "../tools/imgDraw/imgDraw";
 import { Empty } from "element-ui";
 import RecordRTC from "recordrtc";
 import interVideo from "../interVideo/index.vue"
+import UpdateMore from "../updateMore/updateMore.vue";
 
 export default {
   components: {
@@ -6987,7 +6993,8 @@ export default {
     Audio,
     ImgDraw,
     Table,
-    interVideo
+    interVideo,
+    UpdateMore
   },
   data() {
     return {
@@ -7285,13 +7292,30 @@ export default {
       checktoolArray: [],
       vChapterData: [],
       isUpdateToolDetail: false,
-      updateToolDetailInner: ''
+      updateToolDetailInner: '',
+      plIndex: "",
+      worksSName2: "",
+      worksSid: "",
     };
   },
   methods: {
     jump() {
       window.parent.postMessage({ tools: "43" }, "*");
     },
+    getUpdateMore(f, checkboxList, searchTN, index) {
+      this.dialogVisibleMember = f;
+      this.checkboxList = checkboxList;
+      this.worksSName2 = JSON.parse(JSON.stringify(searchTN));
+      this.plIndex = index;
+    },
+    setPlname(a) {
+      if (this.plworkFile.length) {
+        this.plworkFile[this.plIndex].username = a
+      } else {
+        this.worksSName = a
+      }
+      this.dialogVisibleMember = false
+    },
     previewImg(url) {
       this.$hevueImgPreview(url);
     },
@@ -7889,15 +7913,20 @@ export default {
           console.error(err);
         });
     },
-    selectUploadStudent() {
+    selectUploadStudent(type) {
+      const loading = this.$loading.service({
+        background: "rgba(255, 255, 255, 0.7)",
+        target: document.body,
+      });
       let params = {
-        cid: this.tcid ? this.tcid : this.courseDetail.juri,
+        cid: this.uploadCid,
         oid: this.oid,
-        cn: '',
+        cn: "",
       };
       this.ajax
         .get(this.$store.state.api + "selectSnameByCidGroup", params)
         .then((res) => {
+          loading.close();
           var studentK = [];
           if (this.isWorksS[this.toolindex].length > 0) {
             for (var z = 0; z < this.isWorksS[this.toolindex].length; z++) {
@@ -7906,10 +7935,23 @@ export default {
             studentK = studentK.join(",");
           }
           this.uploadStudentJuri = res.data[0].filter((el) => {
-            return studentK.indexOf(el.userid) == -1
+            return studentK.indexOf(el.userid) == -1;
           });
+          if (this.worksSName && this.worksSid) {
+            this.uploadStudentJuri.push({
+              userid: this.worksSid,
+              name: this.worksSName,
+            })
+          }
+          if(type == 1){
+            this.plworkFile = []
+            this.dialogVisibleSname = true;
+          }else if(type == 2){
+            this.dialogVisiblePl = true;
+          }
         })
         .catch((err) => {
+          loading.close();
           console.error(err);
         });
     },
@@ -11477,8 +11519,7 @@ export default {
           this.$message.error("提示：批量上传未添加班级权限，请添加班级或从班级入口进入。");
           return;
         }
-        this.selectUploadStudent();
-        this.dialogVisiblePl = true;
+        this.selectUploadStudent(2);
       } else if (t == 8) {
         if (this.libraryCount > 0) {
           this.updateCount(this.libraryCount, t);
@@ -12080,17 +12121,19 @@ export default {
       this.fulltype = type;
       this.fullUrl = url;
     },
-    openSname(n, id, i) {
+    openSname(n, id, i, uid) {
       this.snameWid = id;
       this.worksSName = n;
-      this.toolindex = i
-      this.uploadCid = this.tcid ? this.tcid : this.courseDetail.juri
+      this.worksSid = uid == n ? "" : uid;
+      this.toolindex = i;
+      this.uploadCid = this.tcid ? this.tcid : this.courseDetail.juri;
       if (!this.uploadCid) {
-        this.$message.error("提示：批量上传未添加班级权限，请添加班级或从班级入口进入。");
+        this.$message.error(
+          "提示：批量上传未添加班级权限，请添加班级或从班级入口进入。"
+        );
         return;
       }
-      this.selectUploadStudent()
-      this.dialogVisibleSname = true;
+      this.selectUploadStudent(1);
     },
     updateName() {
       let params = {
@@ -12878,6 +12921,18 @@ export default {
         });
         return a
       }
+    },
+    getSName() {
+      return function (name) {
+        var check = name;
+
+        this.uploadStudentJuri.forEach((el) => {
+          if (el.userid == check) {
+            check = el.name ? el.name : el.username
+          }
+        });
+        return check;
+      };
     }
   },
   mounted() {
@@ -16471,4 +16526,20 @@ ol {
   font-size: 14px;
   color: #868686;
 }
+
+.pl_select_box {
+  height: 40px;
+  line-height: 40px;
+  width: 100%;
+  cursor: pointer;
+  padding: 0 20px;
+  box-sizing: border-box;
+  border-radius: 5px;
+  border: 1px solid #d6d6d6;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  background: #fff;
+  text-align: left;
+}
 </style>

src/components/updateMore/updateMore.vue

@@ -1,37 +1,19 @@
 <template>
-  <el-dialog
-    title="添加学生"
-    :visible.sync="dialogVisibleMember"
-    :append-to-body="true"
-    width="540px"
-    height="80%"
-    :before-close="handleClose"
-    class="addNewPP"
-  >
-    <div class="people">
+  <el-dialog title="添加学生" :visible.sync="dialogVisibleMember" :append-to-body="true" width="540px" height="80%"
+    :before-close="handleClose" class="addNewPP">
+    <div class="people" v-if="dialogVisibleMember">
       <div class="people_top">
         <div class="people_top_right">
           <div class="people_search">
-            <el-input placeholder="学生姓名" v-model="searchTN"></el-input>
-            <!-- <div class="search_img" @click="getStudent">
-              <img src="../../assets/icon/search.png" alt />
-            </div> -->
+            <el-input placeholder="填写自定义姓名" v-model="name" @change="nameChange"></el-input>
           </div>
         </div>
-        <div class="people_nav">选择成员</div>
+        <div class="people_nav">选择学生</div>
       </div>
       <div class="i_box_login2" v-if="cList.length">
-        <div
-          :class="{ active: checkboxList.indexOf(item.userid) != -1 }"
-          v-for="(item, index) in cList"
-          :key="index"
-          :label="item.userid"
-          @click="addGroupUser(item.userid, index)"
-        >
-          <el-tooltip
-            placement="top"
-            :content="item.name ? item.name : '暂无姓名'"
-          >
+        <div :class="{ active: cname == item.userid }" v-for="(item, index) in cList" :key="index"
+          :label="item.userid" @click="addGroupUser(item.userid)">
+          <el-tooltip placement="top" :content="item.name ? item.name : '暂无姓名'">
             <span>{{ item.name ? item.name : "暂无姓名" }}</span>
           </el-tooltip>
         </div>
@@ -40,7 +22,7 @@
     </div>
 
     <span slot="footer" class="dialog-footer">
-      <!-- <el-button @click="dialogVisibleMember = false">取 消</el-button> -->
+        <el-button @click="close">取 消</el-button>
       <el-button type="primary" @click="joinUpMore">确定</el-button>
     </span>
   </el-dialog>
@@ -52,72 +34,100 @@ export default {
   data() {
     return {
       checkboxList: [],
+      name:"",
+      cname:""
     };
   },
+  watch:{
+    dialogVisibleMember(n){
+      if(n){
+        let a = JSON.parse(JSON.stringify(this.searchTN))
+        let type = 1
+        this.cList.forEach(e => {
+          if(e.userid == a){
+            type = 2
+            this.cname = e.userid
+            this.name = ""
+          }
+        })
+        if(type == 1){
+          this.name = a;
+          this.cname = ""
+        }
+      }
+    }
+  },
   methods: {
     handleClose(done) {
+      this.close()
       done();
-      this.$emit("getUpdateMore", false, this.checkboxList, this.searchTN);
     },
-    addGroupUser(uid, i) {
-      if (this.checkboxList.length == 0) {
-        // if (this.checkboxList.indexOf(uid) == -1) {
-        this.checkboxList.push(uid);
-        this.searchTN = this.cList[i].name;
-        // } else {
-        //   this.checkboxList.splice(this.checkboxList.indexOf(uid), 1);
-        //   this.searchTN = "";
-        // }
-      } else {
-        if (this.checkboxList.indexOf(uid) != -1) {
-          this.checkboxList.splice(this.checkboxList.indexOf(uid), 1);
-          this.searchTN = "";
-        } else {
-          this.checkboxList = [];
-          this.checkboxList.push(uid);
-          this.searchTN = this.cList[i].name;
-        }
-      }
+    nameChange(){
+      this.cname = ""
+    },
+    addGroupUser(uid) {
+      this.cname = uid
+      this.name = "";
+    },
+    close(){
+      this.$emit("update:dialogVisibleMember",false)
     },
     joinUpMore() {
-      this.$emit("getUpdateMore", false, this.checkboxList, this.searchTN);
+      if(!this.cname && !this.name){
+        this.$message.error("请选择一个学生或者填写自定义姓名")
+      }
+      let a = this.name ? this.name : this.cname
+      this.$emit("setPlname",a)
     },
   },
+  mounted () {
+    let a = JSON.parse(JSON.stringify(this.searchTN))
+    let type = 1
+    this.cList.forEach(e => {
+      if(e.userid == a){
+        type = 2
+        this.cname = e.userid
+      }
+    })
+    if(type == 1){
+      this.name = a;
+    }
+  },
 };
 </script>
 
 <style scoped>
-.dialog_diy >>> .el-dialog__body {
+.dialog_diy>>>.el-dialog__body {
   padding: 0 30px !important;
 }
 
-.dialog_diy >>> .el-dialog {
+.dialog_diy>>>.el-dialog {
   margin-top: 10vh !important;
 }
 
-.dialog_diy >>> .el-dialog__header {
+.dialog_diy>>>.el-dialog__header {
   background: #454545 !important;
   padding: 15px 20px;
 }
 
-.dialog_diy >>> .el-dialog__title {
+.dialog_diy>>>.el-dialog__title {
   color: #fff;
 }
 
-.dialog_diy >>> .el-dialog__headerbtn {
+.dialog_diy>>>.el-dialog__headerbtn {
   top: 19px;
 }
 
-.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;
 }
 
@@ -154,7 +164,7 @@ export default {
   position: relative;
 }
 
-.people_search >>> .el-input__inner {
+.people_search>>>.el-input__inner {
   /* height: 25px; */
   width: 100%;
 }
@@ -171,7 +181,7 @@ export default {
   padding: 10px 25px 0;
 }
 
-.i_box_login2 > div {
+.i_box_login2>div {
   cursor: pointer;
   width: 80px;
   text-align: center;
@@ -186,16 +196,16 @@ export default {
   box-sizing: border-box;
 }
 
-.i_box_login2 > div:nth-child(5n) {
+.i_box_login2>div:nth-child(5n) {
   margin: 10px 0 0 0;
 }
 
-.i_box_login2 > .active {
+.i_box_login2>.active {
   background: rgb(92, 157, 255);
   color: #fff;
 }
 
-.i_box_login2 > div > span {
+.i_box_login2>div>span {
   width: 100%;
   overflow: hidden;
   white-space: nowrap;