区域选择、调整后数据

components/common/pica-area.vue

@@ -19,13 +19,13 @@
               }}
             </li>
             <li
-              v-show="value.provinceName && rank>1"
+              v-show="value.provinceName  && value.provinceName != '全部' && rank > 1 && areaList.cityList.length"
               :class="{ active: isShowCity }"
               class="item"
               @click="tabAddressClick(2)"
             >{{ value.cityName ? value.cityName : '请选择' }}</li>
             <li
-              v-show="value.cityName && rank>2"
+              v-show="value.cityName && rank > 2 && areaList.countyList.length"
               :class="{ active: isShowCounty }"
               class="item"
               @click="tabAddressClick(3)"
@@ -35,7 +35,7 @@
               }}
             </li>
             <li
-              v-show="value.countyName && rank>3"
+              v-show="value.countyName && rank > 3 && areaList.townList.length"
               :class="{ active: isShowTown }"
               class="item"
               @click="tabAddressClick(4)"
@@ -158,15 +158,16 @@ export default {
   created() {
     // localStorage.setItem('baseUrl',this.baseUrl);
     // this.projectId = (this.$route.query && this.$route.query.projectId) || 374;
+    // this.projectId = (this.$route && this.$route.query && this.$route.query.projectId) || 374;
     // this.getProvinceData(this.queryParams);
 
-    // if(process.client) {
-    //   if(this.$route && this.$route.query) {
-    //     let cQuery = this.$route.query
-    //     let hospitalIdList = cQuery.hospitalIdList || ''
-    //     this.queryParams.projectId = cQuery.projectId || '';
-    //   }
-    // }
+    if(process.client) {
+      if(this.$route && this.$route.query) {
+        let cQuery = this.$route.query
+        let hospitalIdList = cQuery.hospitalIdList || ''
+        this.queryParams.projectId = cQuery.projectId || '';
+      }
+    }
   },
   computed: {
     ...mapGetters({
@@ -176,10 +177,13 @@ export default {
   },
   watch: {
     projectId(newVal) {
+      // alert(newVal)
+      console.log('###############', newVal);
       this.queryParams.projectId = newVal;
       // this.getProvinceData(this.queryParams);
     },
     provinceList(newVal) {
+      console.log('###############', newVal);
       this.areaList.provinceList = newVal;
       this.areaList.provinceList[0].selected = true
       this.value.provinceName = '全部'
@@ -255,7 +259,6 @@ export default {
       });
     },
     async getTownData(params) {
-      console.log('getTownData')
       await getTownList(params).then(res => {
         if (res.code === "000000") {
           this.areaList.townList = res.data && res.data.list || [];
@@ -274,15 +277,7 @@ export default {
         }
       });
     },
-    //      provinceCallback(provinceId) {
-    //        this.getCityData(provinceId);
-    //      },
-    //      cityCallback(cityId) {
-    //        this.getCountyData(cityId);
-    //      },
-    //      countryCallback(countyId) {
-    //        this.getTownData(countyId);
-    //      },
+
     //选择省份的操作
     provinceSelect(item, idx) {
       console.log('provinceSelect', item, this.rank);

pages/examscore.vue

@@ -29,7 +29,7 @@ export default {
         beginDate: "",
         endDate: "",
         hospitalIdList: [],
-        originalFlag: 1, // 默认值0：0不查看原始数据
+        originalFlag: 2, // 默认值0：0不查看原始数据
         projectId: 374,
         regionId: "",
         timeFlag: 1,
@@ -67,7 +67,7 @@ export default {
   //     beginDate: "",
   //     endDate: "",
   //     hospitalIdList: [],
-  //     originalFlag: 1, // 默认值0：0不查看原始数据
+  //     originalFlag: 2, // 默认值0：0不查看原始数据
   //     projectId: 374,
   //     regionId: "",
   //     timeFlag: 1,

pages/examtimes.vue

@@ -27,7 +27,7 @@ export default {
         beginDate: "",
         endDate: "",
         hospitalIdList: [],
-        originalFlag: 1, // 默认值0：0不查看原始数据
+        originalFlag: 2, // 默认值0：0不查看原始数据
         projectId: 374,
         regionId: "",
         timeFlag: 1,
@@ -53,7 +53,7 @@ export default {
   //     beginDate: "",
   //     endDate: "",
   //     hospitalIdList: [],
-  //     originalFlag: 1, // 默认值0：0不查看原始数据
+  //     originalFlag: 2, // 默认值0：0不查看原始数据
   //     projectId: 374,
   //     regionId: "",
   //     timeFlag: 1,

pages/index copy.vue

@@ -232,7 +232,7 @@ export default {
         beginDate: "",
         endDate: "",
         hospitalIdList: [],
-        originalFlag: 1, // 默认值0：0不查看原始数据
+        originalFlag: 2, // 默认值0：0不查看原始数据
         projectId: 374,
         regionId: "",
         timeFlag: 1,

pages/index.vue

@@ -219,8 +219,8 @@ export default {
       costRankList: [],
       projectId: "",
       token:
-        "C7AEA346BC6A4EE0B2F1F76CBD511AC9" ||
-        "A4EC71DD3D50420B86ED454EF25BCEA9" ||
+        // "C7AEA346BC6A4EE0B2F1F76CBD511AC9" ||
+        "79A005DB585C45C389ED1DD0C76E3633" ||
         "A220943B006347799F277CC524EBB662",
       isOrgStat: false,
       // 区域选择通用接口参数
@@ -233,7 +233,7 @@ export default {
         beginDate: "",
         endDate: "",
         hospitalIdList: [],
-        originalFlag: 1, // 默认值0：0不查看原始数据
+        originalFlag: 2, // 默认值2：1.查看原始数据 2.查看调整后的数据
         projectId: 374,
         regionId: "",
         timeFlag: 1,
@@ -348,7 +348,7 @@ export default {
   },
   created() {
     if (process.client) {
-      this.projectId = (this.$router && this.$route.query && this.$route.query.projectId) || 374;
+      this.projectId = (this.$route && this.$route.query && this.$route.query.projectId) || 374;
       this.queryGDParams.projectId = this.projectId;
       this.CNTParams.projectId = this.projectId;
       this.queryParams.projectId = this.projectId;

pages/klgpoint.vue

@@ -25,7 +25,7 @@ export default {
         beginDate: "",
         endDate: "",
         hospitalIdList: [],
-        originalFlag: 1, // 默认值0：0不查看原始数据
+        originalFlag: 2, // 默认值0：0不查看原始数据
         projectId: 374,
         regionId: "",
         timeFlag: 1,

pages/rankdays.vue

@@ -25,7 +25,7 @@ export default {
         beginDate: "",
         endDate: "",
         hospitalIdList: [],
-        originalFlag: 1, // 默认值0：0不查看原始数据
+        originalFlag: 2, // 默认值0：0不查看原始数据
         projectId: 374,
         regionId: "",
         timeFlag: 1,

pages/rankedu.vue

@@ -26,7 +26,7 @@ export default {
         beginDate: "",
         endDate: "",
         hospitalIdList: [],
-        originalFlag: 1, // 默认值0：0不查看原始数据
+        originalFlag: 2, // 默认值0：0不查看原始数据
         projectId: 374,
         regionId: "",
         timeFlag: 1,