Merge branch 'feature/zl' into 'release-new'

Feature/zl

See merge request !14

.env.development.local

@@ -18,7 +18,7 @@ VUE_APP_IS_LOCAL=true
 VUE_APP_APPID=wxf4e66242d31c81c2
 
 # 本地token
-VUE_APP_TOKEN=520A62A63FA043CD90593429C5D12D0D
+VUE_APP_TOKEN=208774C74EAC430EB07EF3532B8F942D
 
 # mock的基础地址
 VUE_APP_BASE_MOCK_URL=http://192.168.120.69:40001/mock/

package.json

@@ -53,8 +53,8 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
     "@pica-cli/pica-cli-framework": "^1.0.11",
     "@pica-cli/vue-cli-plugin-pica-cli-plugin": "~1.1.52",
-    "@pica-core/multiple-versions-plugin": "^1.0.12",
-    "@pica-core/reset-pathfile-plugin": "^1.0.13",
+    "@pica-core/multiple-versions-plugin": "^1.0.16",
+    "@pica-core/reset-pathfile-plugin": "^1.0.16",
     "@pica-core/web-buried-point": "^1.0.20",
     "@pica-kit/page-model": "^1.0.10",
     "@vue/cli-plugin-babel": "~4.5.0",
@@ -79,7 +79,7 @@
     "prettier": "^2.3.2",
     "prettier-eslint-cli": "^5.0.1",
     "puppeteer": "^10.1.0",
-    "sass": "^1.26.3",
+    "sass": "1.26.3",
     "sass-loader": "^8.0.2",
     "vue-skeleton-webpack-plugin": "^1.2.2",
     "vue-template-compiler": "^2.6.11",

src/components/common/pica-area.vue

@@ -19,15 +19,22 @@
             class="cancel-btn"
             @click="cancelSelect"
           >取消</span>
-          <h3>选择地区</h3>
+          <van-tabs
+            v-model="activetab"
+            color="#449284"
+            @change="tabchange"
+          >
+            <van-tab title="地区"></van-tab>
+            <van-tab title="层级"></van-tab>
+          </van-tabs>
           <button
             class="submit-btn"
             @click="confirm"
           >
             确定
           </button>
-          <!-- <button :disabled="isDisabled" class="submit-btn" @click="confirm">确定</button> -->
         </div>
+        <div v-show="activetab == 0">
           <div
             v-show="areaList.currentOrgList.length"
             class="my-org"
@@ -182,12 +189,34 @@
             </div>
           </div>
         </div>
+        <div v-show="activetab == 1">
+          <div
+            class="address-content"
+            @touchmove.stop
+          >
+            <ul
+            >
+              <li
+                v-for="(i, index) in hl"
+                :key="index"
+                :class="{ active: hlselected.hospitalId == i.hospitalId }"
+                @click="hlSelect(i, index)"
+              >
+                <span>{{ i.hospitalName }}</span>
+                <span v-show=" hlselected.hospitalId == i.hospitalId">
+                  <img src="../../assets/images/sort-select-icon.png">
+                </span>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 <script>
 import { mapGetters, mapActions } from 'vuex';
-import { getAreaOrOrgList } from '../../service';
+import { getAreaOrOrgList, getAreaOrOrgList2 } from '../../service';
 
 export default {
   name: 'PicaArea',
@@ -237,6 +266,9 @@ export default {
         regionId: '',
       },
       currentOrgList: [],
+      activetab: '1',
+      hl:[],
+      hlselected: ''
     };
   },
   computed: {
@@ -277,6 +309,7 @@ export default {
       this.queryParams.projectId = cQuery.projectId || '';
       if (this.queryParams.projectId) {
         this.getProvinceData(this.queryParams);
+        this.getOrgData2({projectId:this.queryParams.projectId});
       }
     }
   },
@@ -383,6 +416,15 @@ export default {
       });
     },
 
+    async getOrgData2(params) {
+      await getAreaOrOrgList2(params).then((res) => {
+        if (res.code === '000000') {
+          console.log('-res', res);
+          this.hl = res.data || [];
+        }
+      });
+    },
+
     // 选择省份的操作
     provinceSelect(item, idx, isCurrent) {
       this.value.regionId = item.id;
@@ -591,17 +633,24 @@ export default {
       }
     },
     confirm() {
-      this.$emit('confirm', this.value);
+      const v = this.activetab == 0 ? this.value : this.hlselected;
+      console.log('-this.value', v);
+      this.$emit('confirm', v);
     },
     cancelSelect() {
       this.$emit('cancel', false);
     },
+    tabchange(e) {
+      console.log('e', e, this.activetab);
+    },
+    hlSelect(i) {
+      this.hlselected = i;
+    }
   },
 };
 </script>
 <style lang="scss" scoped>
 .select-wrapper {
-  font-family: PingFangSC-Regular;
   .mask {
     position: fixed;
     z-index: 1000000015;
@@ -611,7 +660,6 @@ export default {
     bottom: 0;
     background: rgba(55, 56, 57, 0.6);
   }
-
   .address-wrap {
     position: absolute;
     width: 100%;
@@ -656,7 +704,6 @@ export default {
         }
       }
     }
-
     .address-select {
       width: 100%;
       height: auto;
@@ -702,7 +749,6 @@ export default {
           text-overflow: ellipsis;
           white-space: nowrap;
           position: relative;
-          // flex: 1 0 auto;
           &:last-of-type {
             padding-right: 15px;
           }
@@ -729,15 +775,14 @@ export default {
           }
         }
       }
-
+    }
+  }
   .address-content {
     position: relative;
     width: 100%;
-        // height: 100%;
     height: 196px;
     overflow: hidden;
     box-sizing: border-box;
-
     ul {
       width: 100%;
       height: 196px;
@@ -779,8 +824,6 @@ export default {
       }
     }
   }
-    }
-  }
   .my-org {
     margin: 0 15px 15px;
     & > span {

src/router/index.js

@@ -85,6 +85,7 @@ router.beforeEach(async (to, from, next) => {
       setCookie('conslToken', params.userToken);
       next();
     });
+  // next();
 });
 
 router.addRoutes(routerConfig);

src/service/index.js

@@ -19,7 +19,13 @@ export const getAreaOrOrgList = async (params) => {
     url: 'stats/region',
   });
 };
-
+export const getAreaOrOrgList2 = async (params) => {
+  return request({
+    method: 'get',
+    withCredentials: true,
+    url: `hospital/hospitalStats/portal/hospital/deepLowers/${params.projectId}`,
+  });
+};
 /**
  * 获取区域（一般是乡镇）下的机构列表
  */

src/views/index.vue

@@ -422,7 +422,7 @@ export default {
     this.CNTParams.projectId = this.projectId;
     this.queryParams.projectId = this.projectId;
     this.getUserInfo();
-    // this.getProjectInfo(this.queryParams);
+    this.getProjectInfo(this.queryParams);
   },
   mounted() {
     window.addEventListener(
@@ -687,6 +687,11 @@ export default {
         return;
       }
       this.clearParams();
+      if(selData.hospitalId) {
+        console.log('--selData', selData);
+        this.areaName = selData.hospitalName;
+        this.queryGDParams.hospitalIdList = [selData.hospitalId];
+      }
       this.queryGDParams.regionId = selData.regionId;
       this.CNTParams.regionId = selData.regionId;
       this.getHospitalsCNT(this.CNTParams);

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     port: 8080,
     proxy: {
       '/proxy': {
-        target: 'https://sc.yunqueyi.com',
+        target: 'https://uat-sc.yunqueyi.com',
         ws: false,
         changeOrigin: true,
         secure: true,