Etusivu Tutki Apua
Kirjaudu sisään
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

gx

SanHQin 3 kuukautta sitten
vanhempi
24ac4e5723
commit
3f30c8fca4
9 muutettua tiedostoa jossa 760 lisäystä ja 534 poistoa
Yhdistetty näkymä Näytä diff tilastot
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.3beb15612a52c9874da4ef6f1ca5286e.css
  3. 0 0
      dist/static/css/app.3beb15612a52c9874da4ef6f1ca5286e.css.map
  4. 0 0
      dist/static/js/app.9f71fe2987f97c665a33.js
  5. 0 0
      dist/static/js/app.9f71fe2987f97c665a33.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 79 64
      src/components/pages/test/dataCom/radarZong.vue
  8. 575 455
      src/components/pages/test/databoard.vue
  9. 105 14
      src/components/pages/testPerson/portrait/index.vue

+ 1 - 1
dist/index.html
Näytä tiedosto 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.0fca7232d8490275c61ca8bd5ad37ef1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.c046dd5e92c8da101466.js></script><script type=text/javascript src=./static/js/app.a9e9d116c74b6a37d27c.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.3beb15612a52c9874da4ef6f1ca5286e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.c046dd5e92c8da101466.js></script><script type=text/javascript src=./static/js/app.9f71fe2987f97c665a33.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/css/app.3beb15612a52c9874da4ef6f1ca5286e.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/css/app.3beb15612a52c9874da4ef6f1ca5286e.css.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/app.9f71fe2987f97c665a33.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/app.9f71fe2987f97c665a33.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 79 - 64
src/components/pages/test/dataCom/radarZong.vue
Näytä tiedosto 

@@ -1,6 +1,9 @@
 
 <template>
 
 <template>
 
   <div class="data_body">
 
   <div class="data_body">
 
-    <div style="width: 100%; height: 100%" v-if="this.ooption.xdata.length || this.ooption.xdata2.length">
 
+    <div
 
+      style="width: 100%; height: 100%"
 
+      v-if="this.ooption.xdata.length || this.ooption.xdata2.length"
 
+    >
 
       <div
 
       <div
 
         id="charts_canvas"
 
         id="charts_canvas"
 
         class="echart"
 
         class="echart"
 
@@ -86,6 +89,8 @@ export default {
 
       // 雷达图显示的标签
 
       // 雷达图显示的标签
 
       let newPromise = new Promise(resolve => {
 
       let newPromise = new Promise(resolve => {
 
         resolve();
 
         resolve();
 
+      }).catch(err => {
 
+        console.log("👉err", err);
 
       });
 
       });
 
       //然后异步执行echarts的初始化函数
 
       //然后异步执行echarts的初始化函数
 
       newPromise.then(() => {
 
       newPromise.then(() => {
 
@@ -95,7 +100,6 @@ export default {
 
         );
 
         );
 
         this.option.radar.indicator = option.sdata;
 
         this.option.radar.indicator = option.sdata;
 
         if (option.xdata.length > 0) {
 
         if (option.xdata.length > 0) {
 
-				
           this.option.series[0].data[0] = {
 
           this.option.series[0].data[0] = {
 
             // areaStyle: {
 
             // areaStyle: {
 
             //     opacity: 0.2,
 
             //     opacity: 0.2,
 
@@ -110,10 +114,10 @@ export default {
 
             value: option.xdata,
 
             value: option.xdata,
 
             name: "全体教师平均得分率"
 
             name: "全体教师平均得分率"
 
           };
 
           };
 
-        }else{
 
-					// this.option.series[0].data.splice(0,1)
 
-					// this.option.series[0].data[0] = {};
 
-				}
 
+        } else {
 
+          // this.option.series[0].data.splice(0,1)
 
+          // this.option.series[0].data[0] = {};
 
+        }
 
         if (option.xdata2.length > 0) {
 
         if (option.xdata2.length > 0) {
 
           this.option.series[0].data[1] = {
 
           this.option.series[0].data[1] = {
 
             // areaStyle: {
 
             // areaStyle: {
 
@@ -125,7 +129,7 @@ export default {
 
               // lineStyle: {
 
               // lineStyle: {
 
               //   color: "#68bbc4"
 
               //   color: "#68bbc4"
 
               // }
 
               // }
 
-							color: "#0061FF",
 
+              color: "#0061FF",
 
               lineStyle: {
 
               lineStyle: {
 
                 color: "#0061FF"
 
                 color: "#0061FF"
 
               }
 
               }
 
@@ -138,7 +142,9 @@ export default {
 
         }
 
         }
 
         // this.option.series[0].data[0].value = option.xdata;
 
         // this.option.series[0].data[0].value = option.xdata;
 
         // 初始化雷达图
 
         // 初始化雷达图
 
-				this.option.series[0].data = this.option.series[0].data.filter(i=>Object.keys(i).length>0);
 
+        this.option.series[0].data = this.option.series[0].data.filter(
 
+          i => Object.keys(i).length > 0
 
+        );
 
         this.chartObj = chartObj;
 
         this.chartObj = chartObj;
 
         this.chartObj.setOption(this.option);
 
         this.chartObj.setOption(this.option);
 
       });
 
       });
 
@@ -175,60 +181,64 @@ export default {
 
               return array[item].cogScore;
 
               return array[item].cogScore;
 
             })
 
             })
 
           : [];
 
           : [];
 
-					this.ooption.xdata = []
 
-      }
 
-      if (!this.chartObj) {
 
-        this.setChart(this.ooption);
 
-      } else {
 
-        this.option.radar.indicator = this.ooption.sdata;
 
-        if (this.ooption.xdata.length > 0) {
 
-          this.option.series[0].data[0] = {
 
-            // areaStyle: {
 
-            //     opacity: 0.2,
 
-            //     color: '#0061FF'
 
-            // },
 
-            itemStyle: {
 
-              color: "#0061FF",
 
-              lineStyle: {
 
-                color: "#0061FF"
 
-              }
 
-            },
 
-            value: this.ooption.xdata,
 
-            name: "全体教师平均得分率"
 
-          };
 
-        }else{
 
-					this.option.series[0].data[0] = {};
 
-				}
 
-        if (this.ooption.xdata2.length > 0) {
 
-          this.option.series[0].data[1] = {
 
-            // areaStyle: {
 
-            //     opacity: 0.2,
 
-            //     color: '#68bbc4'
 
-            // },
 
-            itemStyle: {
 
-              // color: "#68bbc4",
 
-              // lineStyle: {
 
-              //   color: "#68bbc4"
 
-              // }
 
-							color: "#0061FF",
 
-              lineStyle: {
 
-                color: "#0061FF"
 
-              }
 
-            },
 
-            value: this.ooption.xdata2,
 
-            name: "平均得分率"
 
-          };
 
-        } else {
 
-          this.option.series[0].data[1] = {};
 
-        }
 
-				this.option.series[0].data = this.option.series[0].data.filter(i=>Object.keys(i).length>0);
 
-        this.chartObj.setOption(this.option);
 
+        this.ooption.xdata = [];
 
       }
 
       }
 
-      setTimeout(() => {
 
-        if (this.chartObj) {
 
-          this.chartObj.resize();
 
-        }
 
-      }, 200);
 
+      // if (!this.chartObj) {
 
+      this.setChart(this.ooption);
 
+      // }
 
+      // else {
 
+      //   this.option.radar.indicator = this.ooption.sdata;
 
+      //   if (this.ooption.xdata.length > 0) {
 
+      //     this.option.series[0].data[0] = {
 
+      //       // areaStyle: {
 
+      //       //     opacity: 0.2,
 
+      //       //     color: '#0061FF'
 
+      //       // },
 
+      //       itemStyle: {
 
+      //         color: "#0061FF",
 
+      //         lineStyle: {
 
+      //           color: "#0061FF"
 
+      //         }
 
+      //       },
 
+      //       value: this.ooption.xdata,
 
+      //       name: "全体教师平均得分率"
 
+      //     };
 
+      //   } else {
 
+      //     this.option.series[0].data[0] = {};
 
+      //   }
 
+      //   if (this.ooption.xdata2.length > 0) {
 
+      //     this.option.series[0].data[1] = {
 
+      //       // areaStyle: {
 
+      //       //     opacity: 0.2,
 
+      //       //     color: '#68bbc4'
 
+      //       // },
 
+      //       itemStyle: {
 
+      //         // color: "#68bbc4",
 
+      //         // lineStyle: {
 
+      //         //   color: "#68bbc4"
 
+      //         // }
 
+      //         color: "#0061FF",
 
+      //         lineStyle: {
 
+      //           color: "#0061FF"
 
+      //         }
 
+      //       },
 
+      //       value: this.ooption.xdata2,
 
+      //       name: "平均得分率"
 
+      //     };
 
+      //   } else {
 
+      //     this.option.series[0].data[1] = {};
 
+      //   }
 
+
 
+      //   this.option.series[0].data = this.option.series[0].data.filter(
 
+      //     i => Object.keys(i).length > 0
 
+      //   );
 
+      //   this.chartObj.setOption(this.option);
 
+      // }
 
+      // setTimeout(() => {
 
+      //   if (this.chartObj) {
 
+      //     this.chartObj.resize();
 
+      //   }
 
+      // }, 200);
 
       this.$forceUpdate();
 
       this.$forceUpdate();
 
     }
 
     }
 
   },
 
   },
 
@@ -238,6 +248,7 @@ export default {
 
       deep: true,
 
       deep: true,
 
       handler(newValue, oldValue) {
 
       handler(newValue, oldValue) {
 
         this.ooption.xdata = [];
 
         this.ooption.xdata = [];
 
+        this.$forceUpdate();
 
         this.setArray(newValue, 1);
 
         this.setArray(newValue, 1);
 
         this.$forceUpdate();
 
         this.$forceUpdate();
 
       }
 
       }
 
@@ -247,11 +258,15 @@ export default {
 
       deep: true,
 
       deep: true,
 
       handler(newValue, oldValue) {
 
       handler(newValue, oldValue) {
 
         this.ooption.xdata2 = [];
 
         this.ooption.xdata2 = [];
 
-				if(Object.keys(newValue).length){
 
-					this.setArray(newValue, 2);
 
-				}
 
+        if (Object.keys(newValue).length) {
 
+          this.setArray(newValue, 2);
 
+        }
 
         this.$forceUpdate();
 
         this.$forceUpdate();
 
       }
 
       }
 
+    },
 
+    chartObj(newValue, oldValue) {
 
+      console.log("👉newValue", newValue);
 
+      console.log("👉oldValue", oldValue);
 
     }
 
     }
 
   },
 
   },
 
   mounted() {
 
   mounted() {

+ 575 - 455
src/components/pages/test/databoard.vue
Näytä tiedosto 

@@ -1,549 +1,669 @@
 
 <template>
 
 <template>
 
-    <div class="pb_content" style="height: auto; width: calc(100% - 40px); margin: 0 auto;background: unset;">
 
-        <div style="width:100%;padding:0;box-sizing: border-box;">
 
-            <div class="pb_head top">
 
-                <div style="display: flex;align-items: center;">
 
-                    <span class="subClick" @click="
 
-                        goTo(
 
-                            '/test?userid=' +
 
-                            userid +
 
-                            '&oid=' +
 
-                            oid +
 
-                            '&org=' +
 
-                            org +
 
-                            '&role=' +
 
-                            role
 
-                        )
 
-                        ">表单管理</span>
 
-                    <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
 
-                    <span class="subClick" @click="
 
-                        goTo(
 
-                            '/trainCourse?userid=' +
 
-                            userid +
 
-                            '&oid=' +
 
-                            oid +
 
-                            '&org=' +
 
-                            org +
 
-                            '&role=' +
 
-                            role
 
-                        )
 
-                        ">培训管理</span>
 
-                    <span class="sub_head">数据看板</span>
 
-                    <span class="subClick"  @click="
 
-                        goTo(
 
-                            '/testSmarter?userid=' +
 
-                            userid +
 
-                            '&oid=' +
 
-                            oid +
 
-                            '&org=' +
 
-                            org +
 
-                            '&role=' +
 
-                            role +
 
-                            '&cid=' +
 
-                            cid
 
-                        )
 
-                        ">智能助手</span>
 
-                </div>
 
-            </div>
 
+  <div
 
+    class="pb_content"
 
+    style="height: auto; width: calc(100% - 40px); margin: 0 auto;background: unset;"
 
+  >
 
+    <div style="width:100%;padding:0;box-sizing: border-box;">
 
+      <div class="pb_head top">
 
+        <div style="display: flex;align-items: center;">
 
+          <span
 
+            class="subClick"
 
+            @click="
 
+              goTo(
 
+                '/test?userid=' +
 
+                  userid +
 
+                  '&oid=' +
 
+                  oid +
 
+                  '&org=' +
 
+                  org +
 
+                  '&role=' +
 
+                  role
 
+              )
 
+            "
 
+            >表单管理</span
 
+          >
 
+          <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
 
+          <span
 
+            class="subClick"
 
+            @click="
 
+              goTo(
 
+                '/trainCourse?userid=' +
 
+                  userid +
 
+                  '&oid=' +
 
+                  oid +
 
+                  '&org=' +
 
+                  org +
 
+                  '&role=' +
 
+                  role
 
+              )
 
+            "
 
+            >培训管理</span
 
+          >
 
+          <span class="sub_head">数据看板</span>
 
+          <span
 
+            class="subClick"
 
+            @click="
 
+              goTo(
 
+                '/testSmarter?userid=' +
 
+                  userid +
 
+                  '&oid=' +
 
+                  oid +
 
+                  '&org=' +
 
+                  org +
 
+                  '&role=' +
 
+                  role +
 
+                  '&cid=' +
 
+                  cid
 
+              )
 
+            "
 
+            >智能助手</span
 
+          >
 
         </div>
 
         </div>
 
-        <div class="bbox_serch">
 
-            <Cascader :options="typeInfo" v-if="typeInfo.length" @setTeacher="setTeacher"></Cascader>
 
+      </div>
 
+    </div>
 
+    <div class="bbox_serch">
 
+      <el-select
 
+        v-model="selectTime"
 
+        placeholder="请选择"
 
+        size="small"
 
+        style="margin-right: 20px;"
 
+        v-if="timeSort.length > 1"
 
+        @change="changeTimeSort"
 
+      >
 
+        <el-option
 
+          v-for="item in timeSort"
 
+          :key="item.id"
 
+          :label="item.label"
 
+          :value="item.id"
 
+        >
 
+        </el-option>
 
+      </el-select>
 
+      <Cascader
 
+        :options="typeInfo"
 
+        v-if="typeInfo.length"
 
+        @setTeacher="setTeacher"
 
+      ></Cascader>
 
+    </div>
 
+    <div class="bbox" v-loading="tabLoading">
 
+      <div class="bbox_nav">
 
+        <div class="teaLis">
 
+          <div
 
+            class="teal"
 
+            @click="cutPage(2)"
 
+            :class="[pType == 2 ? 'Tbor' : '']"
 
+            v-if="bArray.length"
 
+          >
 
+            专任教师
 
+          </div>
 
+          <div
 
+            class="teal"
 
+            @click="cutPage(1)"
 
+            :class="[pType == 1 ? 'Tbor' : '']"
 
+            v-if="aArray.length"
 
+          >
 
+            班主任
 
+          </div>
 
         </div>
 
         </div>
 
-        <div class="bbox" v-loading="tabLoading">
 
-            <div class="bbox_nav">
 
-                <div class="teaLis">
 
-                    <div class="teal" @click="cutPage(2)" :class="[pType == 2 ? 'Tbor' : '']" v-if="bArray.length">
 
-                        专任教师
 
-                    </div>
 
-                    <div class="teal" @click="cutPage(1)" :class="[pType == 1 ? 'Tbor' : '']" v-if="aArray.length">
 
-                        班主任
 
-                    </div>
 
-                </div>
 
-                <el-select v-model="checkSet" @change="setArray" style="margin-left: auto">
 
-                    <el-option label="综合排序" value=""> </el-option>
 
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
 
-                    </el-option>
 
-                </el-select>
 
-
 
-            </div>
 
-            <div class="randarZong">
 
-                <radarZong :evCourseArray="zongJson" :evCourseArray2="zongJson2" v-if="checkSet"></radarZong>
 
-                <radarZong :evCourseArray="zongJson2" :evCourseArray2="{}" v-else></radarZong>
 
-            </div>
 
-            <div class="randarBox">
 
-                <div class="title">教师详情</div>
 
-                <div class="randarTeacher" v-for="(item, index) in tableData" :key="index">
 
-                    <div class="randarTitle">
 
-                        <span>{{ item.username }}</span>
 
-                        <span>{{ item.score }}</span>
 
-                    </div>
 
-                    <div class="randar">
 
-                        <radarTeacher :evCourseArray="zongJson2" :evCourseArray2="item.json"></radarTeacher>
 
-                    </div>
 
-                </div>
 
-            </div>
 
+        <el-select
 
+          v-model="checkSet"
 
+          @change="setArray"
 
+          style="margin-left: auto"
 
+        >
 
+          <el-option label="综合排序" value=""> </el-option>
 
+          <el-option
 
+            v-for="item in options"
 
+            :key="item.value"
 
+            :label="item.label"
 
+            :value="item.value"
 
+          >
 
+          </el-option>
 
+        </el-select>
 
+      </div>
 
+      <div class="randarZong">
 
+        <radarZong
 
+          :evCourseArray="zongJson"
 
+          :evCourseArray2="zongJson2"
 
+          v-if="checkSet"
 
+        ></radarZong>
 
+        <radarZong
 
+          :evCourseArray="zongJson2"
 
+          :evCourseArray2="{}"
 
+          v-else
 
+        ></radarZong>
 
+      </div>
 
+      <div class="randarBox">
 
+        <div class="title">教师详情</div>
 
+        <div
 
+          class="randarTeacher"
 
+          v-for="(item, index) in tableData"
 
+          :key="index"
 
+        >
 
+          <div class="randarTitle">
 
+            <span>{{ item.username }}</span>
 
+            <span>{{ item.score }}</span>
 
+          </div>
 
+          <div class="randar">
 
+            <radarTeacher
 
+              :evCourseArray="zongJson2"
 
+              :evCourseArray2="item.json"
 
+            ></radarTeacher>
 
+          </div>
 
         </div>
 
         </div>
 
+      </div>
 
     </div>
 
     </div>
 
+  </div>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
 var OpenCC = require("opencc-js");
 
 var OpenCC = require("opencc-js");
 
 let converter = OpenCC.Converter({
 
 let converter = OpenCC.Converter({
 
-    from: 'hk',
 
-    to: 'cn'
 
-})
 
+  from: "hk",
 
+  to: "cn"
 
+});
 
 
 
 import radarZong from "./dataCom/radarZong.vue";
 
 import radarZong from "./dataCom/radarZong.vue";
 
 import radarTeacher from "./dataCom/radarTeacher.vue";
 
 import radarTeacher from "./dataCom/radarTeacher.vue";
 
 
 
 import Cascader from "./dataCom/cascader.vue";
 
 import Cascader from "./dataCom/cascader.vue";
 
 
 
-
 
 export default {
 
 export default {
 
-    name: 'testDataBoard',
 
-    components: { radarZong, radarTeacher, Cascader },
 
-    data() {
 
-        return {
 
-            userid: this.$route.query.userid, //用户id
 
-            oid: this.$route.query.oid, //学校id
 
-            org: this.$route.query.org, //组织id
 
-            pType: 2,
 
-            teacherName: '',
 
-            tabLoading: false,
 
-            tableData: [],
 
-            zongJson: {},
 
-            zongJson2: {},
 
-            checkSet: "",
 
-            options: [],
 
-            data: [],
 
-            typeInfo: [],
 
-            teacherArray: [],
 
-            aArray:[],
 
-            bArray:[],
 
-        };
 
-    },
 
-    computed: {
 
-        getScore() {
 
-            return (item) => {
 
-                let score = 0;
 
-                for (var i = 0; i < item.length; i++) {
 
-                    score += item[i].cogScore
 
-                }
 
-                score = (score / item.length).toFixed(0);
 
-                return score;
 
+  name: "testDataBoard",
 
+  components: { radarZong, radarTeacher, Cascader },
 
+  data() {
 
+    return {
 
+      userid: this.$route.query.userid, //用户id
 
+      oid: this.$route.query.oid, //学校id
 
+      org: this.$route.query.org, //组织id
 
+      pType: 2,
 
+      teacherName: "",
 
+      tabLoading: false,
 
+      tableData: [],
 
+      zongJson: {},
 
+      zongJson2: {},
 
+      checkSet: "",
 
+      options: [],
 
+      data: [],
 
+      typeInfo: [],
 
+      teacherArray: [],
 
+      aArray: [],
 
+      bArray: [],
 
+      timeSort: [],
 
+      selectTime: ""
 
+    };
 
+  },
 
+  computed: {
 
+    getScore() {
 
+      return item => {
 
+        let score = 0;
 
+        for (var i = 0; i < item.length; i++) {
 
+          score += item[i].cogScore;
 
+        }
 
+        score = (score / item.length).toFixed(0);
 
+        return score;
 
+      };
 
+    }
 
+  },
 
+  methods: {
 
+    getPageBase2(type) {
 
+      let params = {
 
+        typ: type,
 
+        org: this.org,
 
+        oid: this.oid
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectTestExamineBase", params)
 
+        .then(res => {
 
+          console.log("1111111111111111111111", res.data);
 
+
 
+          if (type == 1) {
 
+            this.aArray = res.data[0];
 
+          } else {
 
+            this.bArray = res.data[0];
 
+            if (!this.bArray.length) {
 
+              this.cutPage(2);
 
             }
 
             }
 
+          }
 
+          this.timeSort = res.data[0].map(item => {
 
+            return {
 
+              label: item.timeName,
 
+              id: item.time,
 
+              time: item.timeName.split("~")[0]
 
+            };
 
+          });
 
+          if (this.timeSort.length > 0) {
 
+            this.selectTime = this.timeSort[0].id;
 
+          }
 
+        })
 
+        .catch(error => {
 
+          console.log(error);
 
+        });
 
+    },
 
+    goTo(path) {
 
+      this.$router.push(path);
 
+    },
 
+    cutPage(type) {
 
+      this.checkSet = "";
 
+      this.pType = type;
 
+      this.getData();
 
+    },
 
+    scoreChildren(children) {
 
+      let score = 0;
 
+      children.forEach(item => {
 
+        if (item.sco2 && parseFloat(item.sco2) > 0) {
 
+          score += parseFloat(item.sco2);
 
         }
 
         }
 
+      });
 
+      return score;
 
     },
 
     },
 
-    methods: {
 
-        getPageBase2(type) {
 
-            let params = {
 
-                typ: type,
 
-                org: this.org,
 
-                oid: this.oid
 
-            };
 
-            this.ajax
 
-                .get(this.$store.state.api + "selectTestExamineBase", params)
 
-                .then(res => {
 
-                console.log('1111111111111111111111', res.data);
 
-                
-                if(type == 1){
 
-                    this.aArray = res.data[0];
 
-                }else {
 
-                    this.bArray = res.data[0];
 
-                    if(!this.bArray.length){
 
-                        this.cutPage(2)
 
-                    }
 
-                }
 
-                })
 
-                .catch(error => {
 
-                console.log(error);
 
-            });
 
-        },
 
-        goTo(path) {
 
-            this.$router.push(path);
 
-        },
 
-        cutPage(type) {
 
-            this.checkSet = ""
 
-            this.pType = type
 
-            this.getData()
 
-        },
 
-        scoreChildren(children) {
 
-            let score = 0;
 
-            children.forEach(item => {
 
-                if (item.sco2 && parseFloat(item.sco2) > 0) {
 
-                    score += parseFloat(item.sco2);
 
+    getData() {
 
+      this.tabLoading = true;
 
+      let params = [
 
+        {
 
+          oid: this.oid,
 
+          org: this.org,
 
+          type: this.pType,
 
+          tname: this.teacherName
 
+        }
 
+      ];
 
+      // console.log(params);
 
+      this.ajax
 
+        .post(this.$store.state.api + "selectTestExaminePersonData2", params)
 
+        .then(res => {
 
+          let data = res.data[0];
 
+
 
+          data.forEach(e => {
 
+            e.json = JSON.parse(e.json);
 
+          });
 
+          if (this.selectTime && this.timeSort.length > 1) {
 
+            data = data.filter(item => item.time == this.selectTime);
 
+          }
 
+
 
+          data.forEach(e => {
 
+            e.evaSca = 0;
 
+            e.cogSco = 0;
 
+            e.step = 0;
 
+            e.allStep = 0;
 
+
 
+            e.json.forEach(i => {
 
+              i.evaScore = 0; // 自评
 
+              i.cogScore = 0; //考核
 
+              i.score = 0; //考核
 
+              i.children.forEach(k => {
 
+                e.evaSca = e.evaSca + k.sco1 * 1;
 
+                e.cogSco = e.cogSco + k.sco2 * 1;
 
+                i.evaScore = i.evaScore + k.sco1 * 1;
 
+                i.cogScore = i.cogScore + k.sco2 * 1;
 
+                i.score = i.score + k.score * 1;
 
+                e.allStep++;
 
+                if (!!k.sco2 * 1) {
 
+                  e.step++;
 
                 }
 
                 }
 
+              });
 
             });
 
             });
 
-            return score;
 
-        },
 
-        getData() {
 
-            this.tabLoading = true;
 
-            let params = [{
 
-                oid: this.oid,
 
-                org: this.org,
 
-                type: this.pType,
 
-                tname: this.teacherName
 
-            }];
 
-            // console.log(params);
 
-            this.ajax
 
-                .post(this.$store.state.api + "selectTestExaminePersonData2", params)
 
-                .then(res => {
 
-                    let data = res.data[0];
 
-
 
-                    data.forEach(e => {
 
-                        e.json = JSON.parse(e.json);
 
-                    });
 
-
 
-                    data.forEach(e => {
 
-                        e.evaSca = 0;
 
-                        e.cogSco = 0;
 
-                        e.step = 0;
 
-                        e.allStep = 0;
 
-
 
-                        e.json.forEach(i => {
 
-                            i.evaScore = 0 // 自评
 
-                            i.cogScore = 0 //考核
 
-                            i.score = 0 //考核
 
-                            i.children.forEach(k => {
 
-                                e.evaSca = e.evaSca + k.sco1 * 1;
 
-                                e.cogSco = e.cogSco + k.sco2 * 1;
 
-                                i.evaScore = i.evaScore + k.sco1 * 1;
 
-                                i.cogScore = i.cogScore + k.sco2 * 1;
 
-                                i.score = i.score + k.score * 1;
 
-                                e.allStep++;
 
-                                if (!!k.sco2 * 1) {
 
-                                    e.step++;
 
-                                }
 
-                            });
 
-                        });
 
-                    });
 
-
 
-                    data.forEach(e => {
 
-                        if (e.step == e.allStep) {
 
-                            e.state = "已完成";
 
-                        } else {
 
-                            e.state = "未完成";
 
-                        }
 
-                        if (!e.tea) {
 
-                            e.tea = "";
 
-                        }
 
-                        e.evaSca = e.evaSca.toFixed(0);
 
-                        e.cogSco = e.cogSco.toFixed(0);
 
-                    });
 
-                    let _data = []
 
-                    let zongJson = {}
 
-                    // zongJson.count = data.length
 
-                    data.forEach((e, index) => {
 
-                        _data[index] = {}
 
-                        _data[index].username = e.username
 
-                        _data[index].evaSca = e.evaSca
 
-                        _data[index].cogSco = e.cogSco
 
-                        _data[index].json = []
 
-
 
-                        e.json.forEach((i, iindex) => {
 
-                            if (converter(i.name) == converter("科组评价") || converter(i.name) == converter("行政巡查")) {
 
-                                return;
 
-                            }
 
-                            _data[index].json[iindex] = {}
 
-                            _data[index].json[iindex].name = i.name
 
-                            let _evaScore = parseInt((i.evaScore * (100 / i.score)).toFixed(0))
 
-                            let _cogScore = parseInt((i.cogScore * (100 / i.score)).toFixed(0))
 
-                            _data[index].json[iindex].evaScore = _evaScore  // 自评
 
-                            _data[index].json[iindex].cogScore = _cogScore // 考核
 
-                            zongJson[i.name] ? "" : zongJson[i.name] = {}
 
-                            zongJson[i.name].evaScore ? zongJson[i.name].evaScore += _evaScore : zongJson[i.name].evaScore = _evaScore
 
-                            zongJson[i.name].cogScore ? zongJson[i.name].cogScore += _cogScore : zongJson[i.name].cogScore = _cogScore
 
-                        });
 
-                    });
 
-                    let zongArray = Object.keys(zongJson)
 
-                    for (var i = 0; i < zongArray.length; i++) {
 
-                        zongJson[zongArray[i]].evaScore = (zongJson[zongArray[i]].evaScore / data.length).toFixed(0)
 
-                        zongJson[zongArray[i]].cogScore = (zongJson[zongArray[i]].cogScore / data.length).toFixed(0)
 
-                    }
 
-
 
-                    this.tableData = _data
 
-                        .filter((e) => {
 
-                            e.score = this.getScore(e.json);
 
-                            return e;
 
-                        })
 
-                        .sort((a, b) => b.score - a.score);
 
-                    console.log(this.tableData);
 
-                    this.zongJson = zongJson
 
-                    this.zongJson2 = zongJson
 
-                    console.log(zongJson);
 
-                    this.options = Object.keys(zongJson).map(item => {
 
-                        return { label: item, value: item }
 
-                    })
 
-                    this.data = data
 
-                    console.log(data);
 
-
 
-                    this.tabLoading = false;
 
-                })
 
-                .catch(error => {
 
-                    this.tabLoading = false;
 
-                    console.log(error);
 
-                });
 
-        },
 
-        setTeacher(array){
 
-            this.teacherArray = array
 
-            this.setArray()
 
-        },
 
-        setArray() {
 
-            let checkSet = this.checkSet
 
-            let _data = []
 
-            let zongJson = {}
 
-            let data = JSON.parse(JSON.stringify(this.data))
 
-            if(this.teacherArray.length){
 
-                data = data.filter((e) => {
 
-                    return this.teacherArray.includes(e.userid)
 
-                })
 
-            }
 
-            data.forEach((e, index) => {
 
-                _data[index] = {}
 
-                _data[index].username = e.username
 
-                if (checkSet == "") {
 
-                    _data[index].evaSca = e.evaSca
 
-                    _data[index].cogSco = e.cogSco
 
-                    _data[index].json = []
 
-                }
 
+          });
 
 
 
-
 
-                e.json.forEach((i, iindex) => {
 
-                    if (converter(i.name) == converter("科组评价") || converter(i.name) == converter("行政巡查")) {
 
-                        return;
 
-                    }
 
-                    if (checkSet == i.name) {
 
-                        _data[index].evaSca = i.evaScore
 
-                        _data[index].cogSco = i.cogScore
 
-                        _data[index].json = []
 
-                        i.children.forEach((ic, icindex) => {
 
-                            _data[index].json[icindex] = {}
 
-                            _data[index].json[icindex].name = ic.name
 
-                            let _evaScore = parseInt((ic.sco1 * 1 * (100 / ic.score)).toFixed(0))
 
-                            let _cogScore = parseInt((ic.sco2 * 1 * (100 / ic.score)).toFixed(0))
 
-                            _data[index].json[icindex].evaScore = _evaScore  // 自评
 
-                            _data[index].json[icindex].cogScore = _cogScore // 考核
 
-                            zongJson[ic.name] ? "" : zongJson[ic.name] = {}
 
-                            zongJson[ic.name].evaScore ? zongJson[ic.name].evaScore += _evaScore : zongJson[ic.name].evaScore = _evaScore
 
-                            zongJson[ic.name].cogScore ? zongJson[ic.name].cogScore += _cogScore : zongJson[ic.name].cogScore = _cogScore
 
-                        })
 
-                    } else if (checkSet == "") {
 
-                        _data[index].json[iindex] = {}
 
-                        _data[index].json[iindex].name = i.name
 
-                        let _evaScore = parseInt((i.evaScore * (100 / i.score)).toFixed(0))
 
-                        let _cogScore = parseInt((i.cogScore * (100 / i.score)).toFixed(0))
 
-                        _data[index].json[iindex].evaScore = _evaScore  // 自评
 
-                        _data[index].json[iindex].cogScore = _cogScore // 考核
 
-                        zongJson[i.name] ? "" : zongJson[i.name] = {}
 
-                        zongJson[i.name].evaScore ? zongJson[i.name].evaScore += _evaScore : zongJson[i.name].evaScore = _evaScore
 
-                        zongJson[i.name].cogScore ? zongJson[i.name].cogScore += _cogScore : zongJson[i.name].cogScore = _cogScore
 
-                    }
 
-
 
-                });
 
-            });
 
-            let zongArray = Object.keys(zongJson)
 
-            for (var i = 0; i < zongArray.length; i++) {
 
-                zongJson[zongArray[i]].evaScore = (zongJson[zongArray[i]].evaScore / data.length).toFixed(0)
 
-                zongJson[zongArray[i]].cogScore = (zongJson[zongArray[i]].cogScore / data.length).toFixed(0)
 
+          data.forEach(e => {
 
+            if (e.step == e.allStep) {
 
+              e.state = "已完成";
 
+            } else {
 
+              e.state = "未完成";
 
             }
 
             }
 
-            this.tableData = _data.filter((e) => {
 
-                e.score = this.getScore(e.json);
 
-                return e;
 
+            if (!e.tea) {
 
+              e.tea = "";
 
+            }
 
+            e.evaSca = e.evaSca.toFixed(0);
 
+            e.cogSco = e.cogSco.toFixed(0);
 
+          });
 
+          let _data = [];
 
+          let zongJson = {};
 
+          // zongJson.count = data.length
 
+          data.forEach((e, index) => {
 
+            _data[index] = {};
 
+            _data[index].username = e.username;
 
+            _data[index].evaSca = e.evaSca;
 
+            _data[index].cogSco = e.cogSco;
 
+            _data[index].json = [];
 
+
 
+            e.json.forEach((i, iindex) => {
 
+              if (
 
+                converter(i.name) == converter("科组评价") ||
 
+                converter(i.name) == converter("行政巡查")
 
+              ) {
 
+                return;
 
+              }
 
+              _data[index].json[iindex] = {};
 
+              _data[index].json[iindex].name = i.name;
 
+              let _evaScore = parseInt(
 
+                (i.evaScore * (100 / i.score)).toFixed(0)
 
+              );
 
+              let _cogScore = parseInt(
 
+                (i.cogScore * (100 / i.score)).toFixed(0)
 
+              );
 
+              _data[index].json[iindex].evaScore = _evaScore; // 自评
 
+              _data[index].json[iindex].cogScore = _cogScore; // 考核
 
+              zongJson[i.name] ? "" : (zongJson[i.name] = {});
 
+              zongJson[i.name].evaScore
 
+                ? (zongJson[i.name].evaScore += _evaScore)
 
+                : (zongJson[i.name].evaScore = _evaScore);
 
+              zongJson[i.name].cogScore
 
+                ? (zongJson[i.name].cogScore += _cogScore)
 
+                : (zongJson[i.name].cogScore = _cogScore);
 
+            });
 
+          });
 
+          let zongArray = Object.keys(zongJson);
 
+          for (var i = 0; i < zongArray.length; i++) {
 
+            zongJson[zongArray[i]].evaScore = (
 
+              zongJson[zongArray[i]].evaScore / data.length
 
+            ).toFixed(0);
 
+            zongJson[zongArray[i]].cogScore = (
 
+              zongJson[zongArray[i]].cogScore / data.length
 
+            ).toFixed(0);
 
+          }
 
+
 
+          this.tableData = _data
 
+            .filter(e => {
 
+              e.score = this.getScore(e.json);
 
+              return e;
 
             })
 
             })
 
             .sort((a, b) => b.score - a.score);
 
             .sort((a, b) => b.score - a.score);
 
-            console.log(this.tableData);
 
-            this.zongJson2 = zongJson
 
-            console.log(zongJson);
 
-        },
 
-        //获取分类类名
 
-        getTypeInfo() {
 
-            this.tabLoading = true;
 
-            let params = {
 
-                oid: this.oid
 
-            };
 
-            this.ajax
 
-                .get(this.$store.state.api + "selectPerInfoAllTea", params)
 
-                .then((res) => {
 
-                    this.typeInfo = res.data[0];
 
-                    let typeInfo = res.data[1];
 
-                    this.typeInfo.forEach((e) => {
 
-                        e.child = [];
 
-                        e.value = '';
 
-                        typeInfo.forEach((i) => {
 
-                            if (e.id == i.parentid) {
 
-                                e.child.push({ id: i.id, name: i.name })
 
-                            }
 
-                        })
 
-                    })
 
-                    this.getData()
 
-                })
 
-                .catch((err) => {
 
-                    this.tabLoading = false;
 
-                    console.error(err);
 
-                });
 
-        },
 
+          console.log(this.tableData);
 
+          this.zongJson = zongJson;
 
+          this.zongJson2 = zongJson;
 
+          console.log(zongJson);
 
+          this.options = Object.keys(zongJson).map(item => {
 
+            return { label: item, value: item };
 
+          });
 
+          this.data = data;
 
+          console.log(data);
 
+
 
+          this.tabLoading = false;
 
+          this.$forceUpdate();
 
+        })
 
+        .catch(error => {
 
+          this.tabLoading = false;
 
+          console.log(error);
 
+        });
 
+    },
 
+    setTeacher(array) {
 
+      this.teacherArray = array;
 
+      this.setArray();
 
+    },
 
+    setArray() {
 
+      let checkSet = this.checkSet;
 
+      let _data = [];
 
+      let zongJson = {};
 
+      let data = JSON.parse(JSON.stringify(this.data));
 
+      if (this.teacherArray.length) {
 
+        data = data.filter(e => {
 
+          return this.teacherArray.includes(e.userid);
 
+        });
 
+      }
 
+      data.forEach((e, index) => {
 
+        _data[index] = {};
 
+        _data[index].username = e.username;
 
+        if (checkSet == "") {
 
+          _data[index].evaSca = e.evaSca;
 
+          _data[index].cogSco = e.cogSco;
 
+          _data[index].json = [];
 
+        }
 
+
 
+        e.json.forEach((i, iindex) => {
 
+          if (
 
+            converter(i.name) == converter("科组评价") ||
 
+            converter(i.name) == converter("行政巡查")
 
+          ) {
 
+            return;
 
+          }
 
+          if (checkSet == i.name) {
 
+            _data[index].evaSca = i.evaScore;
 
+            _data[index].cogSco = i.cogScore;
 
+            _data[index].json = [];
 
+            i.children.forEach((ic, icindex) => {
 
+              _data[index].json[icindex] = {};
 
+              _data[index].json[icindex].name = ic.name;
 
+              let _evaScore = parseInt(
 
+                (ic.sco1 * 1 * (100 / ic.score)).toFixed(0)
 
+              );
 
+              let _cogScore = parseInt(
 
+                (ic.sco2 * 1 * (100 / ic.score)).toFixed(0)
 
+              );
 
+              _data[index].json[icindex].evaScore = _evaScore; // 自评
 
+              _data[index].json[icindex].cogScore = _cogScore; // 考核
 
+              zongJson[ic.name] ? "" : (zongJson[ic.name] = {});
 
+              zongJson[ic.name].evaScore
 
+                ? (zongJson[ic.name].evaScore += _evaScore)
 
+                : (zongJson[ic.name].evaScore = _evaScore);
 
+              zongJson[ic.name].cogScore
 
+                ? (zongJson[ic.name].cogScore += _cogScore)
 
+                : (zongJson[ic.name].cogScore = _cogScore);
 
+            });
 
+          } else if (checkSet == "") {
 
+            _data[index].json[iindex] = {};
 
+            _data[index].json[iindex].name = i.name;
 
+            let _evaScore = parseInt((i.evaScore * (100 / i.score)).toFixed(0));
 
+            let _cogScore = parseInt((i.cogScore * (100 / i.score)).toFixed(0));
 
+            _data[index].json[iindex].evaScore = _evaScore; // 自评
 
+            _data[index].json[iindex].cogScore = _cogScore; // 考核
 
+            zongJson[i.name] ? "" : (zongJson[i.name] = {});
 
+            zongJson[i.name].evaScore
 
+              ? (zongJson[i.name].evaScore += _evaScore)
 
+              : (zongJson[i.name].evaScore = _evaScore);
 
+            zongJson[i.name].cogScore
 
+              ? (zongJson[i.name].cogScore += _cogScore)
 
+              : (zongJson[i.name].cogScore = _cogScore);
 
+          }
 
+        });
 
+      });
 
+      let zongArray = Object.keys(zongJson);
 
+      for (var i = 0; i < zongArray.length; i++) {
 
+        zongJson[zongArray[i]].evaScore = (
 
+          zongJson[zongArray[i]].evaScore / data.length
 
+        ).toFixed(0);
 
+        zongJson[zongArray[i]].cogScore = (
 
+          zongJson[zongArray[i]].cogScore / data.length
 
+        ).toFixed(0);
 
+      }
 
+      this.tableData = _data
 
+        .filter(e => {
 
+          e.score = this.getScore(e.json);
 
+          return e;
 
+        })
 
+        .sort((a, b) => b.score - a.score);
 
+      console.log(this.tableData);
 
+      this.zongJson2 = zongJson;
 
+      console.log(zongJson);
 
     },
 
     },
 
-    mounted() {
 
-        this.getPageBase2(1)
 
-        this.getPageBase2(2)
 
-        this.getTypeInfo()
 
+    //获取分类类名
 
+    getTypeInfo() {
 
+      this.tabLoading = true;
 
+      let params = {
 
+        oid: this.oid
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectPerInfoAllTea", params)
 
+        .then(res => {
 
+          this.typeInfo = res.data[0];
 
+          let typeInfo = res.data[1];
 
+          this.typeInfo.forEach(e => {
 
+            e.child = [];
 
+            e.value = "";
 
+            typeInfo.forEach(i => {
 
+              if (e.id == i.parentid) {
 
+                e.child.push({ id: i.id, name: i.name });
 
+              }
 
+            });
 
+          });
 
+          this.getData();
 
+        })
 
+        .catch(err => {
 
+          this.tabLoading = false;
 
+          console.error(err);
 
+        });
 
     },
 
     },
 
+    changeTimeSort(){
 
+      this.cutPage(2);
 
+    }
 
+  },
 
+  mounted() {
 
+    this.getPageBase2(1);
 
+    this.getPageBase2(2);
 
+    this.getTypeInfo();
 
+  }
 
 };
 
 };
 
 </script>
 
 </script>
 
 
 
 <style scoped>
 
 <style scoped>
 
-.bbox_serch{
 
-    width: 100%;
 
-    margin-bottom: 10px;
 
-    display: flex;
 
-    align-items: center;
 
+.bbox_serch {
 
+  width: 100%;
 
+  margin-bottom: 10px;
 
+  display: flex;
 
+  align-items: center;
 
 }
 
 }
 
 
 
 .top {
 
 .top {
 
-    display: flex;
 
-    justify-content: space-between;
 
-    width: 100% !important;
 
-    box-sizing: border-box;
 
-    margin: 0px auto;
 
-    padding: 10px 0;
 
-    height: 54px;
 
+  display: flex;
 
+  justify-content: space-between;
 
+  width: 100% !important;
 
+  box-sizing: border-box;
 
+  margin: 0px auto;
 
+  padding: 10px 0;
 
+  height: 54px;
 
 }
 
 }
 
 
 
-
 
 .subClick {
 
 .subClick {
 
-    font-size: 16px;
 
-    cursor: pointer;
 
-    margin-left: 10px;
 
-    /* color: #ab582f; */
 
-    color: #409eff;
 
+  font-size: 16px;
 
+  cursor: pointer;
 
+  margin-left: 10px;
 
+  /* color: #ab582f; */
 
+  color: #409eff;
 
 }
 
 }
 
 
 
 .sub_head {
 
 .sub_head {
 
-    position: relative;
 
-    font-size: 20px;
 
-    font-weight: bold;
 
-    padding: 0 15px;
 
+  position: relative;
 
+  font-size: 20px;
 
+  font-weight: bold;
 
+  padding: 0 15px;
 
 }
 
 }
 
 
 
 .sub_head::after {
 
 .sub_head::after {
 
-    content: "";
 
-    width: 100%;
 
-    background: #3681FC;
 
-    height: 2px;
 
-    position: absolute;
 
-    left: 0;
 
-    bottom: -8px;
 
+  content: "";
 
+  width: 100%;
 
+  background: #3681fc;
 
+  height: 2px;
 
+  position: absolute;
 
+  left: 0;
 
+  bottom: -8px;
 
 }
 
 }
 
 
 
 .subClick {
 
 .subClick {
 
-    /* font-size: 16px; */
 
-    font-size: 20px;
 
-    cursor: pointer;
 
-    /* margin-left: 17.5px; */
 
-    /* color: #ab582f; */
 
-    /* color: #409eff; */
 
-    color: #999;
 
-    padding: 0 15px;
 
+  /* font-size: 16px; */
 
+  font-size: 20px;
 
+  cursor: pointer;
 
+  /* margin-left: 17.5px; */
 
+  /* color: #ab582f; */
 
+  /* color: #409eff; */
 
+  color: #999;
 
+  padding: 0 15px;
 
 }
 
 }
 
 
 
 .subClick:hover {
 
 .subClick:hover {
 
-    color: #000;
 
+  color: #000;
 
 }
 
 }
 
 
 
-.sub_head+.subClick,
 
-.subClick+.subClick,
 
-.subClick+.sub_head {
 
-    margin-left: 17.5px;
 
+.sub_head + .subClick,
 
+.subClick + .subClick,
 
+.subClick + .sub_head {
 
+  margin-left: 17.5px;
 
 }
 
 }
 
 
 
 .bbox {
 
 .bbox {
 
-    background: #fff;
 
-    border-radius: 0 5px 5px 5px;
 
-    padding: 15px 0;
 
-    box-sizing: border-box;
 
-    min-height: 900px;
 
+  background: #fff;
 
+  border-radius: 0 5px 5px 5px;
 
+  padding: 15px 0;
 
+  box-sizing: border-box;
 
+  min-height: 900px;
 
 }
 
 }
 
 
 
 .bbox_nav {
 
 .bbox_nav {
 
-    display: flex;
 
-    width: 100%;
 
-    box-sizing: border-box;
 
-    padding: 0 20px;
 
-    align-items: center;
 
+  display: flex;
 
+  width: 100%;
 
+  box-sizing: border-box;
 
+  padding: 0 20px;
 
+  align-items: center;
 
 }
 
 }
 
 
 
 .teaLis {
 
 .teaLis {
 
-    display: flex;
 
+  display: flex;
 
 }
 
 }
 
 
 
 .teal {
 
 .teal {
 
-    padding: 10px 20px;
 
-    cursor: pointer;
 
+  padding: 10px 20px;
 
+  cursor: pointer;
 
 }
 
 }
 
 
 
 .Tbor {
 
 .Tbor {
 
-    border-bottom: 2px rgba(54, 129, 252, 1) solid;
 
-    font-weight: 600;
 
+  border-bottom: 2px rgba(54, 129, 252, 1) solid;
 
+  font-weight: 600;
 
 }
 
 }
 
 
 
-
 
 .randarZong {
 
 .randarZong {
 
-    max-width: 100%;
 
-    width: 500px;
 
-    height: 500px;
 
-    margin: 0 auto;
 
+  max-width: 100%;
 
+  width: 500px;
 
+  height: 500px;
 
+  margin: 0 auto;
 
 }
 
 }
 
 
 
 .randarBox {
 
 .randarBox {
 
-    padding: 20px;
 
-    width: 100%;
 
-    box-sizing: border-box;
 
-    display: flex;
 
-    flex-wrap: wrap;
 
+  padding: 20px;
 
+  width: 100%;
 
+  box-sizing: border-box;
 
+  display: flex;
 
+  flex-wrap: wrap;
 
 }
 
 }
 
 
 
 .randarBox .title {
 
 .randarBox .title {
 
-    width: 100%;
 
-    font-size: 18px;
 
-    font-weight: 700;
 
-    margin-bottom: 20px;
 
+  width: 100%;
 
+  font-size: 18px;
 
+  font-weight: 700;
 
+  margin-bottom: 20px;
 
 }
 
 }
 
 
 
 .randarTeacher {
 
 .randarTeacher {
 
-    width: calc(100% / 4 - 20px);
 
-    margin-right: 20px;
 
-    margin-bottom: 20px;
 
+  width: calc(100% / 4 - 20px);
 
+  margin-right: 20px;
 
+  margin-bottom: 20px;
 
 }
 
 }
 
 
 
-
 
 .randarTitle {
 
 .randarTitle {
 
-    display: flex;
 
-    align-items: center;
 
-    justify-content: space-between;
 
-    margin-bottom: 10px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: space-between;
 
+  margin-bottom: 10px;
 
 }
 
 }
 
 
 
-.randarTitle>span:nth-child(1) {}
 
+.randarTitle > span:nth-child(1) {
 
+}
 
 
 
-.randarTitle>span:nth-child(2) {}
 
+.randarTitle > span:nth-child(2) {
 
+}
 
 
 
 .randar {
 
 .randar {
 
-    width: calc(100%);
 
-    height: 350px;
 
-    border: 1px solid #e4e4e4;
 
-    border-radius: 5px;
 
+  width: calc(100%);
 
+  height: 350px;
 
+  border: 1px solid #e4e4e4;
 
+  border-radius: 5px;
 
 }
 
 }
 
 
 
 @media screen and (max-width: 1280px) {
 
 @media screen and (max-width: 1280px) {
 
-    .randarTeacher {
 
-        width: calc(100% / 2 - 20px);
 
-    }
 
+  .randarTeacher {
 
+    width: calc(100% / 2 - 20px);
 
+  }
 
 }
 
 }
 
 
 
 @media screen and (max-width: 800px) {
 
 @media screen and (max-width: 800px) {
 
-    .randarTeacher {
 
-        width: calc(100%);
 
-        margin-right: 0;
 
-    }
 
+  .randarTeacher {
 
+    width: calc(100%);
 
+    margin-right: 0;
 
+  }
 
 }
 
 }
 
-</style>
 
+</style>

+ 105 - 14
src/components/pages/testPerson/portrait/index.vue
Näytä tiedosto 

@@ -1,6 +1,17 @@
 
 <template>
 
 <template>
 
   <div class="portrait">
 
   <div class="portrait">
 
-    <div class="p_left">
 
+    <div class="p_top">
 
+      <el-select v-model="selectTime" placeholder="请选择" v-if="timeSort.length >1" @change="changeTimeSort">
 
+    <el-option
 
+      v-for="item in timeSort"
 
+      :key="item.id"
 
+      :label="item.label"
 
+      :value="item.id">
 
+    </el-option>
 
+  </el-select>
 
+    </div>
 
+    <div class="p_bottom">
 
+      <div class="p_left">
 
       <div class="p_l_top">
 
       <div class="p_l_top">
 
         <div class="teachingActivity" v-loading="cardNumLoading">
 
         <div class="teachingActivity" v-loading="cardNumLoading">
 
 					<img :src="require('../../../../assets/icon/testPerson/bg1.png')" alt="">
 
 					<img :src="require('../../../../assets/icon/testPerson/bg1.png')" alt="">
 
@@ -134,7 +145,7 @@
 
     </div>
 
     </div>
 
     <div
 
     <div
 
       class="p_center"
 
       class="p_center"
 
-      v-if="ExamineBase.length > 0"
 
+      v-if="ExamineBase.length > 0 && annualAssessmentECharts.radar.indicator.length > 0"
 
       v-loading="annualAssessmentLoading"
 
       v-loading="annualAssessmentLoading"
 
     >
 
     >
 
       <div class="p_title">
 
       <div class="p_title">
 
@@ -187,6 +198,7 @@
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
+    </div>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 
 
@@ -253,17 +265,28 @@ export default {
 
       annualAssessmentECharts: {
 
       annualAssessmentECharts: {
 
         legend: {
 
         legend: {
 
           data: ["自评得分率", "认定得分率", "全体教师平均得分率"],
 
           data: ["自评得分率", "认定得分率", "全体教师平均得分率"],
 
-          bottom: 0
 
+          bottom: 0,
 
+          textStyle: {
 
+            color: "black"
 
+          }
 
         },
 
         },
 
         radar: {
 
         radar: {
 
           // shape: 'circle',
 
           // shape: 'circle',
 
-          indicator: []
 
+          indicator: [],
 
+          name: {
 
+            textStyle: {
 
+              color: "black"
 
+            }
 
+          }
 
         },
 
         },
 
         series: [
 
         series: [
 
           {
 
           {
 
             name: "",
 
             name: "",
 
             type: "radar",
 
             type: "radar",
 
-            data: []
 
+            data: [],
 
+            label: {
 
+              color: "black"
 
+            }
 
           }
 
           }
 
         ]
 
         ]
 
       },
 
       },
 
@@ -412,7 +435,7 @@ export default {
 
         .then(res => {
 
         .then(res => {
 
           let data = res.data[0];
 
           let data = res.data[0];
 
 
 
-          if(this.selectTime){
 
+          if(this.selectTime && this.timeSort.length > 1 ){
 
             data = data.filter(item => item.time == this.selectTime);
 
             data = data.filter(item => item.time == this.selectTime);
 
           }
 
           }
 
 
 
@@ -526,7 +549,8 @@ export default {
 
               label: {
 
               label: {
 
                 show: true,
 
                 show: true,
 
                 formatter: `{c}`,
 
                 formatter: `{c}`,
 
-                fontSize: 12
 
+                fontSize: 12,
 
+                color: "#000000" // 设置字体颜色为黑色
 
               }
 
               }
 
             },
 
             },
 
             {
 
             {
 
@@ -535,7 +559,8 @@ export default {
 
               label: {
 
               label: {
 
                 show: true,
 
                 show: true,
 
                 formatter: `{c}`,
 
                 formatter: `{c}`,
 
-                fontSize: 12
 
+                fontSize: 12,
 
+                color: "#000000" // 设置字体颜色为黑色
 
               }
 
               }
 
             },
 
             },
 
             {
 
             {
 
@@ -544,11 +569,12 @@ export default {
 
               label: {
 
               label: {
 
                 show: true,
 
                 show: true,
 
                 formatter: `{c}`,
 
                 formatter: `{c}`,
 
-                fontSize: 12
 
+                fontSize: 12,
 
+                color: "#000000" // 设置字体颜色为黑色
 
               }
 
               }
 
             }
 
             }
 
           ];
 
           ];
 
-					
+
 
           zongArray.forEach(i => {
 
           zongArray.forEach(i => {
 
 						if(zongJson[i].selfEvaScore || zongJson[i].selfEvaScore === 0){
 
 						if(zongJson[i].selfEvaScore || zongJson[i].selfEvaScore === 0){
 
 							_eChartsData[0].value.push(zongJson[i].selfEvaScore);
 
 							_eChartsData[0].value.push(zongJson[i].selfEvaScore);
 
@@ -591,9 +617,34 @@ export default {
 
       this.ajax
 
       this.ajax
 
         .get(this.$store.state.api + "selectTestUserY", params)
 
         .get(this.$store.state.api + "selectTestUserY", params)
 
         .then(res => {
 
         .then(res => {
 
-          (this.teachingActivityNum = res.data[4].length),
 
-            (this.teachingAndResearchActivitiesNum = res.data[5].length);
 
-          this.trainingActivityNum = res.data[3].length;
 
+          let _data1 =  res.data[4];
 
+          let _data2 = res.data[5];
 
+          let _data3 = res.data[3];
 
+
 
+          if(this.selectTime && this.timeSort.length>1){
 
+            _data1 = _data1.filter(i=>{
 
+              let _time = this.timeSort.find(j=>j.id == this.selectTime).time;
 
+              let _iTime = new Date(i.update_at).getFullYear();
 
+              return _iTime == _time;
 
+            })
 
+
 
+            _data2 = _data2.filter(i=>{
 
+              let _time = this.timeSort.find(j=>j.id == this.selectTime).time;
 
+              let _iTime = new Date(i.create_at).getFullYear();
 
+              return _iTime == _time;
 
+            })
 
+
 
+            _data3 = _data3.filter(i=>{
 
+              let _time = this.timeSort.find(j=>j.id == this.selectTime).time;
 
+              let _iTime = new Date(i.update_at).getFullYear();
 
+              return _iTime == _time;
 
+            })
 
+
 
+          }
 
+
 
+          this.teachingActivityNum = _data1.length;
 
+          this.teachingAndResearchActivitiesNum = _data2.length;
 
+          this.trainingActivityNum =_data3.length;
 
           this.cardNumLoading = false;
 
           this.cardNumLoading = false;
 
         })
 
         })
 
         .catch(err => {
 
         .catch(err => {
 
@@ -614,6 +665,28 @@ export default {
 
           let array3 = res.data[2];
 
           let array3 = res.data[2];
 
           let typeList = res.data[3];
 
           let typeList = res.data[3];
 
 
 
+
 
+          if(this.selectTime && this.timeSort.length>1){
 
+            array1 = array1.filter(i=>{
 
+              let _time = this.timeSort.find(j=>j.id == this.selectTime).time;
 
+              let _iTime = new Date(i.create_at).getFullYear();
 
+              return _iTime == _time;
 
+            })
 
+
 
+            array2 = array2.filter(i=>{
 
+              let _time = this.timeSort.find(j=>j.id == this.selectTime).time;
 
+              let _iTime = new Date(i.create_at).getFullYear();
 
+              return _iTime == _time;
 
+            })
 
+
 
+            array3 = array3.filter(i=>{
 
+              let _time = this.timeSort.find(j=>j.id == this.selectTime).time;
 
+              let _iTime = new Date(i.update_at).getFullYear();
 
+              return _iTime == _time;
 
+            })
 
+          }
 
+
 
+
 
           let countCourse1 = [];
 
           let countCourse1 = [];
 
           let wordCount1 = 0;
 
           let wordCount1 = 0;
 
           let audioCount1 = 0;
 
           let audioCount1 = 0;
 
@@ -758,6 +831,12 @@ export default {
 
 		checkArrayInclusion(arr1, arr2) {
 
 		checkArrayInclusion(arr1, arr2) {
 
       return arr1.every((item) => arr2.includes(item));
 
       return arr1.every((item) => arr2.includes(item));
 
     },
 
     },
 
+    changeTimeSort(){
 
+      console.log(this.selectTime)
 
+      this.getAnnualAssessmentEChartsData();
 
+      this.getCardData();
 
+      this.getData();
 
+    },
 
   },
 
   },
 
   mounted() {
 
   mounted() {
 
     this.getPageBase2(1)
 
     this.getPageBase2(1)
 
@@ -775,10 +854,22 @@ export default {
 
   height: calc(100% - 20px);
 
   height: calc(100% - 20px);
 
   margin: 10px 0;
 
   margin: 10px 0;
 
   display: flex;
 
   display: flex;
 
+  flex-direction: column;
 
   overflow: auto;
 
   overflow: auto;
 
 }
 
 }
 
 
 
-.portrait > div {
 
+.p_top {
 
+ width: 100%;
 
+ height: 60px;
 
+}
 
+
 
+.p_bottom{
 
+  width: 100%;
 
+  flex: 1;
 
+  display: flex;
 
+}
 
+
 
+.p_bottom > div {
 
   margin: 0 10px;
 
   margin: 0 10px;
 
   /* background-color: #fff; */
 
   /* background-color: #fff; */
 
   border-radius: 5px;
 
   border-radius: 5px;

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä