Merge branch 'dev-learning-1120' into 'test-learning-1205'

Dev learning 1120



See merge request !120

src/utils/filter.js

@@ -207,11 +207,11 @@ const vueFilter = {
   },
   exportStatus: (value) => {
     if(value == 0) {
-        return '数据生成中，请稍后---';
+        return '生成中';
     }else if(value == 1) {
-        return '数据生成完成';
+        return '成功';
     } else {
-        return '文件生成失败 请重新操作导出';
+        return '失败';
     }
   },
   getAvgTime: (value) => {
@@ -232,6 +232,28 @@ const vueFilter = {
     }
     return avgTime;
   },
+  learnTimeValue: (value) => {
+    let s = parseInt(value),m = 0, h = 0;//秒，分，小时
+	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); 
+		} 
+	} 
+	let result = ""+parseInt(s)+"秒"; 
+	if(m > 0) { 
+		result = ""+parseInt(m)+"分"+result; 
+	} 
+	if(h > 0) { 
+		result = ""+parseInt(h)+"小时"+result; 
+	} 
+	return result; 
+  },
   getTotalTime: (value) => {
       let time = value +'分钟';
       return time;
@@ -280,6 +302,54 @@ const vueFilter = {
     } else if(value == 4) {
         return '已下架';
     }
-  }
+  },
+  examRate: (value) => {
+    let num = (value*100).toFixed(2);
+    let rate = num + '%';
+    return rate;
+  },
+  sexValue: (value) => {
+    if(value == 1) {
+        return '男';
+    } else if(value == 2) {
+        return '女';
+    } else if(value == 0) {
+        return '未知';
+    }
+  },
+  joinFlagValue: (value) => {
+    if(value == 1) {
+        return '已参与';
+    } else if(value == 2) {
+        return '未参与';
+    } 
+  },
+  finishFlagValue: (value) => {
+    if(value == 1) {
+        return '已完成';
+    } else if(value == 2) {
+        return '未完成';
+    } 
+  },
+  certGradeValue: (value) => {
+    if(value == 1) {
+        return '优秀';
+    } else if(value == 2) {
+        return '良好';
+    } else if(value == 3) {
+        return '及格';
+    } else if(value == 4) {
+        return '不及格';
+    } 
+  },
+  finishFlagType: (value) => {
+    if(value == 0) {
+        return '未参与';
+    } else if(value == 1) {
+        return '未完成';
+    } else if(value == 2) {
+        return '已完成';
+    }
+  },
 }
 export default vueFilter
\ No newline at end of file

src/utils/operation.js

@@ -305,6 +305,20 @@ export function setRegionOption2(data) {
   }
   return option;
 }
+export function setRegionOptionNew(data) {
+  let option = [];
+  for (let i = 0; i < data.length; i++) {
+    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 == 4 ) {
+      obj.leaf = true;
+    }
+    option.push(obj);
+  }
+  return option;
+}
 export function setAdministrativeId(value) {
   let areaId = '000';
   for (let i = 0; i < value.length; i++) {
@@ -335,16 +349,17 @@ export function getLearnOrganization(data) {
     let arr = [];
     return arr;
   }
-  let organization = [
-    {
-      label: "全部",
-      value: 0
-    },
-  ];
+  // let organization = [
+  //   {
+  //     label: "全部",
+  //     value: 0
+  //   },
+  // ];
+  let organization = [];
   for (let i = 0; i < data.length; i++) {
     let obj = {
-      label: data[i].hospital_name,
-      value: data[i].hospital_id,
+      label: data[i].hospitalName,
+      value: data[i].hospitalId,
       index: i,
     };
     organization.push(obj);
@@ -355,8 +370,9 @@ export function getPicOption(title, legendData, colorData, seriesData) {
   let option = {
     title: {
       text: title,
-      x: "center",
-      top: "3%",
+      x: "left",
+      left: '20px',
+      top: "20px",
     },
     tooltip: {
       trigger: 'item',
@@ -364,8 +380,8 @@ export function getPicOption(title, legendData, colorData, seriesData) {
     },
     legend: {
       orient: "vertical",
-      top: "3%",
-      left: "left",
+      top: "center",
+      right: "right",
       data: legendData
     },
     grid: {
@@ -375,13 +391,13 @@ export function getPicOption(title, legendData, colorData, seriesData) {
       containLabel: true
     },
     color: colorData,
-    backgroundColor: '#F3F3F3',
+    backgroundColor: '#FFFFFF',
     series: [
       {
         name: "",
         type: "pie",
         radius: "55%",
-        center: ["60%", "65%"],
+        center: ["40%", "55%"],
         data: seriesData,
       }
     ]
@@ -391,12 +407,17 @@ export function getPicOption(title, legendData, colorData, seriesData) {
 export function getBarOption(xAxisData, seriesData) {
   let option = {
     title: {
-      text: "用户年龄发布",
-      x: "center",
-      top: "3%",
+      text: "人员年龄分布",
+      x: "left",
+      left: '20px',
+      top: "20px",
+    },
+    color: ['#5B8FF9'],
+    backgroundColor: '#FFFFFF',
+    tooltip: {
+      trigger: 'item',
+      formatter: "{b} : {c} "
     },
-    color: ['#3398DB'],
-    backgroundColor: '#F3F3F3',
     grid: {
       left: '3%',
       right: '4%',
@@ -409,22 +430,31 @@ export function getBarOption(xAxisData, seriesData) {
         data: xAxisData,
         axisLabel: {
           interval: 0
-        }
-        // axisTick: {
-        //   alignWithLabel: true
-        // }
+        },
+        axisTick: { // 隐藏刻度
+          show: false
+        },
+        axisLine: { //隐藏轴线
+          show: false
+        },
       }
     ],
     yAxis: [
       {
-        type: 'value'
+        type: 'value',
+        axisLine: { //隐藏轴线
+          show: false
+        },
+        axisTick: { // 隐藏刻度
+          show: false
+        },
       }
     ],
     series: [
       {
         name: '',
         type: 'bar',
-        barWidth: 30,
+        barWidth: 18,
         data: seriesData,
       }
     ]
@@ -592,13 +622,23 @@ export function initRank(data) {
   }
   return list;
 }
-export function getAvgTime(data) {
-  let list = [0, 0];
-  if (data != null && data != '') {
-    list[0] = Math.floor(data / 60);
-    list[1] = data % 60;
+export function getAvgTime(value) {
+  let list = [0,0];
+  let avgTime = '';
+  if(value != null && value !='') {
+      list[0] = Math.floor(value / 60);
+      list[1] = value % 60;
   }
-  return list;
+  if(list[0] == 0 && list[1] == 0) {
+      avgTime = list[1] + '秒';
+  } else if(list[0] == 0 && list[1] != 0) {
+      avgTime = list[1] + '秒';
+  } else if(list[0] != 0 && list[1] == 0) {
+      avgTime = list[0] + '分钟';
+  } else if(list[0] != 0 && list[1] != 0) {
+      avgTime = list[0] + '分钟' + list[1] + '秒';
+  }
+  return avgTime;
 }
 export function getComponent(data) {
   let list = [];
@@ -641,4 +681,35 @@ export function setSelectedKeys(checkedKeys, halfCheckedKeys) {
     selected.push(obj);
   }
   return selected;
+}
+export function setDuringTime(time , type) {
+  let value = time;
+  if(time == '' || time == null) {
+    return '';
+  }
+  if(type == 'begin') {
+    value = time[0];
+  } else if(type == 'end') {
+    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/data-alignment.vue

@@ -102,7 +102,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="formData.pageNo"
-        :page-sizes="[20, 50 ,100]"
+        :page-sizes="[20, 50 ,100, 200]"
         :page-size="formData.pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="totalRows"
@@ -239,6 +239,7 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       vm.formData.pageSize = val;
+      vm.formData.pageNo = 1;
       vm.search();
     },
     // 换页
@@ -261,15 +262,18 @@ export default {
       let checkAll = operationData.hasAll(vm.formInline.organization);
       let req = {
         projectId: vm.projectId,
+        hospitalIdList: vm.formInline.organization,
+        originalFlag: vm.formInline.checked == false ? 0 : 1,
+        regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        timeFlag: vm.formInline.timeFlag,
+
         achievementStatus: vm.formData.achievementStatus,
         status: vm.formData.status,
-        ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
-        type: operationData.getSearchType(vm.formInline,checkAll),
         doctorName: vm.formData.doctorName,
         pageNo: vm.formData.pageNo,
         pageSize: vm.formData.pageSize,
       };
-      vm.reportGET("report/portal/getProjectData", req).then(res => {
+      vm.POST("stats/report/getProjectData", req).then(res => {
         // closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.projectData;
@@ -339,7 +343,7 @@ export default {
         joinDoctorIdList: operationData.getAjustmentList(vm.changedDoctor),
       };
       openLoading(vm);
-      vm.reportPOST("report/portal/peopleAdjustment", req).then(res => {
+      vm.POST("stats/report/peopleAdjustment", req).then(res => {
         closeLoading(vm);
         vm.$message(res.message);
         if (res.code == "000000") {

src/views/learning/export-download.vue

@@ -2,8 +2,12 @@
   <div class="export-download">
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
     <div class="component-content screenSet" id="screenSet">
-      <p>导出文件列表</p>
-      <el-table :data="tableData" style="width: 100%">
+      <div class="p-title">任务列表</div>
+      <el-tabs v-model="listType" type="card" @tab-click="handleClick">
+        <el-tab-pane label="查看报告" name="2"></el-tab-pane>
+        <el-tab-pane label="导出列表" name="1"></el-tab-pane>
+      </el-tabs>
+      <el-table :data="tableData" class="table-export" style="width: 100%">
         <el-table-column
           prop="title"
           label="名称"
@@ -11,20 +15,25 @@
           min-width="150"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column prop="createdTime" label="时间" align="center" min-width="120">
-          <template slot-scope="scope">{{ scope.row.createdTime }}</template>
+        <el-table-column prop="time" label="时间" align="center" min-width="120">
+          <template slot-scope="scope">{{ scope.row.time }}</template>
         </el-table-column>
-        <el-table-column prop="status" label="状态" align="center" min-width="150">
-          <template slot-scope="scope">{{ scope.row.status | exportStatus }}</template>
+        <el-table-column prop="status" label="状态" align="left" min-width="30">
+          <template slot-scope="scope">
+            <span class="logo" v-bind:class="{ 'logo_0': scope.row.status == 0, 'logo_1': scope.row.status == 1, 'logo_2': scope.row.status == 2 }"></span>
+            <span class="text">{{ scope.row.status | exportStatus }}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" min-width="70">
           <template slot-scope="scope">
             <el-button
-              type="primary"
               :disabled="scope.row.buttonStatus"
               size="small"
+              type="text"
+              v-if="scope.row.status != 2"
               @click="update(scope.row)"
             >{{ scope.row.buttonText }}</el-button>
+            <div v-if="scope.row.status == 2">-</div>
           </template>
         </el-table-column>
         <div slot="empty">
@@ -40,7 +49,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="param.pageNo"
-          :page-sizes="[20, 50 ,100]"
+          :page-sizes="[20, 50 ,100 ,200]"
           :page-size="param.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalRows"
@@ -62,7 +71,7 @@ export default {
   data() {
     return {
       curmbFirst: "学情报告",
-      curmbSecond: "导出下载",
+      curmbSecond: "任务列表",
       projectId: "",
       tableData: [],
       param: {
@@ -71,7 +80,8 @@ export default {
       },
       totalRows: 0,
       totalTime: 3,
-      queryData: {}
+      queryData: {},
+      listType: "2"
       // buttonText: "刷新",
       // buttonStatus: false,
     };
@@ -79,75 +89,94 @@ export default {
   created() {
     vm = this;
     this.projectId = vm.getUrlSearch(window.location.href, "projectId");
+    let listType = vm.getUrlSearch(window.location.href, "listType");
+    if(listType == null) {
+      vm.listType = '2';
+    } else {
+      vm.listType = listType;
+    }
     this.search();
   },
   mounted: function() {
     commonUtil.resizeHeight();
   },
   methods: {
+    handleClick(tab, event) {
+      vm.listType = tab.name;
+      vm.search()
+    },
     setButton() {
       for (let i = 0; i < vm.tableData.length; i++) {
         vm.tableData[i].index = i;
         if (vm.tableData[i].status == 1) {
-          vm.tableData[i].buttonText = "下载";
+          if(vm.listType == '2') {
+            vm.tableData[i].buttonText = "查看报告";
+          } else if(vm.listType == '1') {
+            vm.tableData[i].buttonText = "下载";
+          }
           vm.tableData[i].buttonStatus = false;
-        } else if(vm.tableData[i].status == 0) {
+        } else if (vm.tableData[i].status == 0) {
           vm.tableData[i].buttonText = "刷新";
           vm.tableData[i].buttonStatus = false;
-        } else if(vm.tableData[i].status == 2) {
+        } else if (vm.tableData[i].status == 2) {
           vm.tableData[i].buttonText = "刷新";
           vm.tableData[i].buttonStatus = true;
         }
       }
     },
     search() {
-      // this.setButton();
-      let req = {
-        projectId: vm.projectId
-      };
-      if(req.projectId == null) {
-        req.projectId = '';
+      let projectId = "";
+      if (vm.projectId != null) {
+        projectId = vm.projectId;
       }
-      vm.reportGET("report/downLoad/getDownloadList", req).then(res => {
+      let reqList = {
+        projectId: projectId,
+        pageNo: vm.param.pageNo,
+        pageSize: vm.param.pageSize,
+        type: parseInt(vm.listType),
+        id: ""
+      };
+      vm.GET("stats/mission/missionlist", reqList).then(res => {
         if (res.code == "000000") {
-          vm.tableData = res.data.data;
-          vm.totalRows = res.data.totalRows;
+          vm.tableData = res.data.list;
+          vm.totalRows = res.data.totalSize;
           vm.setButton();
         }
       });
     },
-    downLoad(row) {
-      // vm.queryData = this.$route.query;
-      // let req = vm.queryData;
-      // openLoading(vm);
-      // vm.reportGET("report/downLoad/downLoad", req).then(res => {
-      //   closeLoading(vm);
-      //   // console
-      //   if (res.code == "000000") {
-      //   }
-      // });
-
-      setTimeout(() => {
-        window.open(row.fileUrl);
-      }, 500);
-    },
     getDownLoadStatus(row) {
-      let req = {
+      // let req = {
+      //   id: row.id
+      // };
+      let projectId = "";
+      if (vm.projectId != null) {
+        projectId = vm.projectId;
+      }
+      let reqList = {
+        projectId: projectId,
+        pageNo: vm.param.pageNo,
+        pageSize: vm.param.pageSize,
+        type: parseInt(vm.listType),
         id: row.id
       };
-      vm.reportGET("report/downLoad/getDownLoadStatus", req).then(res => {
+      vm.GET("stats/mission/missionlist", reqList).then(res => {
         if (res.code == "000000") {
-          vm.tableData[row.index].status = res.data.data;
+          vm.tableData[row.index].status = res.data.list[0].status;
+          let updateStatus = res.data.list[0].status;
           // console.log('res.data.data',res.data.data);
-          if (res.data.data == 1) {
+          if (updateStatus == 1) {
             vm.tableData[row.index].title = vm.tableData[row.index].title + " ";
-            vm.tableData[row.index].buttonText = "下载";
-            vm.tableData[row.index].fileUrl = res.data.url;
-          } else if(res.data.data == 0) {
-            console.log("res", res, vm.tableData[row.index]);
+            // vm.tableData[row.index].buttonText = "下载";
+            if(vm.listType == '2') {
+              vm.tableData[row.index].buttonText = "查看报告";
+            } else if(vm.listType == '1') {
+              vm.tableData[row.index].buttonText = "下载";
+            }
+            vm.tableData[row.index].fileUrl = res.data.list[0].url;
+          } else if (updateStatus == 0) {
             vm.tableData[row.index].title = vm.tableData[row.index].title + " ";
             vm.tableData[row.index].buttonText = "刷新";
-          } else if(res.data.data == 2) {
+          } else if (updateStatus == 2) {
             vm.tableData[row.index].title = vm.tableData[row.index].title + " ";
             vm.tableData[row.index].buttonText = "刷新";
             vm.tableData[row.index].buttonStatus = true;
@@ -159,9 +188,22 @@ export default {
         }
       });
     },
+    downLoad(row) {
+      setTimeout(() => {
+        window.open(row.fileUrl);
+      }, 500);
+    },
+    exportTime(row) {
+      vm.$router.push("item-list?downloadId="+row.id);
+    },
     update(row) {
       if (vm.tableData[row.index].status == 1) {
-        vm.downLoad(row);
+        // vm.downLoad(row);
+        if(vm.listType == '2') {
+          vm.exportTime(row);
+        } else if(vm.listType == '1') {
+          vm.downLoad(row);
+        }
       } else {
         this.$nextTick(function() {
           console.log(vm.tableData[row.index]);
@@ -189,11 +231,12 @@ export default {
     // 更改数据显示数量
     handleSizeChange(val) {
       vm.param.pageSize = val;
+      vm.param.pageNo = 1;
       vm.search();
     },
     // 换页
     handleCurrentChange(val) {
-      vm.param.pageNo = value;
+      vm.param.pageNo = val;
       vm.search();
     }
   }
@@ -204,6 +247,46 @@ export default {
   .component-content {
     background: #fff;
     padding: 10px;
+    .p-title {
+      position: relative;
+      margin-top: 30px;
+      margin-left: 30px;
+      margin-bottom: 30px;
+      height: 25px;
+      font-size: 18px;
+      font-weight: 600;
+      line-height: 25px;
+      color: #000000;
+    }
+    .table-export {
+      .logo {
+        margin-top: 8px;
+        margin-right: 6px;
+        float: left;
+        width: 6px;
+        height: 6px;
+        border-radius: 50%;
+      }
+      .logo_0 {
+        background: #1890ff;
+      }
+      .logo_1 {
+        background: #52C41A;
+      }
+      .logo_2 {
+        background: #F5222D;
+      }
+      .text {
+        float: left;
+      }
+      .el-button--text {
+        color: #449284;
+      }
+      .el-button.is-disabled {
+        background: #fff !important;
+        border: 0px solid #fff !important;
+      }
+    }
   }
 }
 </style>
\ No newline at end of file

src/views/learning/report-list.vue

@@ -65,7 +65,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="formData.pageNo"
-          :page-sizes="[20, 50 ,100]"
+          :page-sizes="[20, 50 ,100, 200]"
           :page-size="formData.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalRows"