From e559f66268d107f33772193f0960c7c602e939ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 03 Nov 2023 13:43:36 +0800
Subject: [PATCH] 场所采集根据二维码回显楼栋

---
 api/doorplateAddress/doorplateAddress.js |   11 +
 manifest.json                            |  473 ++++++++++++++++++++++++++--------------------------
 subPackage/workbench/views/cscj.vue      |   51 +++++
 3 files changed, 294 insertions(+), 241 deletions(-)

diff --git a/api/doorplateAddress/doorplateAddress.js b/api/doorplateAddress/doorplateAddress.js
index 72c0cf1..44c1482 100644
--- a/api/doorplateAddress/doorplateAddress.js
+++ b/api/doorplateAddress/doorplateAddress.js
@@ -84,4 +84,15 @@
 		},
 		data
 	})
+}
+
+// 获取门牌地址
+export const getDoorplateAddressDetail = (params) => {
+	return http.request({
+		url: 'blade-doorplateAddress/doorplateAddress/getDoorplateAddressDetail',
+		method: 'GET',
+		params: {
+			...params
+		}
+	})
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index b98a356..5f6b0b2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,237 +1,238 @@
 {
-    "name" : "荆楚水库",
-    "appid" : "__UNI__EB167C0",
-    "description" : "",
-    "versionName" : "1.0.10",
-    "versionCode" : 104,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "compatible" : {
-            "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持  
-        },
-        "safearea" : {
-            "bottom" : {
-                "offset" : "none"
-            }
-        },
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : false,
-            "waiting" : false,
-            "autoclose" : false,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "VideoPlayer" : {},
-            "Camera" : {},
-            "Geolocation" : {},
-            "Push" : {},
-            "Maps" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false,
-                "UIBackgroundModes" : "",
-                "idfa" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {},
-                "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
-                        "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
-                    }
-                },
-                "geolocation" : {
-                    "amap" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
-                        "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
-                    },
-                    "system" : {
-                        "__platform__" : [ "ios", "android" ]
-                    }
-                },
-                "push" : {
-                    "unipush" : {
-                        "offline" : true
-                    }
-                }
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "D:/Desktop/hbsl/app/应用图标/72.png",
-                    "xhdpi" : "D:/Desktop/hbsl/app/应用图标/96.png",
-                    "xxhdpi" : "D:/Desktop/hbsl/app/应用图标/144.png",
-                    "xxxhdpi" : "D:/Desktop/hbsl/app/应用图标/192.png"
-                },
-                "ios" : {
-                    "appstore" : "D:/Desktop/icon/1024x1024bb.png",
-                    "iphone" : {
-                        "app@2x" : "D:/Desktop/icon/120.png",
-                        "app@3x" : "D:/Desktop/icon/180.png",
-                        "spotlight@2x" : "D:/Desktop/icon/80.png",
-                        "spotlight@3x" : "D:/Desktop/icon/120.png",
-                        "settings@2x" : "D:/Desktop/icon/58.png",
-                        "settings@3x" : "D:/Desktop/icon/87.png",
-                        "notification@2x" : "D:/Desktop/icon/40.png",
-                        "notification@3x" : "D:/Desktop/icon/60.png"
-                    },
-                    "ipad" : {
-                        "app" : "",
-                        "app@2x" : "",
-                        "proapp@2x" : "",
-                        "spotlight" : "",
-                        "spotlight@2x" : "",
-                        "settings" : "",
-                        "settings@2x" : "",
-                        "notification" : "",
-                        "notification@2x" : ""
-                    }
-                }
-            },
-            "splashscreen" : {
-                "useOriginalMsgbox" : true
-            }
-        },
-        "uniStatistics" : {
-            "enable" : false
-        },
-        "nativePlugins" : {}
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wxdc5675f4df850da6",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true,
-            "postcss" : true,
-            "es6" : true
-        },
-        "usingComponents" : true,
-        "optimization" : {
-            "subPackages" : true
-        },
-        "uniStatistics" : {
-            "enable" : false
-        },
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "定位"
-            }
-        }
-    },
-    "mp-alipay" : {
-        "usingComponents" : true,
-        "uniStatistics" : {
-            "enable" : false
-        }
-    },
-    "mp-baidu" : {
-        "usingComponents" : true,
-        "uniStatistics" : {
-            "enable" : false
-        }
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true,
-        "setting" : {
-            "es6" : true,
-            "minified" : true,
-            "postcss" : true,
-            "urlCheck" : false
-        },
-        "uniStatistics" : {
-            "enable" : false
-        }
-    },
-    "h5" : {
-        "template" : "template.h5.html",
-        "router" : {
-            "mode" : "hash",
-            "base" : "/app"
-        },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
-        },
-        "devServer" : {
-            "proxy" : {
-                "/api" : {
-                    "target" : "http://127.0.0.1",
-                    //"target" : "https://rider.bladex.vip/api",
-                    "pathRewrite" : {
-                        "^/api" : "/"
-                    }
-                }
-            },
-            "port" : "",
-            "https" : false
-        },
-        "uniStatistics" : {
-            "enable" : false
-        },
-        "sdkConfigs" : {
-            "maps" : {
-                "amap" : {
-                    "key" : "7fa69abe1defd5888bb85bc736cda874",
-                    "securityJsCode" : "8ac9e5f522c62ed6e3a5800a87b0d140",
-                    "serviceHost" : ""
-                }
-            }
-        },
-        "unipush" : {
-            "enable" : false
-        }
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "mp-qq" : {
-        "uniStatistics" : {
-            "enable" : false
-        }
-    }
-}
+	"name": "荆楚水库",
+	"appid": "__UNI__EB167C0",
+	"description": "",
+	"versionName": "1.0.10",
+	"versionCode": 104,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"compatible": {
+			"ignoreVersion": true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持  
+		},
+		"safearea": {
+			"bottom": {
+				"offset": "none"
+			}
+		},
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": false,
+			"waiting": false,
+			"autoclose": false,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"VideoPlayer": {},
+			"Camera": {},
+			"Geolocation": {},
+			"Push": {},
+			"Maps": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a"]
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false,
+				"UIBackgroundModes": "",
+				"idfa": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"ad": {},
+				"maps": {
+					"amap": {
+						"appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
+						"appkey_android": "c21be9bc7343573c28112c4fe272cb41"
+					}
+				},
+				"geolocation": {
+					"amap": {
+						"__platform__": ["ios", "android"],
+						"appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
+						"appkey_android": "c21be9bc7343573c28112c4fe272cb41"
+					},
+					"system": {
+						"__platform__": ["ios", "android"]
+					}
+				},
+				"push": {
+					"unipush": {
+						"offline": true
+					}
+				}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "D:/Desktop/hbsl/app/应用图标/72.png",
+					"xhdpi": "D:/Desktop/hbsl/app/应用图标/96.png",
+					"xxhdpi": "D:/Desktop/hbsl/app/应用图标/144.png",
+					"xxxhdpi": "D:/Desktop/hbsl/app/应用图标/192.png"
+				},
+				"ios": {
+					"appstore": "D:/Desktop/icon/1024x1024bb.png",
+					"iphone": {
+						"app@2x": "D:/Desktop/icon/120.png",
+						"app@3x": "D:/Desktop/icon/180.png",
+						"spotlight@2x": "D:/Desktop/icon/80.png",
+						"spotlight@3x": "D:/Desktop/icon/120.png",
+						"settings@2x": "D:/Desktop/icon/58.png",
+						"settings@3x": "D:/Desktop/icon/87.png",
+						"notification@2x": "D:/Desktop/icon/40.png",
+						"notification@3x": "D:/Desktop/icon/60.png"
+					},
+					"ipad": {
+						"app": "",
+						"app@2x": "",
+						"proapp@2x": "",
+						"spotlight": "",
+						"spotlight@2x": "",
+						"settings": "",
+						"settings@2x": "",
+						"notification": "",
+						"notification@2x": ""
+					}
+				}
+			},
+			"splashscreen": {
+				"useOriginalMsgbox": true
+			}
+		},
+		"uniStatistics": {
+			"enable": false
+		},
+		"nativePlugins": {}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx1ff4bbc24b343ef1",
+		"setting": {
+			"urlCheck": false,
+			"minified": true,
+			"postcss": true,
+			"es6": true
+		},
+		"usingComponents": true,
+		"optimization": {
+			"subPackages": true
+		},
+		"uniStatistics": {
+			"enable": false
+		},
+		"requiredPrivateInfos": ["getLocation"],
+		"permission": {
+			"scope.userLocation": {
+				"desc": "定位"
+			}
+		}
+	},
+	"mp-alipay": {
+		"usingComponents": true,
+		"uniStatistics": {
+			"enable": false
+		}
+	},
+	"mp-baidu": {
+		"usingComponents": true,
+		"uniStatistics": {
+			"enable": false
+		}
+	},
+	"mp-toutiao": {
+		"usingComponents": true,
+		"setting": {
+			"es6": true,
+			"minified": true,
+			"postcss": true,
+			"urlCheck": false
+		},
+		"uniStatistics": {
+			"enable": false
+		}
+	},
+	"h5": {
+		"template": "template.h5.html",
+		"router": {
+			"mode": "hash",
+			"base": "/app"
+		},
+		"optimization": {
+			"treeShaking": {
+				"enable": true
+			}
+		},
+		"devServer": {
+			"proxy": {
+				"/api": {
+					"target": "http://127.0.0.1",
+					//"target" : "https://rider.bladex.vip/api",
+					"pathRewrite": {
+						"^/api": "/"
+					}
+				}
+			},
+			"port": "",
+			"https": false
+		},
+		"uniStatistics": {
+			"enable": false
+		},
+		"sdkConfigs": {
+			"maps": {
+				"amap": {
+					"key": "7fa69abe1defd5888bb85bc736cda874",
+					"securityJsCode": "8ac9e5f522c62ed6e3a5800a87b0d140",
+					"serviceHost": ""
+				}
+			}
+		},
+		"unipush": {
+			"enable": false
+		}
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"mp-qq": {
+		"uniStatistics": {
+			"enable": false
+		}
+	}
+}
\ No newline at end of file
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index 2f5f5df..016034e 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -150,6 +150,7 @@
 		getLabelList
 	} from "@/api/label/label";
 	import {
+		getDoorplateAddressDetail,
 		getDoorplateAddressList
 	} from "@/api/doorplateAddress/doorplateAddress";
 	import {
@@ -315,7 +316,9 @@
 				},
 
 				activeIds: [],
-				showLabelList: []
+				showLabelList: [],
+
+				stdId: "",
 			}
 		},
 		watch: {
@@ -323,7 +326,13 @@
 				handler(newVal) {
 					this.form.label = newVal.join(",")
 				}
+			},
+			"form.buildingCode": {
+				handler(newVal) {
+					console.log(newVal)
+				}
 			}
+
 		},
 
 		created() {
@@ -332,7 +341,16 @@
 		mounted() {
 
 		},
+		options: {
+			styleIsolation: 'shared', // 解除样式隔离
+		},
 		onLoad(option) {
+			this.stdId = option.stdId
+			console.log(this.stdId, "----------")
+			if (this.stdId) {
+				this.getBuildingDetail()
+			}
+
 
 		},
 		onShow() {
@@ -340,6 +358,26 @@
 			this.getLocation()
 		},
 		methods: {
+
+			getBuildingDetail(params = {}) {
+
+
+				getDoorplateAddressDetail(Object.assign(params, {
+					stdId: this.stdId
+				})).then(res => {
+					let data = res.data
+					this.form.buildingCode = data.buildingCode
+
+					let buildingNameArr = [data.townStreetName, data.neiName, data.streetRuName, data.aoiName,
+						data.buildingName
+					]
+					let arr = buildingNameArr.filter(e => {
+						return e != null || e != ''
+					})
+					this.form.building = arr.join("")
+
+				})
+			},
 
 			//表单提交
 			submit() {
@@ -421,7 +459,6 @@
 			},
 
 			confirmPicker(e) {
-				console.log(e, "--------------------")
 
 				if (e.value[4]) {
 					this.selectValue = e.value
@@ -441,9 +478,7 @@
 					// 微信小程序无法将picker实例传出来,只能通过ref操作
 					picker = this.$refs.uPicker
 				} = e
-				console.log(e, "/*/*/*")
 				let item = e.values[columnIndex][index]
-				console.log(item, "-----------")
 				//街道
 				if (columnIndex === 0) {
 					//获取社区列表
@@ -568,7 +603,7 @@
 
 		.item {
 
-			/deep/ .form-item {
+			.form-item {
 				background-color: #ffffff;
 				padding: 2rpx 10px;
 				border-bottom: 1px solid #eff1f3;
@@ -609,6 +644,12 @@
 		}
 	}
 
+	/deep/ .u-form-item {
+		background-color: #ffffff;
+		padding: 2rpx 10px;
+		border-bottom: 1px solid #eff1f3;
+	}
+
 	.red {
 		background-color: red;
 		border-radius: 10rpx 0rpx 0rpx 10rpx;

--
Gitblit v1.9.3