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/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,