Merge branch 'dev-phrase-report2.1-0316' into 'release'

学情报告V2.1 code reviewer：杨广俊

学情报告V2.1 code reviewer：杨广俊

See merge request !140

src/utils/operation.js

@@ -311,7 +311,7 @@ export function setRegionOptionNew(data) {
     let obj = data[i];
     obj.label = data[i].label;
     obj.value = data[i].id;
-    if(obj.degree == 4 || obj.degree == 0 || obj.label == "全部") {
+    if(obj.degree == 5 || obj.degree == 0 || obj.label == "全部") {
     // if(obj.degree == 4 ) {
       obj.leaf = true;
     }
@@ -377,13 +377,13 @@ export function getPicOption(title, legendData, colorData, seriesData) {
     tooltip: {
       trigger: 'item',
       // formatter: "{a} <br/>{b} : {c} ({d}%)"
-      formatter:function(data){ 
+      formatter:function(data){
         let value = data.name + '：' + data.percent.toFixed(1)+"%"
         return value;
       }
     },
     label: {
-      formatter:function(data){ return data.percent.toFixed(1)+"%";} 
+      formatter:function(data){ return data.percent.toFixed(1)+"%";}
     },
     legend: {
       orient: "vertical",
@@ -733,25 +733,25 @@ export function learnTimeValue(value) {
   if(s==NaN){//错误error
     return '';
   }
-  if(s > 60) { 
-    m = parseInt(s/60); 
-    s = parseInt(s%60); 
-    if(m > 60) { 
-      h = parseInt(m/60); 
-      m = parseInt(m%60); 
-    } 
-  } 
+  if(s > 60) {
+    m = parseInt(s/60);
+    s = parseInt(s%60);
+    if(m > 60) {
+      h = parseInt(m/60);
+      m = parseInt(m%60);
+    }
+  }
   let result = "";
-  if(s > 0) { 
-      result = ""+parseInt(s)+"秒"; 
+  if(s > 0) {
+      result = ""+parseInt(s)+"秒";
+  }
+  if(m > 0) {
+    result = ""+parseInt(m)+"分"+result;
   }
-  if(m > 0) { 
-    result = ""+parseInt(m)+"分"+result; 
-  } 
-  if(h > 0) { 
-    result = ""+parseInt(h)+"小时"+result; 
-  } 
-  return result; 
+  if(h > 0) {
+    result = ""+parseInt(h)+"小时"+result;
+  }
+  return result;
 }
 export function getProjectLevelList(data) {
   let list = [];
@@ -784,4 +784,4 @@ export function getCreditList(data) {
     list.push(obj);
   }
   return list;
-}
+}
\ No newline at end of file

src/views/learning/data-alignment.vue

@@ -15,7 +15,7 @@
     </div>
     <div class="text">
       <p>地区：{{ dialogData.region }}</p>
-      <p>选择机构：{{ dialogData.organization }}</p>
+      <!--<p>选择机构：{{ dialogData.organization }}</p>-->
     </div>
     <el-form
       class="form-update"
@@ -198,7 +198,7 @@ export default {
     this.projectName = vm.getUrlSearch(window.location.href, "projectName");
     // this.search();
     console.log(vm.dialogData);
-  },  
+  },
   mounted: function() {
     //父组件传值
     this.$on("search", () => {
@@ -263,11 +263,12 @@ export default {
         projectId: vm.projectId,
         hospitalIdList: vm.formInline.organization,
         originalFlag: vm.formInline.checked == false ? 2 : 1,
-        regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        regionId: vm.formInline.selectRegionId,
         timeFlag: vm.formInline.timeFlag,
         beginDate: operationData.setDuringTime(vm.formInline.during,'begin'),
         endDate: operationData.setDuringTime(vm.formInline.during,'end'),
-        
+
         achievementStatus: vm.formData.achievementStatus,
         status: vm.formData.status,
         doctorName: vm.formData.doctorName,

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

@@ -192,7 +192,8 @@ export default {
         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],
+        // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        regionId: vm.formInline.selectRegionId,
         timeFlag: vm.formInline.timeFlag,
         pageNo: vm.pageNo,
         pageSize: vm.pageSize,
@@ -223,7 +224,8 @@ export default {
         routerData.courseId = data.courseId;
         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.regionId = vm.formInline.region[vm.formInline.region.length - 1];
+        routerData.regionId = vm.formInline.selectRegionId;
         routerData.originalFlag = vm.formInline.checked == false ? 2 : 1;
         routerData.timeFlag = vm.formInline.timeFlag;
         routerData.hospitalIdList = operationData.setHospitalIdList(vm.formInline.organization);
@@ -252,7 +254,7 @@ export default {
       window.open(routeData.href, "_blank");
     },
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+      // console.log(`每页 ${val} 条`);
       vm.pageSize = val;
       vm.pageNo = 1;
       if(vm.downloadId == null) {
@@ -260,7 +262,7 @@ export default {
       }
     },
     handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+      // console.log(`当前页: ${val}`);
       vm.pageNo = val;
       if(vm.downloadId == null) {
         vm.search();
@@ -355,4 +357,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

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

@@ -190,7 +190,8 @@ export default {
         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],
+        // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        regionId: vm.formInline.selectRegionId,
         timeFlag: vm.formInline.timeFlag
       };
       vm.POST("stats/report/userAnalysis_pc/"+vm.radio, req, '', '', true).then(res => {
@@ -295,6 +296,7 @@ export default {
 
       vm.sexData = sexData;
     },
+    //设置--人员学历发布
     educationDivision(data) {
       if(data.length == 0) {
         vm.showEducation = false;
@@ -325,6 +327,7 @@ export default {
         vm.echartsData.chart1 = myChart;
       },20);
     },
+    //设置--人员职务分布
     jobDivision(data) {
       if(data.length == 0) {
         vm.showJob = false;
@@ -354,6 +357,7 @@ export default {
         vm.echartsData.chart2 = myChart2;
       },20);
     },
+    //设置--人员年龄分布
     ageDivision(data) {
       if(data.length == 0) {
         vm.showAge = false;
@@ -467,7 +471,7 @@ export default {
         width: 106px;
       }
     }
-    
+
     .item {
       position: relative;
       float: left;
@@ -522,4 +526,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

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

@@ -198,9 +198,9 @@
           <el-tab-pane label="未参与" name="3"></el-tab-pane>
         </el-tabs>
         <div v-if="downloadId == null">
-          <el-table 
-          v-loading="loadingTable" 
-          :data="tableData" 
+          <el-table
+          v-loading="loadingTable"
+          :data="tableData"
           class="person-table"
           element-loading-spinner="el-icon-loading"
           element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -518,21 +518,24 @@ export default {
       }
     },
     gethHspitalsCnt() {
-      let req = {
-        projectId: vm.projectId,
-        regionId: vm.formInline.region[vm.formInline.region.length - 1]
-      };
-      vm.GET("stats/region/hospitals/cnt", req, '', '', true).then(res => {
-        if (res.code == "000000") {
-          vm.hospitalCnt = res.data.hospitalCnt;
-          // vm.hospitalCnt = 1;
-          if(vm.hospitalCnt == 1) {
-            vm.hospitalCutList = res.data.list;
+      if (vm.formInline.organization.length == 0) {//无机构
+        let req = {
+          projectId: vm.projectId,
+          // regionId: vm.formInline.region[vm.formInline.region.length - 1]
+          regionId: vm.formInline.selectRegionId
+        };
+        vm.GET("stats/region/hospitals/cnt", req, '', '', true).then(res => {
+          if (res.code == "000000") {
+            vm.hospitalCnt = res.data.hospitalCnt;
+            if(vm.hospitalCnt == 1) {
+              vm.hospitalCutList = res.data.list;
+            }
           }
-          // vm.searchType();
-          vm.getDisplay();
-        }
-      });
+        });
+      }else {
+        vm.hospitalCnt = 1;
+      }
+      vm.getDisplay();
     },
     getDisplay() {
       let reqInfo = {
@@ -540,7 +543,7 @@ export default {
       };
       vm.GET("stats/region/info", reqInfo).then(res => {
         if (res.code == "000000") {
-          vm.certFlag = res.data.certFlag;
+          vm.certFlag = res.data.certFlag; //有无证书，0无证书，1有证书
           vm.containOfficialFlag = res.data.containOfficialFlag;
           vm.setCertLabel();
           vm.searchType();
@@ -551,9 +554,9 @@ export default {
       if(vm.formInline.organization.length == 1) {
         vm.dataType = 1;
       } else {
-        if(vm.hospitalCnt == 1) {
+        if(vm.hospitalCnt == 1) { //有机构
           vm.dataType = 1;
-        } else {
+        } else { //无机构
           vm.dataType = 0;
         }
       }
@@ -577,16 +580,17 @@ export default {
         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],
+        // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        regionId: vm.formInline.selectRegionId,
         timeFlag: vm.formInline.timeFlag,
         sourceType: 2,
         pageNo: vm.formTable.pageNo,
         pageSize: vm.formTable.pageSize,
       };
-      if(req.hospitalIdList.length == 0) {
-        req.hospitalIdList = [];
-        req.hospitalIdList[0] = vm.hospitalCutList[0].hospitalId;
-      }
+      // if(req.hospitalIdList.length == 0) {
+      //   req.hospitalIdList = [];
+      //   req.hospitalIdList[0] = vm.hospitalCutList[0].hospitalId;
+      // }
       vm.loadingTable = true;
       vm.POST("stats/report/generalPersonal/"+vm.tableType, req, '', '', true).then(res => {
         if (res.code == "000000") {
@@ -611,13 +615,14 @@ export default {
         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],
+        // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        regionId: vm.formInline.selectRegionId,
         timeFlag: vm.formInline.timeFlag,
       };
       vm.POST("stats/report/general_pc", req, '', '', true).then(res => {
         if (res.code == "000000") {
           vm.initCard(res.data.percentData);
-          if(vm.certFlag !== 0) {
+          if(vm.certFlag !== 0) { //有证书情况
             vm.setDistributeChart(res.data.certData);
             vm.setRecordChart(res.data.eduData);
           }
@@ -628,6 +633,7 @@ export default {
         }
       });
     },
+    //整体情况中获取累积或新增table的数据
     searchDwmy() {
       let req = {};
       if(vm.downloadId == null) {
@@ -637,10 +643,11 @@ export default {
           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],
+          // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+          regionId: vm.formInline.selectRegionId,
           timeFlag: vm.formInline.timeFlag,
-          timeType: parseInt(vm.checkTime),
-          dataType: parseInt(vm.checkRange),
+          timeType: parseInt(vm.checkTime), //日周月年的选择
+          dataType: parseInt(vm.checkRange),//累积和新增的选择
           pageNo: vm.formDwmy.pageNo,
           pageSize: vm.formDwmy.pageSize,
         };
@@ -680,6 +687,7 @@ export default {
       vm.timeType = value;
       vm.searchDwmy();
     },
+    //初始化机构参与率、人员参与率...
     initCard(data) {
       let cardData = [
         {
@@ -768,6 +776,7 @@ export default {
       //   };
       // },100);
     },
+    //设置--证书分布情况
     setDistributeChart(data) {
       if(data.length == 0) {
         vm.showDistributeChart = false;
@@ -805,7 +814,7 @@ export default {
         seriesData.push(objSer);
       }
       vm.distributeList = distributeList;
-      setTimeout(function(){ 
+      setTimeout(function(){
         let myChart = echarts.init(vm.$refs.distributeChart);
         let option = chartData.dustributeOption(legendData,seriesData);
         myChart.setOption(option);
@@ -813,6 +822,7 @@ export default {
         // vm.updateResize();
       },20);
     },
+    //设置--证书级别按学历分布情况
     setRecordChart(data) {
       if(data.length == 0) {
         vm.showRecordChart = false;
@@ -905,7 +915,7 @@ export default {
         seriesData.push(seriesObj);
       }
       vm.recordList = recordList;
-      setTimeout(function(){ 
+      setTimeout(function(){
         let myChart = echarts.init(vm.$refs.recordChart);
         let option = chartData.recordOption(legendData, xAxisData, seriesData);
         // console.log('data',legendData,xAxisData,seriesData,option);
@@ -921,9 +931,11 @@ export default {
           projectId: vm.projectId,
           beginDate: operationData.setDuringTime(vm.formInline.during,'begin'),
           endDate: operationData.setDuringTime(vm.formInline.during,'end'),
-          hospitalIdList: vm.formInline.organization,
+          // hospitalIdList: vm.formInline.organization,
+          hospitalIdList: vm.formInline.orgId,
           originalFlag: vm.formInline.checked == false ? 2 : 1,
-          regionId: vm.formInline.region[vm.formInline.region.length - 1],
+          // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+          regionId: vm.formInline.selectRegionId,
           timeFlag: vm.formInline.timeFlag,
         };
         openLoading(vm);
@@ -936,6 +948,7 @@ export default {
         vm.setCertificateChart(vm.timeInfoChild.genSituationModel.studyRankMap[index]);
       }
     },
+    //设置--项目情况排名
     setCertificateChart(data) {
       if(data.length == 0) {
         vm.showCertificateChart = false;
@@ -967,6 +980,7 @@ export default {
         // vm.updateResize();
       },20);
     },
+    //设置--在线培训完成天数情况
     setDurationChart(data) {
       if(data.length == 0) {
         vm.showDurationChart = false;
@@ -1366,4 +1380,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

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

@@ -11,7 +11,7 @@
     <div class="spacing"></div>
     <div v-if="containOfficial === 1">
     <div class="chart-title">完成项目考试次数情况</div>
-    <div v-if="showExamTimes === true" class="overflow-chart"> 
+    <div v-if="showExamTimes === true" class="overflow-chart">
       <div class="chart" id="examTimes" ref="examTimes"></div>
     </div>
     <div v-if="showExamTimes === false" class="empty-img">
@@ -240,7 +240,8 @@ export default {
         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],
+        // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        regionId: vm.formInline.selectRegionId,
         timeFlag: vm.formInline.timeFlag
       };
       vm.POST("stats/report/exam", req, '', '', true).then(res => {
@@ -256,6 +257,7 @@ export default {
         }
       });
     },
+    //获取考试列表数据
     searchTable() {
       let req = {
         projectId: vm.projectId,
@@ -263,7 +265,8 @@ export default {
         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],
+        // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        regionId: vm.formInline.selectRegionId,
         timeFlag: vm.formInline.timeFlag
       };
       let reqList = req;
@@ -307,6 +310,7 @@ export default {
         };
       }, 30);
     },
+    //设置--完成项目考试次数情况
     setExamTimes(data) {
       if(data.length == 0) {
         vm.showExamTimes = false;
@@ -320,7 +324,7 @@ export default {
         xAxisData.push(data[i].times + "次");
         seriesData.push(data[i].count);
       }
-      setTimeout(function(){ 
+      setTimeout(function(){
         let myChart = echarts.init(vm.$refs.examTimes);
         let option = chartData.examTimes(xAxisData, seriesData);
         myChart.setOption(option);
@@ -348,6 +352,7 @@ export default {
         }
       }
     },
+    //设置--完成项目考试分数情况
     setExamScore(data) {
       if(data.length == 0) {
         vm.showExamScore = false;
@@ -361,7 +366,7 @@ export default {
         xAxisData.push(data[i].timesStr);
         seriesData.push(data[i].count);
       }
-      setTimeout(function(){ 
+      setTimeout(function(){
         let myChart = echarts.init(vm.$refs.examScore);
         let option = chartData.examScore(xAxisData, seriesData);
         myChart.setOption(option);
@@ -382,7 +387,8 @@ export default {
         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.regionId = vm.formInline.region[vm.formInline.region.length - 1];
+        routerData.regionId = vm.formInline.selectRegionId;
         routerData.originalFlag = vm.formInline.checked == false ? 2 : 1;
         routerData.timeFlag = vm.formInline.timeFlag;
         routerData.hospitalIdList = operationData.setHospitalIdList(vm.formInline.organization);
@@ -412,7 +418,7 @@ export default {
     },
     // 更改数据显示数量
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+      // console.log(`每页 ${val} 条`);
       vm.pageSize = val;
       vm.pageNo = 1;
       if(vm.downloadId == null) {
@@ -421,7 +427,7 @@ export default {
     },
     // 换页
     handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+      // console.log(`当前页: ${val}`);
       vm.pageNo = val;
       if(vm.downloadId == null) {
         vm.searchTable();

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

@@ -103,7 +103,8 @@ export default {
         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],
+        // regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        regionId: vm.formInline.selectRegionId,
         timeFlag: vm.formInline.timeFlag
       };
       vm.POST("stats/report/studyEffect", req, '', '', true).then(res => {
@@ -131,6 +132,7 @@ export default {
       cardData[1].value = parseFloat((data.afterRate*100).toFixed(1)) + "%";
       vm.cardData = cardData;
     },
+    //设置--不同学历培训前后正确率对比
     setEducation(data) {
       if(data.length == 0) {
         vm.showChartEdu = false;
@@ -153,6 +155,7 @@ export default {
         vm.echartsData.chart1 = myChart;
       },20);
     },
+    //设置--培训前后知识点掌握情况
     setLearning(data) {
       if(data.length == 0) {
         vm.showChartLearn = false;

src/views/learning/name-list.vue

@@ -3,7 +3,7 @@
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :curmbFouth="curmbFouth" :jumPathThird="jumPathThird" :jumPathFouth="jumPathFouth"></bread-crumb>
     <div class="component-content screenSet" id="screenSet">
       <p class="course-p">地区：{{ queryData.region }}</p>
-      <p class="course-p">选择机构：{{ queryData.organization }}</p>
+      <!--<p class="course-p">选择机构：{{ queryData.organization }}</p>-->
       <el-form
         class="form-update"
         ref="serchForm"
@@ -420,4 +420,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file