Browse Source

修复bug

zhanghongrui 11 months ago
parent
commit
6f0e92cf39
3 changed files with 31 additions and 45 deletions
  1. 3 3
      config.js
  2. 1 5
      manifest.json
  3. 27 37
      pages/statistics/statistics.vue

+ 3 - 3
config.js

@@ -1,10 +1,10 @@
 // 应用全局配置
 module.exports = {
 
-	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
+	baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.88:8080',
-	 //baseUrl: 'http://192.168.4.23:8080',
-	baseUrl: 'http://192.168.4.20:8080',
+	//baseUrl: 'http://192.168.4.23:8080',
+	//baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.6:8080',
 
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',

+ 1 - 5
manifest.json

@@ -60,11 +60,7 @@
             "subPackages" : true
         },
         "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : ""
-            }
-        },
+        "permission" : {},
         "lazyCodeLoading" : "requiredComponents"
     },
     "vueVersion" : "2",

+ 27 - 37
pages/statistics/statistics.vue

@@ -1372,21 +1372,16 @@
 						});
 					}
 				} else if (e == 'xq') {
-					// if (this.isEmpty(this.XZQValue.dictValue)) {
-					// 	this.$modal.msg('请选择行政区')
-					//
-					// } else {
-					this.XQValue = '';
-					this.LDValue = '';
-					this.DYValue = '';
-					this.FJValue = '';
-					getAreaList('').then(res => {
-						this.XQList = res.data;
+					if (this.isEmpty(this.XZQValue.dictValue)) {
+						getAreaList('').then(res => {
+							this.XQList = res.data;
+							this.open = true;
+							this.selectList = this.XQList;
+						})
+					} else {
 						this.open = true;
 						this.selectList = this.XQList;
-					})
-
-					// }
+					}
 				} else if (e == 'ld') {
 
 					if (this.isEmpty(this.XQValue.id)) {
@@ -1421,20 +1416,18 @@
 						});
 					}
 				} else if (e == 'xq2') {
-					// if (this.isEmpty(this.XZQValue2.dictValue)) {
-					// 	this.$modal.msg('请选择行政区')
-					//
-					// } else {
-					this.XQValue2 = '';
-					this.LDValue2 = '';
-					this.DYValue2 = '';
-					this.FJValue2 = '';
-					getAreaList('').then(res => {
-						this.XQList2 = res.data;
+
+					if (this.isEmpty(this.XZQValue2.dictValue)) {
+						getAreaList('').then(res => {
+							this.XQList2 = res.data;
+							this.open = true;
+							this.selectList = this.XQList2;
+						})
+					} else {
 						this.open = true;
 						this.selectList = this.XQList2;
-					})
-					// }
+					}
+
 				} else if (e == 'ld2') {
 
 					if (this.isEmpty(this.XQValue2.id)) {
@@ -1454,20 +1447,17 @@
 						this.selectList = this.DYList2;
 					}
 				} else if (e == 'xq3') {
-					// if (this.isEmpty(this.XZQValue3.dictValue)) {
-					// 	this.$modal.msg('请选择行政区')
-					//
-					// } else {
-					this.XQValue3 = '';
-					this.LDValue3 = '';
-					this.DYValue3 = '';
-					this.FJValue3 = '';
-					getAreaList('').then(res => {
-						this.XQList3 = res.data;
+					if (this.isEmpty(this.XZQValue3.dictValue)) {
+						getAreaList('').then(res => {
+							this.XQList3 = res.data;
+							this.open = true;
+							this.selectList = this.XQList3;
+						})
+					} else {
 						this.open = true;
 						this.selectList = this.XQList3;
-					})
-					// }
+					}
+
 				} else if (e == 'ld3') {
 
 					if (this.isEmpty(this.XQValue3.id)) {