返回按钮与学情无数据页面

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

@@ -684,7 +684,7 @@ export default {
   cursor: pointer;
 }
 .pagination {
-  margin-top: 20px;
+  padding: 30px 0;
   float: right;
 }
 </style>

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

@@ -27,6 +27,7 @@
           <div>学情报告</div>
         </div>
       </div>
+      <div class="backClassCss" @click="backClaBtn">返回</div>
     </div>
     <div class="i_body_contant">
       <Diary
@@ -55,34 +56,37 @@ import Report from "./report.vue";
 export default {
   props: {
     userid: {
-      type: String,
+      type: String
     },
     oid: {
-      type: String,
+      type: String
     },
     org: {
-      type: String,
+      type: String
     },
     cid: {
-      type: String,
-    },
+      type: String
+    }
   },
   components: {
     Diary,
     Score,
-    Report,
+    Report
   },
   data() {
     return {
-      type: 1,
+      type: 1
     };
   },
   methods: {
     checkType(type) {
       this.type = type;
     },
+    backClaBtn(){
+      this.$router.push(`/studentEva?oid=${this.oid}&cid=${this.cid}`)
+    }
   },
-  mounted() {},
+  mounted() {}
 };
 </script>
 
@@ -107,6 +111,7 @@ export default {
   align-items: center;
   justify-content: space-between;
   margin-left: 20px;
+  width: 95%;
 }
 .i_body_title > .title_box {
   display: flex;
@@ -114,6 +119,16 @@ export default {
   flex-wrap: nowrap;
   align-items: center;
 }
+.i_body_title > .backClassCss {
+  background-color: #3681fc;
+  font-size: 16px;
+  color: #fff;
+  padding: 5px 20px;
+  display: flex;
+  justify-content: center;align-items: center;
+  border-radius: 5px;
+  cursor: pointer;
+}
 .i_body_title > .title_box > .title_item {
   cursor: pointer;
   color: #666666;
@@ -177,4 +192,4 @@ export default {
   background: #f8fafe;
   border-radius: 0 10px 10px 10px;
 }
-</style>
+</style>

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

@@ -61,13 +61,6 @@
       <div></div>
     </div>
 
-    <!-- 健康的 -->
-    <!-- :croData="healthCroData"
-        :verData="healthVerData"
-        :bomCategories="healthCategories" -->
-    <!-- :tit="'健康'"
-        :fieldEvidence="healthEvidence"
-        :bigType="1" -->
 
     <div v-if="!isShow">
       <div v-for="(i, index) in VeidooList" :key="i.id">
@@ -81,86 +74,6 @@
         ></fieldMap>
       </div>
     </div>
-
-    <!-- 艺术的 -->
-    <!-- :croData="healthCroData" :verData="healthVerData"
-    :bomCategories="healthCategories" -->
-    <!-- <div>
-      <fieldMap
-        :tit="'艺术'"
-        :fieldEvidence="healthEvidence"
-        :userid="userid"
-        :year="year"
-        :bigType="1"
-        :radarData="radarData"
-      ></fieldMap>
-    </div> -->
-
-    <!-- 健康的 -->
-    <!-- <div
-      style="background-color: #fff;width: 100%;height: 100%;box-sizing: border-box; padding: 15px;"
-    >
-      <div style="margin: 20px 10px;">
-        健康领域综合表现
-      </div>
-      <div class="content" v-if="!isShow">
-        <div
-          style="display: flex;width: 100%;justify-content: space-between;box-sizing: border-box;padding: 10px;"
-        >
-          <div class="radarCss">
-            <verColumnar
-              ref="cro"
-              :verChartData="healthCroData"
-              :verCategories="healthCategories"
-              :key="healthCroData.toString()"
-            ></verColumnar>
-          </div>
-          <div class="radarCss">
-            <croColumnar
-              ref="cro"
-              :chartData="healthVerData"
-              :categories="healthCategories"
-              :key="healthVerData.toString()"
-            ></croColumnar>
-          </div>
-        </div>
-        <div
-          style="display: flex;justify-content: flex-start;width: 100%;margin-top: 10px;margin-left: 30px;"
-          v-if="healthEvidence.length"
-        >
-          <div
-            :class="[proofIsShow ? 'proofCss' : 'proofCss2']"
-            @click="proofJudge"
-          >
-            {{ proofIsShow ? "关键证据" : "点击查看关联证据" }}
-          </div>
-          <div class="proofCells" v-if="proofIsShow">
-            <div
-              class="proofCell"
-              @click="proofBtn"
-              v-for="(i, index) in healthEvidence"
-            >
-              {{ i.recordDate }}-{{ i.recordTit }}-观察笔记
-            </div>
-          </div>
-        </div>
-      </div>
-    </div> -->
-
-    <!-- <el-dialog
-      title="健康记录"
-      :visible.sync="dialogVisible"
-      :before-close="handleClose"
-      center
-    >
-      <popTable
-        ref="popTab"
-        @handleClose="handleClose"
-        :userid="userid"
-        :year="year"
-      ></popTable>
-    </el-dialog> -->
-    <!--  -->
   </div>
 </template>
 
@@ -208,46 +121,16 @@ export default {
       VeidooList: [], //大分类
       VeidooJsonList: [], //小分类
 
-      // 健康横向柱状图数据
-      // healthCroData: [],
-      // healthCategories: [], // 横纵两个共用
-      // // 健康纵向柱状图数据
-      // // healthVerCategories: [],
-      // healthVerData: [],
-      // // 关键证据数据
-      // healthEvidence: [],
-
-      // // 健康横向柱状图数据
-      // artCroData: [],
-      // artCategories: [],
-      // // 健康纵向柱状图数据
-      // artVerCategories: [],
-      // artVerData: [],
-      // // 关键证据数据
-      // healthEvidence: [],
-
+     
       // 后端获取的数据
       radarData: {},
 
       // 判断无数据的显示
-      isShow: false,
-      // 判断关键证据的显示
-      // proofIsShow: false
+      isShow: false
+      
     };
   },
   methods: {
-    proofJudge() {
-      // if (this.proofIsShow) return
-      this.proofIsShow = !this.proofIsShow;
-      // this.$refs.popTab.getDataTab()
-    },
-    // proofBtn() {
-    //   this.dialogVisible = true;
-    // },
-    // handleClose() {
-    //   // done()
-    //   this.dialogVisible = false;
-    // },
     //获取分类
     getVeidooType() {
       let params = {
@@ -389,11 +272,12 @@ export default {
         .then(res => {
           // console.log("获取打分数据", res);
 
-          // this.isLoading = false;
-          // if (!res.data[0].length) {
-          //   this.clearRadarData();
-          //   return;
-          // }
+          this.isLoading = false;
+          if (!res.data[0].length) {
+            // this.clearRadarData();
+            this.isShow = true;
+            return;
+          }
 
           this.isShow = false;
           let data = res.data[0][0];
@@ -466,12 +350,12 @@ export default {
           c = c + i[2];
         });
         a = (a / e.child2.length).toFixed(1);
-        b =( b / e.child2.length).toFixed(1);
+        b = (b / e.child2.length).toFixed(1);
         c = (c / e.child2.length).toFixed(1);
 
         // 综合的柱状图，使用的是雷达图的数据再加工的数据。
         //toFixed会把数字转换成字符串，所以要转换成数字，不然柱状没法用
-        e.num.push(a*1, b*1, c*1);
+        e.num.push(a * 1, b * 1, c * 1);
         a = 0;
         b = 0;
         c = 0;
@@ -500,7 +384,7 @@ export default {
         return (item / 3).toFixed(1);
       });
     },
-  
+
     // 数据相同下标相加组成一个新数组
     combineArrays(arrays) {
       const result = [];