未获证文案显示

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

@@ -197,9 +197,9 @@ export default {
         pageSize: vm.pageSize,
       };
       // console.log("3 req", req);
-      openLoading(vm);
+      // openLoading(vm);
       vm.POST("stats/report/course", req).then(res => {
-        closeLoading(vm);
+        // closeLoading(vm);
         if (res.code == "000000") {
           if (type !== 2) {
             vm.setCardData(res.data);

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

@@ -173,9 +173,9 @@ export default {
         timeFlag: vm.formInline.timeFlag
       };
       // console.log("2 req", req);
-      openLoading(vm);
+      // openLoading(vm);
       vm.POST("stats/report/userAnalysis_pc/"+vm.radio, req).then(res => {
-        closeLoading(vm);
+        // closeLoading(vm);
         if (res.code == "000000") {
           // if(res.data.educationList.length == 0 && res.data.jobTitle.length == 0 ) {
           //   vm.$message("没有相关数据，请重新选择查询范围");

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

@@ -39,7 +39,7 @@
           <el-table-column prop="hospitalJoinCount" label="已参与机构数" align="center"></el-table-column>
           <el-table-column prop="doctorCount" label="应参与人数" align="center"></el-table-column>
           <el-table-column prop="doctorJoinCount" label="已参与人数" align="center"></el-table-column>
-          <el-table-column prop="finishCount" label="获证人数" align="center"></el-table-column>
+          <el-table-column prop="finishCount" :label="finishCountLabel" align="center"></el-table-column>
 
           <el-table-column v-if="gradeFlag[0] == true" prop="grade1Count" label="优秀" align="center"></el-table-column>
           <el-table-column v-if="gradeFlag[1] == true" prop="grade2Count" label="良好" align="center"></el-table-column>
@@ -99,8 +99,8 @@
         <div class="chart-title-more">
           <p>项目情况排名</p>
           <el-radio-group v-if="showCertificateChart === true"  class="rank-radio" size="medium" v-model="rankType" @change="changeRank">
-            <el-radio-button label="1">按获证人数排名</el-radio-button>
-            <el-radio-button label="2">按获证比例排名</el-radio-button>
+            <el-radio-button label="1">{{ rankLabel1 }}</el-radio-button>
+            <el-radio-button label="2">{{ rankLabel2 }}</el-radio-button>
             <el-radio-button label="3">按参与人数排名</el-radio-button>
           </el-radio-group>
         </div>
@@ -158,7 +158,7 @@
           <el-table-column prop="date" label="日期" align="center" min-width="100"></el-table-column>
           <el-table-column prop="doctorCount" label="应参与人数" align="center"></el-table-column>
           <el-table-column prop="doctorJoinCount" label="已参与人数" align="center"></el-table-column>
-          <el-table-column prop="finishCount" label="获证人数" align="center"></el-table-column>
+          <el-table-column prop="finishCount" :label="finishCountLabel" align="center"></el-table-column>
 
           <el-table-column v-if="gradeFlag[0] == true" prop="grade1Count" label="优秀" align="center"></el-table-column>
           <el-table-column v-if="gradeFlag[1] == true" prop="grade2Count" label="良好" align="center"></el-table-column>
@@ -368,6 +368,10 @@ export default {
       showRecordChart: true,
       showCertificateChart: true,
       showDurationChart: true,
+
+      finishCountLabel: '获证人数',
+      rankLabel1: '按获证人数排名',
+      rankLabel2: '按获证比例排名',
     };
   },
   watch: {
@@ -402,8 +406,21 @@ export default {
       // console.log('展示all类型：',vm.dataType)
       vm.setStatic();
     },
+    setCertLabel() {
+      if(vm.certFlag == 0) {
+        //无证
+        vm.finishCountLabel = '完成人数';
+        vm.rankLabel1 = '按完成人数排名';
+        vm.rankLabel2 = '按完成比例排名';
+      } else {
+        vm.finishCountLabel = '获证人数';
+        vm.rankLabel1 = '按获证人数排名';
+        vm.rankLabel2 = '按获证比例排名';
+      }
+    },
     setStatic() {
       vm.certFlag = vm.timeInfoChild.doctorInfoRep.certFlag;
+      vm.setCertLabel();
       vm.searchDwmy();
       vm.initCard(vm.timeInfoChild.genSituationModel.percentData);
       if(vm.dataType == 0) {
@@ -451,6 +468,7 @@ export default {
         if (res.code == "000000") {
           vm.certFlag = res.data.certFlag;
           // vm.certFlag = 1;
+          vm.setCertLabel();
           vm.searchType();
         }
       });
@@ -466,9 +484,10 @@ export default {
         }
       }
       // console.log('vm.hospitalCnt',vm.hospitalCnt);
+      vm.checkRange = "1";
+      vm.checkTime = "1";
+      vm.rankType = "1";
       if(vm.dataType == 0) {
-        vm.checkRange = "1";
-        vm.checkTime = "1",
         this.search();
         this.searchDwmy();
       } else {
@@ -569,12 +588,12 @@ export default {
           pageSize: vm.formDwmy.pageSize,
         };
       }
-      openLoading(vm);
-      if(req.regionId == '000') {
-        req.regionId = '0';
-      }
+      // openLoading(vm);
+      // if(req.regionId == '000') {
+      //   req.regionId = '0';
+      // }
       vm.POST("stats/dwmy/", req).then(res => {
-        closeLoading(vm);
+        // closeLoading(vm);
         if (res.code == "000000") {
           vm.tableDateTime = res.data.list;
           vm.totalCount = res.data.totalCount;
@@ -689,8 +708,8 @@ export default {
       } else {
         vm.showDistributeChart = true;
       }
-      let keyName = ['未获证人数','优秀人数','良好人数','及格人数','不及格人数'];
-      let keyName2 = ['未获证人数占比','优秀人数占比','良好人数占比','及格人数占比','不及格人数占比'];
+      let keyName = ['未获证人数','优秀人数','良好人数','及格人数','不及格人数','已获证人数'];
+      let keyName2 = ['未获证人数占比','优秀人数占比','良好人数占比','及格人数占比','不及格人数占比','已获证人数占比'];
       let distributeList = [];
       let legendData = [];
       let seriesData = [];
@@ -754,7 +773,7 @@ export default {
           value: 0,
         },
       ]
-      let keyName = ['未获证人数','获优秀人数','获良好人数','获及格人数','获不及格人数','获证人数'];
+      let keyName = ['未获证人数','获优秀人数','获良好人数','获及格人数','获不及格人数','已获证人数'];
       let legendData = [];
       let xAxisData = ["博士后","博士", "硕士", "本科", "大专", "中专及以下", "其他"];
       for(let i = 0; i<data.length; i++) {

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

@@ -168,6 +168,7 @@ export default {
     this.$on("search", () => {
       // console.log(this.formInline);
       this.pageNo = 1;
+      this.rankType = '1';
       this.search();
       this.searchTable();
     });
@@ -212,9 +213,9 @@ export default {
         timeFlag: vm.formInline.timeFlag
       };
       // console.log("4 req", req);
-      openLoading(vm);
+      // openLoading(vm);
       vm.POST("stats/report/exam", req).then(res => {
-        closeLoading(vm);
+        // closeLoading(vm);
         if (res.code == "000000") {
           vm.examData = res.data;
           vm.setCardData(res.data);
@@ -224,18 +225,6 @@ export default {
           vm.$message(res.message);
         }
       });
-
-      // let reqList = req;
-      // reqList.pageNo = vm.pageNo;
-      // reqList.pageSize = vm.pageSize;
-      // openLoading(vm);
-      // vm.POST("stats/report/exam/list", req).then(res => {
-      //   closeLoading(vm);
-      //   if (res.code == "000000") {
-      //     vm.tableData = res.data.examInfoList;
-      //     vm.totalRows = res.data.totalRows;
-      //   }
-      // });
     },
     searchTable() {
       let req = {
@@ -250,9 +239,9 @@ export default {
       let reqList = req;
       reqList.pageNo = vm.pageNo;
       reqList.pageSize = vm.pageSize;
-      openLoading(vm);
+      // openLoading(vm);
       vm.POST("stats/report/exam/list", req).then(res => {
-        closeLoading(vm);
+        // closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.examInfoList;
           vm.totalRows = res.data.totalRows;

src/views/learning/item-learning-effect.vue

@@ -106,10 +106,9 @@ export default {
         regionId: vm.formInline.region[vm.formInline.region.length - 1],
         timeFlag: vm.formInline.timeFlag
       };
-      openLoading(vm);
-      // console.log("0 req", req);
+      // openLoading(vm);
       vm.POST("stats/report/studyEffect", req).then(res => {
-        closeLoading(vm);
+        // closeLoading(vm);
         if (res.code == "000000") {
           vm.initCard(res.data);
           setTimeout(function() {

src/views/learning/item-list.vue

@@ -412,7 +412,7 @@ export default {
       };
       openLoading(vm);
       vm.GET("stats/region/info", reqInfo).then(res => {
-        closeLoading(vm);
+        // closeLoading(vm);
         if (res.code == "000000") {
           vm.showOriginal = res.data.status;
           vm.roleType = res.data.roleType;