选择地区接入真实数据

src/App.vue

@@ -57,7 +57,7 @@ export default {
 	created() {
 		vm = this
     if(vm.$route.name!='loginPage') {
-     vm.getToken()
+    //  vm.getToken()
     }
 	},
 	mounted() {

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = '0F2535FDC86946C284312962FF7FC2AF';
+      config.headers['token'] = '2CD0420B09584AFAA2B6CFD85252E1AB';
       // config.headers['token'] = '874879EF8F0F477F85D8FF1A9BFEC634';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/utils/filter.js

@@ -175,16 +175,16 @@ const vueFilter = {
   },
   partJoin: (value) => {
     if(value == 1) {
-        return '是'
+        return '未参与'
     }else  {
-        return '否'
+        return '参与'
     }
   },
   partFinish: (value) => {
     if(value == 1) {
-        return '是'
+        return '未完成'
     }else  {
-        return '否'
+        return '完成'
     }
   },
   projectStatus: (value) => {

src/views/learning/item-list.vue

@@ -9,6 +9,7 @@
             size="small"
             ref="cascaderRegion"
             :options="optionsRegion"
+            :props="props"
             v-model="formInline.region"
             @change="handleChange"
             filterable
@@ -336,19 +337,19 @@ export default {
     },
     //获取地区
     getRegionOption() {
-      this.optionsRegion = operationData.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

@@ -18,19 +18,19 @@
       v-show="organizationNum < 2"
       :data="finishDetail"
       class="project-table"
-      style="width: 100%"
+      style="width: 100%;margin-bottom: 30px;"
       border
     >
       <el-table-column prop="name" label="姓名" align="center"></el-table-column>
-      <el-table-column prop="desk" label="科室" align="center"></el-table-column>
-      <el-table-column prop="join" label="是否参与项目" align="center">
-        <template slot-scope="scope">{{ scope.row.join | partJoin }}</template>
+      <el-table-column prop="departmentName" label="科室" align="center"></el-table-column>
+      <el-table-column prop="joinStatus" label="是否参与项目" align="center">
+        <template slot-scope="scope">{{ scope.row.joinStatus | partJoin }}</template>
       </el-table-column>
-      <el-table-column prop="finish" label="是否完成项目" align="center">
-        <template slot-scope="scope">{{ scope.row.finish | partFinish }}</template>
+      <el-table-column prop="projectStatus" label="是否完成项目" align="center">
+        <template slot-scope="scope">{{ scope.row.projectStatus | partFinish }}</template>
       </el-table-column>
-      <el-table-column prop="endTime" label="完成项目日期" align="center">
-        <template slot-scope="scope">{{ scope.row.endTime | liveDateFilter }}</template>
+      <el-table-column prop="finishTime" label="完成项目日期" align="center">
+        <template slot-scope="scope">{{ scope.row.finishTime }}</template>
       </el-table-column>
       <div slot="empty">
         <div class="table-empty">
@@ -133,13 +133,13 @@ export default {
         if (res.code == "000000") {
           this.getCardData(res.data);
           // this.getRank(res.data);
-          this.getTableData();
         }
       });
       vm.reportGET("report/portal/top", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           this.getRank(res.data);
+          this.getTableData(res.data);
         }
       });
     },
@@ -151,18 +151,12 @@ export default {
         };
       });
     },
-    getTableData() {
+    getTableData(data) {
       if (vm.formInline.region.length == 3 && vm.organizationNum == 1) {
         vm.showTable = true;
-        vm.finishDetail = [
-          {
-            name: "张三",
-            desk: "神经内科",
-            join: 1,
-            finish: 1,
-            endTime: 1561707567000
-          }
-        ];
+        vm.finishDetail = data.hospitalPeopleList;
+      } else {
+        vm.showTable = false;
       }
     },
     getRank(data) {