对接api

src/utils/operation.js

@@ -285,7 +285,7 @@ export function isOverlap(startA, endA, startB, endB) {
 }
 export function setRegionOption(data) {
   let option = [];
-  for(let i=0;i<data.length;i++) {
+  for (let i = 0; i < data.length; i++) {
     let obj = data[i];
     obj.label = data[i].provinceName;
     obj.value = data[i].provinceId;
@@ -467,10 +467,10 @@ export function getRank(xAxisData, seriesData) {
 }
 export function getSearchType(formData) {
   let type = 0;
-  if(formData.region.length == 1 || formData.region.length == 2) {
+  if (formData.region.length == 1 || formData.region.length == 2) {
     type = formData.region.length;
-  } else if(formData.region.length == 3) {
-    if(formData.organization.length == 0) {
+  } else if (formData.region.length == 3) {
+    if (formData.organization.length == 0) {
       type = 3;
     } else {
       type = 4
@@ -478,18 +478,36 @@ export function getSearchType(formData) {
   }
   return type;
 }
-export function getIds(formData) {
-  let ids='';
-  if(formData.organization.length == 0) {
+export function hasAll(data) {
+  let flag = false;
+  for (let i = 0; i < data.length; i++) {
+    if (data[i] == 0) {
+      flag = true;
+      return flag
+    }
+  }
+  return flag;
+}
+export function getIds(formData, organizationList, checkAll) {
+  let ids = '';
+  if (formData.organization.length == 0) {
     //地区id
-    ids = formData.region[formData.region.length-1];
+    ids = formData.region[formData.region.length - 1];
+  } else {
+    //机构id 选了'全部'
+    if (checkAll === true) {
+      for (let i = 0; i < organizationList.length; i++) {
+        if (organizationList[i].value != 0) {
+          ids += organizationList[i].value + ',';
+        }
+      }
     } else {
-    //机构id多选
-    for(let i=0;i<formData.organization.length;i++) {
-      if(formData.organization[i] != 0) {
+      for (let i = 0; i < formData.organization.length; i++) {
+        if (formData.organization[i] != 0) {
           ids += formData.organization[i] + ',';
         }
       }
+    }
     ids = ids.substring(0, ids.length - 1);
   }
   return ids;

src/views/learning/data-alignment.vue

@@ -17,7 +17,13 @@
       <p>地区：{{ dialogData.region }}</p>
       <p>选择机构：{{ dialogData.organization }}</p>
     </div>
-    <el-form class="form-update" ref="serchForm" :model="formInline" label-width="100px" style="width:40%;">
+    <el-form
+      class="form-update"
+      ref="serchForm"
+      :model="formInline"
+      label-width="100px"
+      style="width:40%;"
+    >
       <el-form-item label="项目成绩:">
         <el-select
           v-model="formInline.record"
@@ -63,19 +69,15 @@
       :data="mathDate"
       tooltip-effect="dark"
       @selection-change="handleSelectionChange"
+      :row-key="getRowKeys"
     >
-      <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="name" label="姓名" min-width="80">
-      </el-table-column>
+      <el-table-column type="selection" width="55" :reserve-selection="true"></el-table-column>
+      <el-table-column prop="name" label="姓名" min-width="80"></el-table-column>
       <el-table-column prop="joinStatus" label="项目状态" width="120">
-        <template slot-scope="scope">
-          {{ scope.row.joinStatus | projectStatus }}
-        </template>
+        <template slot-scope="scope">{{ scope.row.joinStatus | projectStatus }}</template>
       </el-table-column>
       <el-table-column prop="record" label="项目成绩" width="120">
-        <template slot-scope="scope">
-          {{ scope.row.record | recordValue }}
-        </template>
+        <template slot-scope="scope">{{ scope.row.record | recordValue }}</template>
       </el-table-column>
       <el-table-column prop="progress" label="机构" min-width="120" show-overflow-tooltip></el-table-column>
       <el-table-column prop="desk" label="科室" show-overflow-tooltip></el-table-column>
@@ -103,11 +105,7 @@
         :total="totalRows"
       ></el-pagination>
     </div>
-    <el-dialog
-      title="发布学情报告"
-      :visible.sync="dialogVisible"
-      width="30%"
-      append-to-body>
+    <el-dialog title="发布学情报告" :visible.sync="dialogVisible" width="30%" append-to-body>
       <p style="color:red">项目【基层高血压管理】的数据修改</p>
       <p>确认需要更新学情报告吗？</p>
       <span slot="footer" class="dialog-footer">
@@ -119,18 +117,20 @@
 </template>
 
 <script>
+import { openLoading, closeLoading } from "../../utils/utils";
+import * as operationData from "../../utils/operation";
 let vm;
 export default {
   props: {
     dialogData: {
       type: Object
-    },
+    }
   },
   data() {
     return {
       formInline: {
         record: "",
-        mathStatus: "",
+        mathStatus: ""
       },
       recordSelect: [
         //项目状态
@@ -163,7 +163,11 @@ export default {
       totalRows: 0, //数据总数
       pageNo: 1, //当前是第几页
       pageSize: 20, //页面总数
-      dialogVisible: false,
+      getRowKeys(row) {
+        return row.id;
+      },
+      selectedData: [],
+      dialogVisible: false
     };
   },
   created() {
@@ -173,9 +177,18 @@ export default {
   },
   methods: {
     // 将选中行放入数组
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-      console.log(this.multipleSelection);
+    handleSelectionChange(rows) {
+      // this.multipleSelection = val;
+      // console.log(this.multipleSelection);
+      this.selectedData = [];
+      if (rows) {
+        rows.forEach(row => {
+          if (row) {
+            this.selectedData.push(row.id);
+          }
+        });
+      }
+      console.log('selectedData',this.selectedData);
     },
     handleClick(row) {
       console.log(row);
@@ -188,30 +201,13 @@ export default {
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
     },
-    // 全部统计
-    includeMath() {
-      if (!this.multipleSelection) {
-        return;
-      }
-      this.multipleSelection.forEach(el => {
-        el.radio = "1";
-      });
-    },
-    // 全部不统计
-    removeMath() {
-      if (!this.multipleSelection) {
-        return;
-      }
-      this.multipleSelection.forEach(el => {
-        el.radio = "2";
-      });
-    },
     close() {
       this.$emit("closeDialog");
     },
     search() {
       this.mathDate = [
         {
+          id: 1,
           name: "张医生",
           joinStatus: 1,
           record: 1,
@@ -225,7 +221,8 @@ export default {
           radio: "1"
         },
         {
-          name: "贾医生",
+          id: 2,
+          name: "汤医生",
           joinStatus: 2,
           record: 1,
           progress: "谈西社区卫生服务站",
@@ -238,6 +235,7 @@ export default {
           radio: "1"
         },
         {
+          id: 3,
           name: "谢医生",
           joinStatus: 2,
           record: 1,
@@ -251,6 +249,19 @@ export default {
           radio: "1"
         }
       ];
+      let req = {
+        pageNo: 1,
+        pageSize: 10,
+        projectId: 1,
+        achievementStatus: 1,
+        status: 1,
+      };
+      openLoading(vm);
+      vm.GET("report/portal/getProjectData", req).then(res => {
+        closeLoading(vm);
+        if (res.code == "000000") {
+        }
+      });
     },
     //重置
     resetForm() {
@@ -258,16 +269,14 @@ export default {
         {},
         {
           record: "",
-          mathStatus: "",
+          mathStatus: ""
         }
       );
     },
     saveUpdate() {
       this.dialogVisible = true;
     },
-    updateData() {
-
-    },
+    updateData() {}
   }
 };
 </script>

src/views/learning/item-list.vue

@@ -318,17 +318,17 @@ export default {
     getRegionOption() {
       this.optionsRegion = operationData.getRegionOption();
 
-      let req = {};
-      openLoading(vm);
-      vm.GET("basic-data/position/provinces", req).then(res => {
-        closeLoading(vm);
-        if (res.code == "000000") {
-          this.optionsRegion = operationData.setRegionOption(
-            res.data.provinceList
-          );
-          console.log("this.optionsRegion", this.optionsRegion);
-        }
-      });
+      // let req = {};
+      // openLoading(vm);
+      // vm.GET("basic-data/position/provinces", req).then(res => {
+      //   closeLoading(vm);
+      //   if (res.code == "000000") {
+      //     this.optionsRegion = operationData.setRegionOption(
+      //       res.data.provinceList
+      //     );
+      //     console.log("this.optionsRegion", this.optionsRegion);
+      //   }
+      // });
     },
     getOrganizationList() {
       this.organizationList = [

src/views/learning/item-part-in.vue

@@ -15,6 +15,7 @@
     <div v-if="showChart" class="charts" id="rankChart" ref="rankChart"></div>
     <!-- <div class="charts" id="age" ref="age"></div> -->
     <el-table
+      v-if="showTable"
       v-show="organizationNum < 2"
       :data="finishDetail"
       class="project-table"
@@ -102,9 +103,9 @@ export default {
   created() {
     vm = this;
     this.projectId = vm.getUrlSearch(window.location.href, "id");
-    this.$nextTick(function() {
+    // this.$nextTick(function() {
     //   this.search();
-    });
+    // });
   },
   mounted: function() {
     commonUtil.resizeHeight();
@@ -112,19 +113,22 @@ export default {
       // console.log(this.formInline, this.organizationNum);
       this.search();
     });
-    if (this.activeName == "first") {
-      this.updateResize();
-    }
+    // if (this.activeName == "first") {
+    //   this.updateResize();
+    // }
   },
   methods: {
+    
     search() {
       if (vm.formInline.region.length == 0) {
         vm.$message("请选择地区");
         return;
       }
+      let checkAll = operationData.hasAll(vm.formInline.organization)
+      console.log(vm.formInline,checkAll,vm.organizationList);
       let req = {
         projectId: vm.projectId,
-        ids: operationData.getIds(vm.formInline),
+        ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
         type: operationData.getSearchType(vm.formInline),
         OriginalFlag: vm.formInline.checked == false ? 0 : 1
       };
@@ -134,10 +138,16 @@ export default {
         closeLoading(vm);
         if (res.code == "000000") {
           this.getCardData(res.data);
-          this.getRank(res.data);
+          // this.getRank(res.data);
           this.getTableData();
         }
       });
+      vm.GET("report/portal/top", req).then(res => {
+        closeLoading(vm);
+        if (res.code == "000000") {
+          this.getRank(res.data);
+        }
+      });
     },
     updateResize() {
       this.$nextTick(function() {
@@ -148,6 +158,8 @@ export default {
       });
     },
     getTableData() {
+      if (vm.formInline.region.length == 3 && vm.organizationNum == 1) {
+        vm.showTable = true;
         vm.finishDetail = [
           {
             name: "张三",
@@ -157,6 +169,7 @@ export default {
             endTime: 1561707567000
           }
         ];
+      }
     },
     getRank(data) {
       let xAxisData = [];
@@ -165,12 +178,16 @@ export default {
         xAxisData[i] = data.top[i].name;
         seriesData[i] = data.top[i].value;
       }
-      if (xAxisData.length > 0) {
+      if(vm.organizationNum == 1) {
+        vm.showChart = false;
+      }
+      if (xAxisData.length > 0 && vm.organizationNum !=1) {
         vm.showChart = true;
         setTimeout(function() {
           let myChart = echarts.init(vm.$refs.rankChart);
           let optionValue = operationData.getRank(xAxisData, seriesData);
           myChart.setOption(optionValue);
+          vm.updateResize();
         }, 200);
       }
     },