update

src/components/pages/GM/teacher.vue

@@ -155,17 +155,17 @@
         <el-form-item label="教师名称" :label-width="formLabelWidth">
           <span>
             <el-input
-              placeholder="请输入教师昵称"
+              placeholder="请输入教师姓名"
               clearable
               v-model="sName"
               class="add_input"
             ></el-input>
           </span>
         </el-form-item>
-        <el-form-item label="教师邮箱" :label-width="formLabelWidth">
+        <el-form-item label="教师账号" :label-width="formLabelWidth">
           <span>
             <el-input
-              placeholder="请输入教师邮箱"
+              placeholder="请输入教师账号"
               clearable
               v-model="sMail"
               class="add_input"
@@ -269,7 +269,7 @@ export default {
         const {
           export_json_to_excel,
         } = require("../../../common/Export2Excel");
-        const tHeader = ["教师姓名", "教师邮箱", "学校"];
+        const tHeader = ["教师姓名", "教师账号", "学校"];
         const data = [];
         export_json_to_excel(tHeader, data, "上传教师样例");
       });
@@ -296,10 +296,10 @@ export default {
     insertStudent() {
       this.dialogVisible = true;
       if (this.sName === "") {
-        this.$message.error("教师昵称不能为空");
+        this.$message.error("教师姓名不能为空");
         return;
       } else if (this.sMail === "") {
-        this.$message.error("教师邮箱不能为空");
+        this.$message.error("教师账号不能为空");
         return;
       } else if (
         !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(this.sMail)
@@ -553,7 +553,7 @@ export default {
           this.da.map((v) => {
             let obj = {};
             obj.name = v["教师姓名"];
-            obj.mail = v["教师邮箱"];
+            obj.mail = v["教师账号"];
             obj.school = v["学校"];
             arr.push(obj);
           });
@@ -571,14 +571,14 @@ export default {
               break;
             } else if (item.mail === "") {
               _b = 1;
-              _this.$message.error("教师邮箱不能为空,请重新上传");
+              _this.$message.error("教师账号不能为空,请重新上传");
             }else if (
               !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
                 item.mail
               )
             ) {
               _b = 1;
-              _this.$message.error("有教师邮箱格式不正确,请重新上传");
+              _this.$message.error("有教师账号格式不正确,请重新上传");
               break;
             }
           }

src/components/pages/data.vue

@@ -56,11 +56,11 @@
               <el-radio label="女"></el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="昵称" prop="name">
+          <el-form-item label="姓名" prop="name">
             <el-input
               v-model="ruleForm.name"
               style="width: 300px"
-              placeholder="请输入昵称"
+              placeholder="请输入姓名"
             ></el-input>
           </el-form-item>
           <!-- <el-form-item label="邮箱" prop="mail">

src/components/pages/dataGM.vue

@@ -56,11 +56,11 @@
               <el-radio label="女"></el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="昵称" prop="name">
+          <el-form-item label="姓名" prop="name">
             <el-input
               v-model="ruleForm.name"
               style="width: 300px"
-              placeholder="请输入昵称"
+              placeholder="请输入姓名"
             ></el-input>
           </el-form-item>
           <!-- <el-form-item label="邮箱" prop="mail">

src/components/pages/student.vue

@@ -55,7 +55,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="账号" min-width="15" align="center">
+          <el-table-column label="学生账号" min-width="15" align="center">
             <template slot-scope="scope">
               <div>{{ scope.row.un ? scope.row.un : "" }}</div>
             </template>
@@ -104,7 +104,7 @@
       <el-form>
         <el-form-item label="学生姓名" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生昵称" clearable v-model="sName" class="add_input"></el-input>
+            <el-input placeholder="请输入学生姓名" clearable v-model="sName" class="add_input"></el-input>
           </span>
         </el-form-item>
         <el-form-item label="学生学号" :label-width="formLabelWidth">
@@ -117,9 +117,9 @@
             <el-input placeholder="请输入学生手机号" clearable v-model="sPhone" class="add_input"></el-input>
           </span>
         </el-form-item>
-        <el-form-item label="学生邮箱" :label-width="formLabelWidth">
+        <el-form-item label="学生账号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生邮箱" clearable v-model="sMail" class="add_input"></el-input>
+            <el-input placeholder="请输入学生账号" clearable v-model="sMail" class="add_input"></el-input>
           </span>
         </el-form-item>
         <el-form-item label="所属学校" :label-width="formLabelWidth">
@@ -147,7 +147,7 @@
       <el-form>
         <el-form-item label="学生名称" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生昵称" clearable v-model="userinfo.name" class="add_input"></el-input>
+            <el-input placeholder="请输入学生姓名" clearable v-model="userinfo.name" class="add_input"></el-input>
           </span>
         </el-form-item>
         <el-form-item label="学生学号" :label-width="formLabelWidth">
@@ -160,9 +160,9 @@
             <el-input placeholder="请输入学生手机号" clearable v-model="userinfo.phonenumber" class="add_input"></el-input>
           </span>
         </el-form-item>
-        <el-form-item label="学生邮箱" :label-width="formLabelWidth">
+        <el-form-item label="学生账号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生邮箱" clearable v-model="userinfo.un" class="add_input"></el-input>
+            <el-input placeholder="请输入学生账号" clearable v-model="userinfo.un" class="add_input"></el-input>
           </span>
         </el-form-item>
         <el-form-item label="所属学校" :label-width="formLabelWidth">
@@ -258,7 +258,7 @@ export default {
     getExcel(res) {
       require.ensure([], () => {
         const { export_json_to_excel } = require("../../common/Export2Excel");
-        const tHeader = ["学号", "学生姓名", "学生邮箱", "学生手机号", "班级"];
+        const tHeader = ["学号", "学生姓名", "学生账号", "学生手机号", "班级"];
         const data = [];
         export_json_to_excel(tHeader, data, "上传学生样例");
       });
@@ -285,7 +285,7 @@ export default {
     insertStudent() {
       this.dialogVisible = true;
       if (this.sName === "") {
-        this.$message.error("学生昵称不能为空");
+        this.$message.error("学生姓名不能为空");
         return;
       } else if (this.sByClass === "") {
         this.$message.error("请为学生选择班级");
@@ -320,7 +320,7 @@ export default {
           .get(this.$store.state.api + "findMail", params)
           .then((res) => {
             if (res.data[0].length > 0) {
-              this.$message.error("此学生邮箱已被注册");
+              this.$message.error("此学生账号已被注册");
             } else {
               // let params = { un: this.sId };
               // this.ajax
@@ -588,7 +588,7 @@ export default {
               "@cocorobo.cc";
             obj.sId = v["学号"];
             obj.name = v["学生姓名"];
-            obj.mail = v["学生邮箱"] ? v["学生邮箱"] : a;
+            obj.mail = v["学生账号"] ? v["学生账号"] : a;
             obj.phone = v["学生手机号"];
             obj.class = v["班级"];
             arr.push(obj);
@@ -620,7 +620,7 @@ export default {
             // }
             else if (item.mail === "") {
               _b = 1;
-              _this.$message.error("学生邮箱不能为空,请重新上传");
+              _this.$message.error("学生账号不能为空,请重新上传");
               break;
             } else if (
               !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
@@ -628,7 +628,7 @@ export default {
               )
             ) {
               _b = 1;
-              _this.$message.error("有学生邮箱格式不正确,请重新上传");
+              _this.$message.error("有学生账号格式不正确,请重新上传");
               break;
             }
             //  else if (item.school === "") {
@@ -750,7 +750,7 @@ export default {
             //         beforeSend: function (xhr) {},
             //         success: function (res, textStatus, jqXHR) {
             //           if (res[0].length > 0) {
-            //             _this.$message.error("有学生邮箱已被注册");
+            //             _this.$message.error("有学生账号已被注册");
             //             _a = 1;
             //           }
             //         },
@@ -874,7 +874,7 @@ export default {
                 z = 1;
               }
               if (res.data.type == 2) {
-                _this.$message.error("有学生邮箱已被注册");
+                _this.$message.error("有学生账号已被注册");
                 z = 1;
               }
               if (res.data.type == 3) {
@@ -950,7 +950,7 @@ export default {
     },
     updateStudent() {
       if (this.userinfo.name === "") {
-        this.$message.error("学生昵称不能为空");
+        this.$message.error("学生姓名不能为空");
         return;
       } else if (!this.userinfo.classid) {
         this.$message.error("请为学生选择班级");
@@ -973,7 +973,7 @@ export default {
             .get(this.$store.state.api + "findMail", params)
             .then((res) => {
               if (res.data[0].length > 0) {
-                this.$message.error("此学生邮箱已被注册");
+                this.$message.error("此学生账号已被注册");
               } else {
                 this.update_Student();
               }

src/components/pages/student/addCourse.vue

@@ -593,7 +593,7 @@
                                                     协同人员
                                                 </div>
                                                 <div style="margin-left:10px">
-                                                    <span class="tcMember"
+                                                    <span :class="{tcMember:getMan(tc)}"
                                                         v-for="(tc, tcIndex) in unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember"
                                                         :key="tcIndex">{{ getMan(tc) }}</span>
                                                 </div>
@@ -2537,7 +2537,7 @@ export default {
                         }
                     }
                 }
-                return _people
+                return this.ManAarray.length ? _people : ''
             }
         },
     },

src/components/pages/studentGM.vue

@@ -83,7 +83,7 @@
               </div>
             </template>
           </el-table-column>
-            <el-table-column label="账号" min-width="15" align="center">
+            <el-table-column label="学生账号" min-width="15" align="center">
             <template slot-scope="scope">
               <div>{{scope.row.un ? scope.row.un : "" }}</div>
             </template>
@@ -151,7 +151,7 @@
       <el-form class="inputClass">
         <el-form-item label="学生姓名" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生昵称" clearable v-model="sName" class="add_input"></el-input>
+            <el-input placeholder="请输入学生姓名" clearable v-model="sName" class="add_input"></el-input>
           </span>
         </el-form-item>
         <el-form-item label="学生学号" :label-width="formLabelWidth">
@@ -164,9 +164,9 @@
             <el-input placeholder="请输入学生手机号" clearable v-model="sPhone" class="add_input"></el-input>
           </span>
         </el-form-item>
-        <el-form-item label="学生邮箱" :label-width="formLabelWidth">
+        <el-form-item label="学生账号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生邮箱" clearable v-model="sMail" class="add_input"></el-input>
+            <el-input placeholder="请输入学生账号" clearable v-model="sMail" class="add_input"></el-input>
           </span>
         </el-form-item>
         <el-form-item label="所属学校" :label-width="formLabelWidth">
@@ -265,7 +265,7 @@ export default {
     getExcel(res) {
       require.ensure([], () => {
         const { export_json_to_excel } = require("../../common/Export2Excel");
-        const tHeader = ["学号", "学生姓名", "学生邮箱", "学生手机号", "班级"];
+        const tHeader = ["学号", "学生姓名", "学生账号", "学生手机号", "班级"];
         const data = [];
         export_json_to_excel(tHeader, data, "上传学生样例");
       });
@@ -292,7 +292,7 @@ export default {
     insertStudent() {
       this.dialogVisible = true;
       if (this.sName === "") {
-        this.$message.error("学生昵称不能为空");
+        this.$message.error("学生姓名不能为空");
         return;
       }  else if (this.sByClass === "") {
         this.$message.error("请为学生选择班级");
@@ -327,7 +327,7 @@ export default {
                 .get(this.$store.state.api + "findMail", params)
                 .then((res) => {
                   if (res.data[0].length > 0) {
-                    this.$message.error("此学生邮箱已被注册");
+                    this.$message.error("此学生账号已被注册");
                   } else {
                     // let params = { un: this.sId };
                     // this.ajax
@@ -596,7 +596,7 @@ export default {
             //   "@cocorobo.cc";
             obj.sId = v["学号"];
             obj.name = v["学生姓名"];
-            obj.mail = v["学生邮箱"];
+            obj.mail = v["学生账号"];
             obj.phone = v["学生手机号"];
             obj.class = v["班级"];
             arr.push(obj);
@@ -618,7 +618,7 @@ export default {
               _this.$message.error("学生学号不能为空,请重新上传");
             }else if (item.mail === "") {
               _b = 1;
-              _this.$message.error("学生邮箱不能为空,请重新上传");
+              _this.$message.error("学生账号不能为空,请重新上传");
               break;
             } else if (
               !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
@@ -626,7 +626,7 @@ export default {
               )
             ) {
               _b = 1;
-              _this.$message.error("有学生邮箱格式不正确,请重新上传");
+              _this.$message.error("有学生账号格式不正确,请重新上传");
               break;
             }
           }
@@ -648,7 +648,7 @@ export default {
                 z = 1;
               }
               if (res.data.type == 2) {
-                _this.$message.error("有学生邮箱已被注册");
+                _this.$message.error("有学生账号已被注册");
                 z = 1;
               }
               if (res.data.type == 3) {

src/components/pages/tencent/data.vue

@@ -60,7 +60,7 @@
             <el-input
               v-model="ruleForm.name"
               style="width: 300px"
-              placeholder="请输入昵称"
+              placeholder="请输入姓名"
             ></el-input>
           </el-form-item>
           <!-- <el-form-item label="邮箱" prop="mail">
@@ -102,7 +102,7 @@
               <el-option :value="ruleForm.sBySchool"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="联结学校" prop="cname">
+          <el-form-item label="联结学校" prop="cname" v-if="false">
             <el-select
               v-model="ruleForm.cname"
               clearable

src/components/pages/tencent/student.vue

@@ -68,7 +68,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="账号" min-width="15" align="center">
+          <el-table-column label="学生账号" min-width="15" align="center">
             <template slot-scope="scope">
               <div>{{ scope.row.un ? scope.row.un : "" }}</div>
             </template>
@@ -94,8 +94,8 @@
           <el-table-column label="操作" width="320px">
             <template slot-scope="scope">
               <div style="display:flex;align-items: center;">
-                <el-button type="primary" size="small"
-                  @click="checkCourse(scope.row.userid)">学生项目</el-button>
+                <!-- <el-button type="primary" size="small"
+                  @click="checkCourse(scope.row.userid)">学生项目</el-button> -->
                 <div class="delete" @click="deleteStudent(scope.row.userid, scope.row.state)">
                   <img src="../../../assets/remove.png" alt />
                 </div>
@@ -130,9 +130,9 @@
             <el-input placeholder="请输入学生手机号" clearable v-model="sPhone" class="add_input"></el-input>
           </span>
         </el-form-item> -->
-        <el-form-item label="学生邮箱" :label-width="formLabelWidth">
+        <el-form-item label="学生账号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生邮箱" clearable v-model="sMail" class="add_input"></el-input>
+            <el-input placeholder="请输入学生账号" clearable v-model="sMail" class="add_input"></el-input>
           </span>
         </el-form-item>
         <el-form-item label="所属学校" :label-width="formLabelWidth">
@@ -238,8 +238,8 @@ export default {
     getExcel(res) {
       require.ensure([], () => {
         const { export_json_to_excel } = require("../../../common/Export2Excel");
-        // const tHeader = ["学号", "学生姓名", "学生邮箱", "学生手机号", "班级"];
-        const tHeader = ["学生姓名", "学生邮箱", "班级"];
+        // const tHeader = ["学号", "学生姓名", "学生账号", "学生手机号", "班级"];
+        const tHeader = ["学生姓名", "学生账号", "班级"];
         const data = [];
         export_json_to_excel(tHeader, data, "上传学生样例");
       });
@@ -302,7 +302,7 @@ export default {
           .get(this.$store.state.api + "findMail", params)
           .then((res) => {
             if (res.data[0].length > 0) {
-              this.$message.error("此学生邮箱已被注册");
+              this.$message.error("此学生账号已被注册");
             } else {
               // let params = { un: this.sId };
               // this.ajax
@@ -571,7 +571,7 @@ export default {
             //   "@cocorobo.cc";
             obj.sId = v["学号"];
             obj.name = v["学生姓名"];
-            obj.mail = v["学生邮箱"];
+            obj.mail = v["学生账号"];
             obj.phone = v["学生手机号"];
             obj.class = v["班级"];
             arr.push(obj);
@@ -593,7 +593,7 @@ export default {
               _this.$message.error("学生学号不能为空,请重新上传");
             } else if (item.mail === "") {
               _b = 1;
-              _this.$message.error("学生邮箱不能为空,请重新上传");
+              _this.$message.error("学生账号不能为空,请重新上传");
               break;
             } else if (
               !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
@@ -601,7 +601,7 @@ export default {
               )
             ) {
               _b = 1;
-              _this.$message.error("有学生邮箱格式不正确,请重新上传");
+              _this.$message.error("有学生账号格式不正确,请重新上传");
               break;
             }
           }
@@ -623,7 +623,7 @@ export default {
                 z = 1;
               }
               if (res.data.type == 2) {
-                _this.$message.error("有学生邮箱已被注册");
+                _this.$message.error("有学生账号已被注册");
                 z = 1;
               }
               if (res.data.type == 3) {

src/components/pages/tencent/teacher.vue

@@ -155,17 +155,17 @@
         <el-form-item label="教师名称" :label-width="formLabelWidth">
           <span>
             <el-input
-              placeholder="请输入教师昵称"
+              placeholder="请输入教师姓名"
               clearable
               v-model="sName"
               class="add_input"
             ></el-input>
           </span>
         </el-form-item>
-        <el-form-item label="教师邮箱" :label-width="formLabelWidth">
+        <el-form-item label="教师账号" :label-width="formLabelWidth">
           <span>
             <el-input
-              placeholder="请输入教师邮箱"
+              placeholder="请输入教师账号"
               clearable
               v-model="sMail"
               class="add_input"
@@ -284,7 +284,7 @@ export default {
         const {
           export_json_to_excel,
         } = require("../../../common/Export2Excel");
-        const tHeader = ["教师姓名", "教师邮箱", "学校"];
+        const tHeader = ["教师姓名", "教师账号", "学校"];
         const data = [];
         export_json_to_excel(tHeader, data, "上传教师样例");
       });
@@ -312,10 +312,10 @@ export default {
       this.dialogVisible = true;
       if (this.org && this.org != "undefined" && this.org != "null") {
         if (this.sName === "") {
-          this.$message.error("教师昵称不能为空");
+          this.$message.error("教师姓名不能为空");
           return;
         } else if (this.sMail === "") {
-          this.$message.error("教师邮箱不能为空");
+          this.$message.error("教师账号不能为空");
           return;
         } else if (
           !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
@@ -330,10 +330,10 @@ export default {
         }
       } else {
         if (this.sName === "") {
-          this.$message.error("教师昵称不能为空");
+          this.$message.error("教师姓名不能为空");
           return;
         } else if (this.sMail === "") {
-          this.$message.error("教师邮箱不能为空");
+          this.$message.error("教师账号不能为空");
           return;
         } else if (
           !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
@@ -618,7 +618,7 @@ export default {
           this.da.map((v) => {
             let obj = {};
             obj.name = v["教师姓名"];
-            obj.mail = v["教师邮箱"];
+            obj.mail = v["教师账号"];
             obj.school = v["学校"];
             arr.push(obj);
           });
@@ -636,14 +636,14 @@ export default {
               break;
             } else if (item.mail === "") {
               _b = 1;
-              _this.$message.error("教师邮箱不能为空,请重新上传");
+              _this.$message.error("教师账号不能为空,请重新上传");
             } else if (
               !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
                 item.mail
               )
             ) {
               _b = 1;
-              _this.$message.error("有教师邮箱格式不正确,请重新上传");
+              _this.$message.error("有教师账号格式不正确,请重新上传");
               break;
             }
           }

src/components/tools/wangEnduit.vue

@@ -86,7 +86,7 @@ export default {
         // "foreColor",
         // "backColor",
         // "link",
-        "list",
+        // "list",
         // "todo",
         "justify",
         // "quote",