修改样式

src/components/pages/data.vue

@@ -60,7 +60,13 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="教研室" v-if="ruleForm.type == '老师'">
-            <div>{{ ccName ? ccName : '暂无' }}</div>
+            <el-select
+              v-model="ccName"
+              clearable
+              placeholder="暂无教研室"
+              disabled
+            >
+            </el-select>
           </el-form-item>
           <el-form-item label="姓名" prop="name">
             <el-input
@@ -135,7 +141,7 @@
               <!-- <el-option >学生 </el-option> -->
             </el-select>
           </el-form-item>
-          <el-form-item label="个人简介" prop="intro">
+          <!-- <el-form-item label="个人简介" prop="intro">
             <el-input
               v-model="ruleForm.intro"
               type="textarea"
@@ -144,10 +150,10 @@
               placeholder="想说点什么..."
               style="width: 300px"
             ></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item>
             <el-button type="primary" @click="submitForm('ruleForm')"
-              >修改</el-button
+              >保存</el-button
             >
           </el-form-item>
         </el-form>
@@ -167,7 +173,7 @@
                 :type="isLook ? 'type' : 'password'"
                 class="input"
                 v-model="password"
-                placeholder="请输入修改密码"
+                placeholder="请输入修改密码，长度为6-16位"
               ></el-input>
               <div class="eye" @click="changeEye">
                 <img :src="isLook ? eye : eyeOff" alt="" />
@@ -181,7 +187,7 @@
                 :type="isLook ? 'type' : 'password'"
                 class="input"
                 v-model="password1"
-                placeholder="请再次输入修改密码"
+                placeholder="请再次输入修改密码，长度为6-16位"
               ></el-input>
               <div class="eye" @click="changeEye">
                 <img :src="isLook ? eye : eyeOff" alt="" />
@@ -191,7 +197,7 @@
           <div class="input_box">
             <span></span>
             <div class="input">
-              <el-button type="primary" @click="updatePassword">修改</el-button>
+              <el-button type="primary" @click="updatePassword">保存</el-button>
             </div>
           </div>
         </div>
@@ -236,7 +242,7 @@ export default {
         org: "",
         headportrait: "",
       },
-      ccName:"",
+      ccName: "",
       opassword: "",
       password: "",
       password1: "",
@@ -311,7 +317,8 @@ export default {
           type: this.ruleForm.type == "老师" ? 1 : 2,
           oid: this.ruleForm.sBySchool,
           phone: this.ruleForm.phone,
-          intro: this.ruleForm.intro,
+          // intro: this.ruleForm.intro,
+          intro: "",
           sex: this.ruleForm.sex == "男" ? "0" : "1",
         },
       ];
@@ -398,6 +405,9 @@ export default {
       if (this.password.length < 6) {
         this.$message.error("密码长度不少于6位");
         return;
+      } else if (this.password.length > 16) {
+        this.$message.error("密码长度不能大于16位");
+        return;
       } else if (this.password != this.password1) {
         this.$message.error("两次新密码不相同");
         return;
@@ -563,4 +573,8 @@ export default {
   width: 100%;
   height: 100%;
 }
+
+.el-form-item >>> .el-select {
+  width: 300px;
+}
 </style>

src/components/pages/dataBoard/course/chartList/workNum.vue

@@ -1,7 +1,11 @@
 <template>
   <div class="data_body">
     <div style="width: 100%; height: 100%">
-      <div id="charts_canvas" class="echart" style="width: 100%; height: 100%"></div>
+      <div
+        id="charts_canvas"
+        class="echart"
+        style="width: 100%; height: 100%"
+      ></div>
     </div>
   </div>
 </template>
@@ -24,18 +28,29 @@ export default {
           name: "任务数量",
         },
         grid: {
-          top: '10%',
-          left: '5%',
-          right: '20%',
-          bottom: '5%',
-          containLabel: true
+          top: "10%",
+          left: "5%",
+          right: "20%",
+          bottom: "5%",
+          containLabel: true,
         },
         yAxis: {
           name: "作业提交数量",
         },
         color: ["#3681FC"],
         tooltip: {
-          trigger: "item",
+          formatter: function (params) {
+            return (
+              params.marker +
+              params.data[2] +
+              "<br/>" +
+              "任务数量：" +
+              params.data[0] +
+              "<br/>" +
+              "作业提交数量：" +
+              params.data[1]
+            );
+          },
         },
         series: [
           {
@@ -70,7 +85,7 @@ export default {
         data: [],
       };
       for (var i = 0; i < array.length; i++) {
-        this.ooption.data.push(array[i])
+        this.ooption.data.push(array[i]);
       }
       if (!this.chartObj) {
         this.setChart(this.ooption);

src/components/pages/dataBoard/course/index.vue

@@ -66,7 +66,10 @@
             ></CateRank>
           </div>
           <div class="halfBox middleBox" style="align-items: flex-start">
-            <WorkNum style="height: calc(100% - 40px)" :workNumList="workNumList"></WorkNum>
+            <WorkNum
+              style="height: calc(100% - 40px)"
+              :workNumList="workNumList"
+            ></WorkNum>
           </div>
         </div>
       </div>
@@ -173,7 +176,7 @@ export default {
       subjectArray: [],
       themeArray: [],
       allArray: [],
-      workNumList:[],
+      workNumList: [],
     };
   },
   mounted() {
@@ -436,7 +439,12 @@ export default {
           var wList = [];
           for (var i = 0; i < _workCourse.length; i++) {
             if (!wList[_workCourse[i].courseId]) {
-              wList[_workCourse[i].courseId] = { cid:_workCourse[i].courseId, task: 0, work: 0 };
+              wList[_workCourse[i].courseId] = {
+                cid: _workCourse[i].courseId,
+                title: _workCourse[i].title,
+                task: 0,
+                work: 0,
+              };
               let chapters = JSON.parse(_workCourse[i].chapters);
               for (var j = 0; j < chapters.length; j++) {
                 if (wList[_workCourse[i].courseId].task == 0) {
@@ -449,15 +457,19 @@ export default {
               }
             }
           }
-          for(var i =0;i<_workCourse.length;i++){
-            let a = Object.keys(wList)
-            for(var j =0;j<Object.keys(wList).length;j++){
-              if(_workCourse[i].courseId == wList[a[j]].cid){
-                wList[a[j]].work++
+          for (var i = 0; i < _workCourse.length; i++) {
+            let a = Object.keys(wList);
+            for (var j = 0; j < Object.keys(wList).length; j++) {
+              if (_workCourse[i].courseId == wList[a[j]].cid) {
+                wList[a[j]].work++;
               }
             }
           }
-          var workNumList = Object.values(wList).map(item => [item.task, item.work]);
+          var workNumList = Object.values(wList).map((item) => [
+            item.task,
+            item.work,
+            item.title,
+          ]);
           this.workNumList = workNumList;
         })
         .catch((err) => {