导出学情问题

src/utils/learning/chartData.js

@@ -67,15 +67,22 @@ export function recordOption(legendData, xAxisData, seriesData) {
         divList[3] = "<div style='background: #39AF9A;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
         divList[4] = "<div style='background: #5D7092;height: 12px;width: 20px;margin: 5px 5px 0 2px;float: left;border-radius:2px;'></div>";
         for (let j = params.length - 1; j >= 0; j--) {
-          relVal +=
-            "<br/>" + divList[j] +
-            params[j].seriesName +
-            "占比： " +
-            (
-              (100 * parseFloat(params[j].value)) /
-              parseFloat(value)
-            ).toFixed(2) +
-            "%";
+          if(value != 0) {
+            relVal +=
+              "<br/>" + divList[j] +
+              params[j].seriesName +
+              "占比： " +
+              (
+                (100 * parseFloat(params[j].value)) /
+                parseFloat(value)
+              ).toFixed(2) +
+              "%";
+          } else {
+            relVal +=
+              "<br/>" + divList[j] +
+              params[j].seriesName +
+              "占比： "+ "0%";
+          }
         }
         return relVal;
       }

src/utils/operation.js

@@ -693,4 +693,23 @@ export function setDuringTime(time , type) {
     value = time[1];
   }
   return value;
+}
+export function setHospitalIdList(data) {
+  let listStr = '';
+  if(data == null || data.length == 0) {
+    return listStr
+  }
+  for(let i = 0 ; i<data.length ; i++) {
+    listStr += data[i]+'_';
+  }
+  listStr = listStr.substring(0, listStr.length - 1);
+  return listStr;
+}
+export function getHospitalIdList(data) {
+  let listArr = [];
+  if(data == null || data == '') {
+    return listArr
+  }
+  listArr = data.split("_")
+  return listArr;
 }
\ No newline at end of file

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

@@ -230,7 +230,7 @@ export default {
         routerData.regionId = vm.formInline.region[vm.formInline.region.length - 1];
         routerData.originalFlag = vm.formInline.checked == false ? 0 : 1;
         routerData.timeFlag = vm.formInline.timeFlag;
-        routerData.hospitalIdList = vm.formInline.organization;
+        routerData.hospitalIdList = operationData.setHospitalIdList(vm.formInline.organization);
       } else {
         let reportParamModel = vm.timeInfoChild.reportParamModel;
         routerData.base = 'static';
@@ -245,7 +245,7 @@ export default {
         routerData.regionId = reportParamModel.regionId;
         routerData.originalFlag = reportParamModel.originalFlag;
         routerData.timeFlag = reportParamModel.timeFlag;
-        routerData.hospitalIdList = reportParamModel.hospitalIdList;
+        routerData.hospitalIdList = operationData.setHospitalIdList(reportParamModel.hospitalIdList);
       }
 
       // this.$router.push({ path: '/name-list', query: routerData});

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

@@ -137,7 +137,7 @@ export default {
       setTimeout(function() {
         vm.educationDivision(userAnalysisModel.eduListInMap[0]);
         vm.jobDivision(userAnalysisModel.titleListInMap[0]);
-        // vm.getSexData(userAnalysisModel.eduListInMap[0]);
+        vm.getSexData(userAnalysisModel.sexListInMap[0]);
         vm.ageDivision(userAnalysisModel.ageListInMap[0]);
       },20);
     },
@@ -194,7 +194,7 @@ export default {
         setTimeout(function() {
           vm.educationDivision(userAnalysisModel.eduListInMap[index]);
           vm.jobDivision(userAnalysisModel.titleListInMap[index]);
-          // vm.getSexData(userAnalysisModel.eduListInMap[index]);
+          vm.getSexData(userAnalysisModel.sexListInMap[index]);
           vm.ageDivision(userAnalysisModel.ageListInMap[index]);
         },20);
       }

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

@@ -160,7 +160,7 @@
       <div class="spacing"></div>
       <div class="person">
         <div class="person-title">项目人员情况</div>
-        <el-tabs class="tabs-person" v-model="tableType" type="card" @tab-click="handlePerson">
+        <el-tabs v-if="downloadId == null" class="tabs-person" v-model="tableType" type="card" @tab-click="handlePerson">
           <el-tab-pane label="已获证" name="1"></el-tab-pane>
           <el-tab-pane label="未获证" name="2"></el-tab-pane>
           <el-tab-pane label="未参与" name="3"></el-tab-pane>
@@ -289,6 +289,14 @@ export default {
       timeInfoChild: {},
     };
   },
+  watch: {
+    timeInfoData: {
+      deep: true,
+      handler(nv, ov) {
+        vm.timeInfoChild = nv;
+      }
+    }
+  },
   created() {
     vm = this;
     vm.projectId = vm.getUrlSearch(window.location.href, "id");
@@ -302,34 +310,36 @@ export default {
       vm.getStatic();
     });
   },
-  watch: {
-    timeInfoData: {
-      deep: true,
-      handler(nv, ov) {
-        vm.timeInfoChild = nv;
-      }
-    }
-  },
   methods: {
     getStatic() {
-      // console.log(vm.timeInfoChild);
+      // console.log(vm.timeInfoChild.reportParamModel);
       if(vm.timeInfoChild.reportParamModel.hospitalIdList != null && vm.timeInfoChild.reportParamModel.hospitalIdList.length == 1) {
-        vm.dataType == 1;
+        vm.dataType = 1;
       } else {
-        vm.dataType == 0;
+        vm.dataType = 0;
       }
+      // console.log('展示all类型：',vm.dataType)
       vm.setStatic();
     },
     setStatic() {
       vm.certFlag = vm.timeInfoChild.doctorInfoRep.certFlag;
+      vm.searchDwmy();
       vm.initCard(vm.timeInfoChild.genSituationModel.percentData);
-      setTimeout(function(){
-        // vm.setRecordChart(vm.timeInfoChild.genSituationModel.costRank.eduData);
-        if(vm.certFlag !== 0) {
-          vm.setCertificateChart(vm.timeInfoChild.genSituationModel.studyRankMap[0]);
-          vm.setDurationChart(vm.timeInfoChild.genSituationModel.costRank);
-        }
-      },20)
+      if(vm.dataType == 0) {
+        //多个机构
+        setTimeout(function(){
+          vm.setRecordChart(vm.timeInfoChild.genSituationModel.eduData);
+          if(vm.certFlag !== 0) {
+            vm.setCertificateChart(vm.timeInfoChild.genSituationModel.studyRankMap[0]);
+            vm.setDurationChart(vm.timeInfoChild.genSituationModel.costRank);
+          }
+        },20)
+      } else {
+        //单个几个
+        let genSituationModel = vm.timeInfoChild.genSituationModel;
+        vm.totalRows = genSituationModel.personData.length;
+        vm.tableData = genSituationModel.personData;
+      }
     },
     gethHspitalsCnt() {
       let req = {
@@ -445,19 +455,37 @@ export default {
       });
     },
     searchDwmy() {
-      let req = {
-        projectId: vm.projectId,
-        beginDate: operationData.setDuringTime(vm.formInline.during,'begin'),
-        endDate: operationData.setDuringTime(vm.formInline.during,'end'),
-        hospitalIdList: vm.formInline.organization,
-        originalFlag: vm.formInline.checked == false ? 0 : 1,
-        regionId: vm.formInline.region[vm.formInline.region.length - 1],
-        timeFlag: vm.formInline.timeFlag,
-        timeType: parseInt(vm.checkTime),
-        dataType: parseInt(vm.checkRange),
-        pageNo: vm.formDwmy.pageNo,
-        pageSize: vm.formDwmy.pageSize,
-      };
+      let req = {};
+      if(vm.downloadId == null) {
+        req = {
+          projectId: vm.projectId,
+          beginDate: operationData.setDuringTime(vm.formInline.during,'begin'),
+          endDate: operationData.setDuringTime(vm.formInline.during,'end'),
+          hospitalIdList: vm.formInline.organization,
+          originalFlag: vm.formInline.checked == false ? 2 : 1,
+          regionId: vm.formInline.region[vm.formInline.region.length - 1],
+          timeFlag: vm.formInline.timeFlag,
+          timeType: parseInt(vm.checkTime),
+          dataType: parseInt(vm.checkRange),
+          pageNo: vm.formDwmy.pageNo,
+          pageSize: vm.formDwmy.pageSize,
+        };
+      } else {
+        let reportParamModel = vm.timeInfoChild.reportParamModel;
+        req = {
+          projectId: reportParamModel.projectId,
+          beginDate: reportParamModel.beginDate,
+          endDate: reportParamModel.endDate,
+          hospitalIdList: reportParamModel.hospitalIdList,
+          originalFlag: reportParamModel.originalFlag,
+          regionId: reportParamModel.regionId,
+          timeFlag: reportParamModel.timeFlag,
+          timeType: parseInt(vm.checkTime),
+          dataType: parseInt(vm.checkRange),
+          pageNo: vm.formDwmy.pageNo,
+          pageSize: vm.formDwmy.pageSize,
+        };
+      }
       openLoading(vm);
       if(req.regionId == '000') {
         req.regionId = '0';

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

@@ -191,7 +191,6 @@ export default {
       vm.totalRows = examAnalysisModel.examListDto.totalRows;
     },
     search() {
-      let checkAll = operationData.hasAll(vm.formInline.organization);
       let req = {
         projectId: vm.projectId,
         beginDate: operationData.setDuringTime(vm.formInline.during, "begin"),
@@ -327,23 +326,38 @@ export default {
     },
     // 跳转查看名单页面
     goPage(data) {
-      let checkAll = operationData.hasAll(vm.formInline.organization);
       let routerData = {};
-      routerData = this.dialogData;
-      routerData.projectId = vm.projectId;
-      routerData.projectName = vm.getUrlSearch(
-        window.location.href,
-        "projectName"
-      );
-      routerData.tableType = 2;
-      routerData.examId = data.examId;
-      routerData.beginDate = operationData.setDuringTime(vm.formInline.during, "begin"),
-      routerData.endDate = operationData.setDuringTime(vm.formInline.during, "end"),
-      routerData.regionId = vm.formInline.region[vm.formInline.region.length - 1];
-      routerData.originalFlag = vm.formInline.checked == false ? 0 : 1;
-      routerData.timeFlag = vm.formInline.timeFlag;
-      routerData.hospitalIdList = vm.formInline.organization;
-
+      if(vm.downloadId == null) {
+        routerData = this.dialogData;
+        routerData.projectId = vm.projectId;
+        routerData.projectName = vm.getUrlSearch(
+          window.location.href,
+          "projectName"
+        );
+        routerData.tableType = 2;
+        routerData.examId = data.examId;
+        routerData.beginDate = operationData.setDuringTime(vm.formInline.during, "begin"),
+        routerData.endDate = operationData.setDuringTime(vm.formInline.during, "end"),
+        routerData.regionId = vm.formInline.region[vm.formInline.region.length - 1];
+        routerData.originalFlag = vm.formInline.checked == false ? 0 : 1;
+        routerData.timeFlag = vm.formInline.timeFlag;
+        routerData.hospitalIdList = operationData.setHospitalIdList(vm.formInline.organization);
+      } else {
+        let reportParamModel = vm.timeInfoChild.reportParamModel;
+        routerData.base = 'static';
+        routerData.region = reportParamModel.regionNames;
+        routerData.organization = reportParamModel.hospitalNames;
+        routerData.projectId = reportParamModel.projectId,
+        routerData.projectName = ' ',
+        routerData.tableType = 2;
+        routerData.examId = data.examId;
+        routerData.beginDate = reportParamModel.beginDate;
+        routerData.endDate = reportParamModel.endDate;
+        routerData.regionId = reportParamModel.regionId;
+        routerData.originalFlag = reportParamModel.originalFlag;
+        routerData.timeFlag = reportParamModel.timeFlag;
+        routerData.hospitalIdList = operationData.setHospitalIdList(reportParamModel.hospitalIdList);
+      }
 
       // this.$router.push({ path: '/name-list', query: routerData});
       let routeData = this.$router.resolve({

src/views/learning/item-list.vue

@@ -283,7 +283,7 @@ export default {
         // organizationData: "",
       },
       tags: [],
-      activeName: "third",
+      activeName: "zero",
       organizationNum: 0,
       dialogVisible: false,
       dialogUpdate: false,
@@ -347,7 +347,7 @@ export default {
       if(vm.downloadId == null) {
         vm.getDisplay();
       }
-      if(vm.projectId == '' || vm.projectId == null) {
+      if(vm.downloadId != null) {
         vm.staticData = 1;
         vm.exportTimeInfo();
       }
@@ -651,13 +651,19 @@ export default {
       }
     },
     exportExcel() {
-      //按钮置灰三秒
-      vm.exportStatus = true;
-      setTimeout(function() {
-        vm.exportStatus = false;
-      },3000);
-      this.dialogVisible = true;
-      //download接口
+      if(vm.downloadId == null) {
+        //按钮置灰三秒
+        vm.exportStatus = true;
+        setTimeout(function() {
+          vm.exportStatus = false;
+        },3000);
+        this.dialogVisible = true;
+      } else {
+        let downloadUrl = vm.timeInfoData.excelDownUrl;
+        setTimeout(() => {
+          window.open(downloadUrl);
+        }, 500);
+      }
     },
     exportHttp() {
       let req = vm.exportReq;

src/views/learning/name-list.vue

@@ -257,8 +257,7 @@ export default {
           projectId: query.projectId,
           beginDate: query.beginDate,
           endDate: query.endDate,
-          // hospitalIdList: query.hospitalIdList,
-          hospitalIdList: [],
+          hospitalIdList: operationData.getHospitalIdList(query.hospitalIdList),
           originalFlag: query.originalFlag,
           regionId: query.regionId,
           timeFlag: query.timeFlag,
@@ -291,20 +290,11 @@ export default {
       } else if (this.tableType == 2) {
         vm.curmbFouth = "考试培训情况";
         //考试分析
-        // let reqRank = {
-        // }
-        // vm.GET("stats/constants/certGrade", reqRank).then(res => {
-        //   if (res.code == "000000") {
-        //     vm.rankList = operationData.initRank(res.data.list);
-        //   }
-        // });
-
         let req = {
           projectId: query.projectId,
           beginDate: query.beginDate,
           endDate: query.endDate,
-          // hospitalIdList: query.hospitalIdList,
-          hospitalIdList: [],
+          hospitalIdList: operationData.getHospitalIdList(query.hospitalIdList),
           originalFlag: query.originalFlag,
           regionId: query.regionId,
           timeFlag: query.timeFlag,
@@ -314,9 +304,15 @@ export default {
           pageNo: vm.formData.pageNo,
           pageSize: vm.formData.pageSize,
         };
+        let reqUrl = '';
+        if(vm.base == null) {
+          reqUrl = 'stats/report/getUserList';
+        } else {
+          reqUrl = 'stats/export/time/info/exam';
+        }
         // console.log("exam req", req);
         openLoading(vm);
-        vm.POST("stats/report/getUserList", req).then(res => {
+        vm.POST(reqUrl, req).then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
             if(res.data.totalCount == 0 ) {