学期报告图表

src/views/learning/item-list.vue

@@ -97,6 +97,15 @@
             :organizationList="organizationList"
           ></examination-analysisfrom>
         </el-tab-pane>
+        <el-tab-pane label="数据总览" name="fifth">
+          <data-all
+            ref="childDataAll"
+            :formInline="formInline"
+            :activeName="activeName"
+            :organizationNum="organizationNum"
+            :organizationList="organizationList"
+          ></data-all>
+        </el-tab-pane>
         <!-- <el-tab-pane label="学习效果分析" name="fifth" lazy>
           <learning-effect></learning-effect>
         </el-tab-pane>-->
@@ -130,6 +139,7 @@ import PartIn from "./item-part-in.vue";
 import ExaminationAnalysisfrom from "./item-examination-analysis.vue";
 import LearningEffect from "./item-learning-effect.vue";
 import DataAlignment from "./data-alignment.vue";
+import DataAll from "./item-data-all.vue";
 import { create } from "domain";
 import { mapGetters } from "vuex";
 import { openLoading, closeLoading } from "../../utils/utils";
@@ -146,7 +156,8 @@ export default {
     PartIn,
     ExaminationAnalysisfrom,
     LearningEffect,
-    DataAlignment
+    DataAlignment,
+    DataAll,
   },
   data() {
     return {
@@ -212,7 +223,7 @@ export default {
         // organizationData: "",
       },
       tags: [],
-      activeName: "first",
+      activeName: "fifth",
       organizationNum: 0,
       dialogVisible: false,
       dialogUpdate: false,
@@ -387,6 +398,11 @@ export default {
         openLoading(vm);
         vm.GET("basic-data/position/provinces", req).then(res => {
           closeLoading(vm);
+          // let list = [];
+          // for(let i =0;i<res.data.provinceList.length;i++) {
+          //   list[i] = res.data.provinceList[i].provinceName;
+          // }
+          // console.log(list);
           if (res.code == "000000") {
             this.optionsRegion = operationData.setRegionOption(
               res.data.provinceList