观察日记修改，学情报告分页

src/components/pages/kindStudentEva/test/component/popTable.vue

@@ -112,8 +112,10 @@ export default {
         .get(this.$store.state.api + "selectHealthRecord", params)
         .then(res => {
           console.log("获取关键证据数据popTable", res);
+          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
+
           this.tableData = res.data[0];
-          this.total = res.data[1][0].total;
+          // this.total = res.data[1][0].total;
         }); //
     },
     // 切换页

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

@@ -26,7 +26,10 @@
               style="position: relative;"
             >
               <span>{{ item.name }}</span>
-              <div class="line" :style="{display: ftypeId == item.id ? 'block' : 'none'}"></div>
+              <div
+                class="line"
+                :style="{ display: ftypeId == item.id ? 'block' : 'none' }"
+              ></div>
             </div>
             <!-- 子分类 -->
             <div class="typeCss" v-if="VeidooJson[item.id].length">
@@ -119,11 +122,7 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column
-          label="操作"
-          align="center"
-          width="175px"
-        >
+        <el-table-column label="操作" align="center" width="175px">
           <template slot-scope="scope">
             <div class="evaluate">
               <div
@@ -202,7 +201,8 @@ export default {
       VeidooList: [],
       VeidooJson: {},
       VeidooListChild: [],
-      isLoading : true,
+      isLoading: true,
+      classid: "",
 
       // 默认选择项
       // VeidooValue:{},
@@ -238,10 +238,11 @@ export default {
     // 大分类点击
     clickFtypeId(e) {
       this.ftypeId = e;
+      this.stypeId = "";
       this.getData();
     },
     clickStypeId(e) {
-      console.log("点击小分类", e);
+      // console.log("点击小分类", e);
       if (this.stypeId === e) {
         this.stypeId = "";
       } else {
@@ -340,14 +341,14 @@ export default {
         cm: this.termId,
         page: this.page
       };
-      console.log(params);
+      // console.log(params);
       this.ajax
         .get(this.$store.state.api + "selectVeidooType", params)
         .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);
+          console.log(" 获取筛选数据", res.data[0]);
         })
         .catch(err => {
           this.isLoading = false;
@@ -357,7 +358,7 @@ export default {
     // 选择导出哪些记录
     handleSelectionChange(val) {
       this.multipleSelection = val;
-      console.log(this.multipleSelection);
+      // console.log(this.multipleSelection);
     },
     // 修改记录
     updateCred(e, t) {
@@ -400,12 +401,29 @@ export default {
         // console.log("this.weiList", res);
       });
     },
+    // 获取学生详情，主要获取他的班级id,然后查询他的关联列表同学
+    getStudentDetail() {
+      const data2 = {
+        uid: this.userid
+      };
+      console.log("获取班学生列表", data2);
+      this.ajax
+        .get(this.$store.state.api + "selectStudentDetail", data2)
+        .then(res => {
+          console.log(res);
+          this.classid = res.data[0][0].classid;
+          this.getClassStudent();
+
+          // console.log("this.studentList", res);
+        });
+    },
     // 获取班学生列表
     getClassStudent() {
       const data2 = {
-        cid: this.cid,
+        cid: this.classid,
         uid: this.userid
       };
+      // console.log("获取班学生列表", data2);
       this.ajax
         .get(this.$store.state.api + "selectManyClassStudent", data2)
         .then(res => {
@@ -439,7 +457,7 @@ export default {
         this.exportExcel();
       } else {
         this.$message({ message: "请先选择要导出的数据", type: "warning" });
-        return
+        return;
       }
     },
 
@@ -479,8 +497,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");
@@ -502,7 +519,7 @@ export default {
           this.ajax
             .post(this.$store.state.api + "updateRecord", [{ rid: e.rid }])
             .then(res => {
-              console.log(res);
+              // console.log(res);
               // this.selectData();
 
               this.$message({
@@ -522,8 +539,9 @@ export default {
     }
   },
   created() {
-    this.getWeiList()
-    this.getClassStudent();
+    this.getWeiList();
+    this.getStudentDetail();
+
     this.getYear();
     this.getVeidooType();
   },

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

@@ -75,7 +75,8 @@ export default {
   },
   data() {
     return {
-      type: 1
+      type: 1,
+      role:'',
     };
   },
   methods: {
@@ -83,10 +84,13 @@ export default {
       this.type = type;
     },
     backClaBtn(){
-      this.$router.push(`/studentEva?oid=${this.oid}&cid=${this.cid}`)
+      this.$router.push(`/studentEva?userid=${this.userid}&oid=${this.oid}&org=${this.org}&cid=${this.cid}&role=${this.role}`)
     }
   },
-  mounted() {}
+  mounted() {
+    this.role=this.$route.query.role;
+    // console.log('this.$route.query',this.$route.query);
+  }
 };
 </script>
 

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

@@ -188,7 +188,7 @@ export default {
           this.VeidooList = allfType;
           this.VeidooJsonList = VeidooJson;
 
-          console.log("  allfType", allfType);
+          // console.log("  allfType", allfType);
           // console.log("  allsType", allsType);
           // this.$forceUpdate();
 
@@ -284,7 +284,7 @@ export default {
           // console.log(JSON.parse(data.json));
           this.radarData = JSON.parse(data.json);
 
-          console.log("this.radarData", this.radarData);
+          // console.log("this.radarData", this.radarData);
           this.getVeidooType();
           // this.getEvidence();
 
@@ -376,7 +376,7 @@ export default {
       // 平均分数柱状图数据----------
       let croMapData = [];
       this.chartData.forEach(e => {
-        console.log(e);
+        // console.log(e);
         croMapData = this.addArrays(croMapData, e);
       });