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

src/components/pages/kindStudentEva/test/diary.vue

@@ -2,8 +2,8 @@
   <div class="diary">
     <div class="diary-content">
       <!-- 分类与导出 -->
-      <div class="top" :style="{marginBottom: !ftypeId?0:80+'px'}">
-        <div class="oneType" >
+      <div class="top" :style="{ marginBottom: !ftypeId ? 0 : 80 + 'px' }">
+        <div class="oneType">
           <div class="all_choose" style="margin: 0;">
             <div
               @click="clickFtypeId('')"
@@ -28,13 +28,13 @@
               v-if="VeidooJson[item.id].length"
               @click="clickFtypeId(item.id)"
               :class="ftypeId == item.id ? 'onTypeTxt' : 'onTypeTxt2'"
-              style="position: relative;"
+              style="position: relative"
             >
               <span>{{ item.name }}</span>
-              <div
+              <!-- <div
                 class="line"
                 :style="{ display: ftypeId == item.id ? 'block' : 'none' }"
-              ></div>
+              ></div> -->
             </div>
             <!-- 子分类 -->
             <div class="typeCss" v-if="VeidooJson[item.id].length">
@@ -81,7 +81,7 @@
         header-align="center"
         :header-cell-style="{
           background: '#E0EAFB',
-          color: 'rgba(0, 0, 0, 0.90)'
+          color: 'rgba(0, 0, 0, 0.90)',
         }"
         @selection-change="handleSelectionChange"
       >
@@ -199,21 +199,21 @@
 import popbox from "./component/popbox";
 export default {
   components: {
-    popbox
+    popbox,
   },
   props: {
     userid: {
-      type: String
+      type: String,
     },
     oid: {
-      type: String
+      type: String,
     },
     org: {
-      type: String
+      type: String,
     },
     cid: {
-      type: String
-    }
+      type: String,
+    },
   },
   data() {
     return {
@@ -251,7 +251,7 @@ export default {
       studentList: [],
       judgeNum: 0,
       ftypeId: "",
-      stypeId: ""
+      stypeId: "",
     };
   },
   methods: {
@@ -259,8 +259,8 @@ export default {
     clickFtypeId(e) {
       this.ftypeId = e;
       this.stypeId = "";
-      this.page = 1
-      this.total=0
+      this.page = 1;
+      this.total = 0;
       this.getData();
     },
     clickStypeId(e) {
@@ -287,11 +287,11 @@ export default {
     getVeidooType() {
       let params = {
         org: this.org,
-        oid: this.oid
+        oid: this.oid,
       };
       this.ajax
         .get(this.$store.state.api + "selectSTEType", params)
-        .then(res => {
+        .then((res) => {
           var ftype = res.data[0]; //公共父级分类
           var stype = res.data[1]; //公共子级分类
           var sctype = res.data[2]; //该学校子级分类
@@ -324,9 +324,9 @@ export default {
               allsType.push(sctysotypepe[[i]]);
             }
           }
-            this.ftypeId = '';
-            this.sftypeId = '';
-            this.page = 1
+          this.ftypeId = "";
+          this.sftypeId = "";
+          this.page = 1;
           var VeidooJson = {};
           for (var i = 0; i < allfType.length; i++) {
             if (!VeidooJson[allfType[i].id]) {
@@ -346,7 +346,7 @@ export default {
 
           // console.log("小分类", this.VeidooJson, "大分类", this.VeidooList);
         })
-        .catch(err => {
+        .catch((err) => {
           this.isLoading = false;
           console.error(err);
         });
@@ -361,18 +361,18 @@ export default {
         cu: this.ftypeId,
         cn: this.stypeId,
         cm: this.termId,
-        page: this.page
+        page: this.page,
       };
       // console.log(params);
       this.ajax
         .get(this.$store.state.api + "selectVeidooType", params)
-        .then(res => {
+        .then((res) => {
           this.isLoading = false;
           this.tableData = res.data[0];
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
           // console.log(" 获取筛选数据", res.data[0]);
         })
-        .catch(err => {
+        .catch((err) => {
           this.isLoading = false;
           console.error(err);
         });
@@ -384,7 +384,7 @@ export default {
     },
     // 修改与查看记录
     updateCred(e, t) {
-      console.log('eeeeeeeeeeee',e);
+      console.log("eeeeeeeeeeee", e);
       this.judgeNum = t;
       if (!Array.isArray(e.type)) {
         if (!e.type) {
@@ -416,19 +416,21 @@ export default {
       // 获取纬度筛选框
       const data = {
         oid: this.org,
-        cla: 0
+        cla: 0,
       };
 
-      this.ajax.get(this.$store.state.api + "selectVeiDoo", data).then(res => {
-        // console.log(res);
-        this.weiList = res.data[0];
-        // console.log("this.weiList", res);
-      });
+      this.ajax
+        .get(this.$store.state.api + "selectVeiDoo", data)
+        .then((res) => {
+          // console.log(res);
+          this.weiList = res.data[0];
+          // console.log("this.weiList", res);
+        });
     },
     // 获取学生详情，主要获取他的班级id,然后查询他的关联列表同学
     getStudentDetail() {
       const data2 = {
-        uid: this.userid
+        uid: this.userid,
       };
       // console.log("获取班学生列表", data2);
       this.ajax
@@ -445,12 +447,12 @@ export default {
     getClassStudent() {
       const data2 = {
         cid: this.classid,
-        uid: this.userid
+        uid: this.userid,
       };
       // console.log("获取班学生列表", data2);
       this.ajax
         .get(this.$store.state.api + "selectManyClassStudent", data2)
-        .then(res => {
+        .then((res) => {
           // console.log(res);
           this.studentList = res.data[0];
           // console.log("this.studentList", res);
@@ -460,7 +462,7 @@ export default {
       this.isLoading = true;
       this.ajax
         .get(this.$store.state.api + "selectTerm")
-        .then(res => {
+        .then((res) => {
           this.isLoading = false;
           var yearJuri = res.data[0];
           for (var i = 0; i < yearJuri.length; i++) {
@@ -470,7 +472,7 @@ export default {
           }
           this.termList = yearJuri;
         })
-        .catch(err => {
+        .catch((err) => {
           this.isLoading = false;
           console.error(err);
         });
@@ -521,7 +523,7 @@ export default {
         { wch: 30 },
         { wch: 30 },
         { wch: 30 },
-        { wch: 30 }
+        { wch: 30 },
       ];
       XLSX.utils.book_append_sheet(workbook, ws, "sheet1"); //把sheet添加到workbook里，第三个参数是sheet名
       XLSX.writeFile(workbook, "观察日记.xlsx");
@@ -530,25 +532,25 @@ export default {
       // FileSaver.saveAs(new Blob([wbout], { type: "application/octet-stream" }), `${title} demo.xlsx`);//保存文件
       this.$message({
         message: "导出成功",
-        type: "success"
+        type: "success",
       });
     },
     // 删除记录
     delRecord(e) {
       this.$confirm("是否删除?", "提示", {
         confirmButtonText: "确定",
-        cancelButtonText: "取消"
+        cancelButtonText: "取消",
       })
         .then(() => {
           this.ajax
             .post(this.$store.state.api + "updateRecord", [{ rid: e.rid }])
-            .then(res => {
+            .then((res) => {
               // console.log(res);
               // this.selectData();
-              this.getData()
+              this.getData();
               this.$message({
                 type: "success",
-                message: "已删除"
+                message: "已删除",
               });
               // this.isLoading = false; updateRecord
             });
@@ -556,11 +558,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "已取消删除"
+            message: "已取消删除",
           });
         });
       // return console.log(e);
-    }
+    },
   },
   created() {
     this.getWeiList();
@@ -573,7 +575,7 @@ export default {
     // this.$nextTick(() => {
     //   this.selectData();
     // });
-  }
+  },
 };
 </script>
 
@@ -675,16 +677,8 @@ export default {
   left: 0;
   display: flex;
 }
-.onTypeTxt {
-  cursor: pointer;
-  display: flex;
-  font-size: 16px;
-  position: relative;
-  align-items: center;
-  justify-content: center;
-  padding: 16px;
-  color: rgba(54, 129, 252, 1);
-}
+
+.onTypeTxt,
 .onTypeTxt2 {
   cursor: pointer;
   display: flex;
@@ -692,17 +686,23 @@ export default {
   position: relative;
   align-items: center;
   justify-content: center;
-  padding: 16px;
+  margin-right: 15px;
   color: rgba(0, 0, 0, 0.9);
 }
+
+.onTypeTxt {
+  padding-bottom: 10px;
+  border-bottom: 3px solid #3681fc;
+  color: rgba(54, 129, 252, 1);
+}
 .line {
   position: absolute;
   left: 50%;
-  bottom: 0;
   transform: translate(-50%, 0);
+  bottom: 0;
   height: 3px;
   background-color: #3681fc;
-  width: 50%;
+  width: 70%;
 }
 .wordBtn {
   cursor: pointer;

src/components/pages/kindStudentEva/test/index.vue

@@ -76,19 +76,21 @@ export default {
   data() {
     return {
       type: 1,
-      role:'',
+      role: ""
     };
   },
   methods: {
     checkType(type) {
       this.type = type;
     },
-    backClaBtn(){
-      this.$router.push(`/studentEva?userid=${this.userid}&oid=${this.oid}&org=${this.org}&cid=${this.cid}&role=${this.role}`)
+    backClaBtn() {
+      this.$router.push(
+        `/studentEva?userid=${this.userid}&oid=${this.oid}&org=${this.org}&cid=${this.cid}&role=${this.role}`
+      );
     }
   },
   mounted() {
-    this.role=this.$route.query.role;
+    this.role = this.$route.query.role;
     // console.log('this.$route.query',this.$route.query);
   }
 };
@@ -115,7 +117,9 @@ export default {
   align-items: center;
   justify-content: space-between;
   margin-left: 20px;
-  width: 95%;
+  box-sizing: border-box;
+  width: calc(100% - 25px);
+  padding-right: 45px;
 }
 .i_body_title > .title_box {
   display: flex;
@@ -129,8 +133,9 @@ export default {
   color: #fff;
   padding: 5px 20px;
   display: flex;
-  justify-content: center;align-items: center;
-  border-radius: 5px;
+  justify-content: center;
+  align-items: center;
+  border-radius: 3px;
   cursor: pointer;
 }
 .i_body_title > .title_box > .title_item {

src/components/pages/kindStudentEva/test/score.vue

@@ -377,6 +377,7 @@ export default {
   width: 98%;
   margin: 0 auto;
   min-width: 1520px;
+  font-size: 14px;
 }
 .table_title {
   width: 100%;