时间段查询学情问题

src/utils/learning/chartData.js

@@ -169,6 +169,11 @@ export function certificateOption(xAxisData, seriesJoin, seriesCert, seriesRate)
     legend: {
       data: ["参与人数", "获证人数", "获证比例"]
     },
+    grid: {
+      left: 20,
+      right: 20,
+      containLabel: true
+    },
     xAxis: [
       {
         axisLabel: {
@@ -288,6 +293,11 @@ export function durationOption(xAxisData, seriesData) {
       start: 0,
       end: 100
     },
+    grid: {
+      left: 20,
+      right: 20,
+      containLabel: true
+    },
     xAxis: [
       {
         axisLabel: {
@@ -466,9 +476,8 @@ export function knowledgeEffect(xAxisData, seriesBefore, seriesAfter) {
       data: ["培训前正确率", "培训后正确率"]
     },
     grid: {
-      left: "3%",
-      right: "4%",
-      bottom: "3%",
+      left: 20,
+      right: 20,
       containLabel: true
     },
     xAxis: {
@@ -545,9 +554,8 @@ export function examTimes(xAxisData, seriesData) {
     },
     color: ['#449284'],
     grid: {
-      left: "3%",
-      right: "4%",
-      bottom: "3%",
+      left: 20,
+      right: 20,
       containLabel: true
     },
     dataZoom: {
@@ -621,9 +629,8 @@ export function examScore(xAxisData, seriesData) {
     },
     color: ['#CAA861'],
     grid: {
-      left: "3%",
-      right: "4%",
-      bottom: "3%",
+      left: 20,
+      right: 20,
       containLabel: true
     },
     dataZoom: {

src/views/learning/item-course-analysis.vue

@@ -237,7 +237,7 @@ export default {
         routerData.region = reportParamModel.regionNames;
         routerData.organization = reportParamModel.hospitalNames;
         routerData.projectId = reportParamModel.projectId,
-        routerData.projectName = ' ',
+        routerData.projectName = reportParamModel.projectName,
         routerData.tableType = 1;
         routerData.courseId = data.courseId;
         routerData.beginDate = reportParamModel.beginDate;

src/views/learning/item-crowd-analysis.vue

 <template>
   <div class="crowd-analysis-wrap">
     <el-radio-group class="crowd-radio" v-model="radio" size="small" @change="updateRadio">
-      <el-radio-button label="0">全部用户</el-radio-button>
+      <el-radio-button label="0">全部人员</el-radio-button>
       <el-radio-button label="1">参与项目</el-radio-button>
       <el-radio-button label="2">通过项目</el-radio-button>
     </el-radio-group>
@@ -14,7 +14,7 @@
     </div>
     <div class="chart" v-show="showData">
       <div class="item">
-        <div class="title">用户性别分布</div>
+        <div class="title">人员性别分布</div>
         <div class="sex">
           <div class="sex-item" v-for="(item , index) in sexData" :key="index">
             <!-- <img class="sex-img" v-bind:src="item.src" /> -->

src/views/learning/item-data-all.vue

@@ -283,7 +283,7 @@ export default {
       totalCount: 0,
       gradeFlag: [false, false, false, false],
       hospitalCnt: '',
-      hospitalId: [],
+      hospitalCutList: [],
       certFlag: 0,
       downloadId: null,
       timeInfoChild: {},
@@ -351,7 +351,7 @@ export default {
           vm.hospitalCnt = res.data.hospitalCnt;
           // vm.hospitalCnt = 1;
           if(vm.hospitalCnt == 1) {
-            vm.hospitalId[0] = res.data.list[0].hospitalId;
+            vm.hospitalCutList = res.data.list;
           }
           // vm.searchType();
           vm.getDisplay();
@@ -405,6 +405,10 @@ export default {
         pageNo: vm.formTable.pageNo,
         pageSize: vm.formTable.pageSize,
       };
+      if(req.hospitalIdList.length == 0) {
+        req.hospitalIdList = [];
+        req.hospitalIdList = hospitalCutList[0].hospitalId;
+      }
       openLoading(vm);
       if(req.regionId == "000") {
         req.regionId = "310";

src/views/learning/item-examination-analysis.vue

@@ -348,7 +348,7 @@ export default {
         routerData.region = reportParamModel.regionNames;
         routerData.organization = reportParamModel.hospitalNames;
         routerData.projectId = reportParamModel.projectId,
-        routerData.projectName = ' ',
+        routerData.projectName = reportParamModel.projectName,
         routerData.tableType = 2;
         routerData.examId = data.examId;
         routerData.beginDate = reportParamModel.beginDate;

src/views/learning/item-list.vue

@@ -317,7 +317,8 @@ export default {
         regionNames: "",
         hospitalNames: "",
         originalFlag: 1
-      }
+      },
+      hospitalCntList: [],
     };
   },
   computed: {
@@ -360,12 +361,19 @@ export default {
         if(res.code == "000000") {
           vm.timeInfoData = res.data;
           vm.reportParamModel = res.data.reportParamModel;
+          let doctorInfoRep = res.data.doctorInfoRep;
           setTimeout(function() {
             vm.$refs.childDataAll.$emit("static");
             vm.$refs.childCrowd.$emit("static");
+            if(doctorInfoRep.existCourse == 1) {
               vm.$refs.childCourse.$emit("static");
+            }
+            if(doctorInfoRep.existExam == 1) {
               vm.$refs.childExam.$emit("static");
+            }
+            if(doctorInfoRep.existEffect == 1) {
               vm.$refs.childEffect.$emit("static");
+            }
           },20);
         } else {
           vm.$message(res.message);
@@ -514,6 +522,19 @@ export default {
             res.data.list
           );
           vm.search();
+          vm.gethHspitalsCnt();
+        }
+      });
+    },
+    gethHspitalsCnt() {
+      let req = {
+        projectId: vm.projectId,
+        regionId: vm.formInline.region[vm.formInline.region.length - 1]
+      };
+      vm.GET("stats/region/hospitals/cnt", req).then(res => {
+        if (res.code == "000000") {
+          vm.hospitalCnt = res.data.hospitalCnt;
+          vm.hospitalCntList = res.data.list
         }
       });
     },
@@ -582,6 +603,17 @@ export default {
         hospitalNames: vm.dialogData.organization,
         regionNames: vm.dialogData.region,
       };
+      if(vm.organizationList.length == 1) {
+        req.hospitalIdList = [];
+        req.hospitalIdList[0] = vm.organizationList[0].value;
+      }
+      if(req.regionNames == '全部') {
+        //全部地区 机构只有一个情况
+        if(vm.hospitalCntList.length == 1) {
+          req.hospitalIdList = [];
+          req.hospitalIdList[0] = vm.hospitalCntList[0].hospitalId;
+        }
+      }
       openLoading(vm);
       vm.POST("stats/export/time", req).then(res => {
         closeLoading(vm);
@@ -598,11 +630,17 @@ export default {
       if(vm.formInline.timeFlag == 1) {
         //截止昨日
         vm.setExportReq();
-        this.$refs.childDataAll.$emit("search");
-        this.$refs.childCrowd.$emit("search");
-        this.$refs.childCourse.$emit("search");
-        this.$refs.childExam.$emit("search");
-        this.$refs.childEffect.$emit("search");
+        vm.$refs.childDataAll.$emit("search");
+        vm.$refs.childCrowd.$emit("search");
+        if(vm.displayCourse == 1) {
+          vm.$refs.childCourse.$emit("search");
+        }
+        if(vm.displayExam == 1) {
+          vm.$refs.childExam.$emit("search");
+        }
+        if(vm.displayEffect == 1) {
+          vm.$refs.childEffect.$emit("search");
+        }
       } else if(vm.formInline.timeFlag == 2) {
         //开始时间结束时间
         if(vm.formInline.during == null) {