From 0c4b5334e6121f994c7080317e3f6b9a740b85a9 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Wed, 1 Nov 2023 09:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E3=80=81=E8=A1=97=E9=81=93?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=9D=E5=AD=98=E5=88=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=20--renpc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/building/save.html      | 6 ++++++
 src/main/resources/templates/building/update.html    | 6 ++++++
 src/main/resources/templates/house/save.html         | 7 +++++++
 src/main/resources/templates/house/update.html       | 7 +++++++
 src/main/resources/templates/residential/save.html   | 6 ++++++
 src/main/resources/templates/residential/update.html | 6 ++++++
 6 files changed, 38 insertions(+)

diff --git a/src/main/resources/templates/building/save.html b/src/main/resources/templates/building/save.html
index a02fa27..0e9961c 100644
--- a/src/main/resources/templates/building/save.html
+++ b/src/main/resources/templates/building/save.html
@@ -344,6 +344,12 @@
 
         // 提交表单
         form.on('submit(submitForm)', function(formData) {
+            // 设置所在街道和社区的选中值
+            var streetName = $('#street').find("option:selected").text();
+            var communityName = $('#community').find("option:selected").text();
+            formData.field.streetName = streetName;
+            formData.field.communityName = communityName;
+
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
diff --git a/src/main/resources/templates/building/update.html b/src/main/resources/templates/building/update.html
index d558e49..af4089c 100644
--- a/src/main/resources/templates/building/update.html
+++ b/src/main/resources/templates/building/update.html
@@ -371,6 +371,12 @@
         
         // 提交表单
         form.on('submit(submitForm)', function(formData) {
+            // 设置所在街道和社区的选中值
+            var streetName = $('#street').find("option:selected").text();
+            var communityName = $('#community').find("option:selected").text();
+            formData.field.streetName = streetName;
+            formData.field.communityName = communityName;
+
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
diff --git a/src/main/resources/templates/house/save.html b/src/main/resources/templates/house/save.html
index b3b0999..194eebe 100644
--- a/src/main/resources/templates/house/save.html
+++ b/src/main/resources/templates/house/save.html
@@ -696,6 +696,13 @@
                 var buildingId = formData.field.buildingId;
                 formData.field.buildingId = buildingId.split("_")[0];
             }
+
+            // 设置所在街道和社区的选中值
+            var streetName = $('#street').find("option:selected").text();
+            var communityName = $('#community').find("option:selected").text();
+            formData.field.streetName = streetName;
+            formData.field.communityName = communityName;
+
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
diff --git a/src/main/resources/templates/house/update.html b/src/main/resources/templates/house/update.html
index 384a9e9..3f8dff1 100644
--- a/src/main/resources/templates/house/update.html
+++ b/src/main/resources/templates/house/update.html
@@ -783,6 +783,13 @@
                 var buildingId = formData.field.buildingId;
                 formData.field.buildingId = buildingId.split("_")[0];
             }
+
+            // 设置所在街道和社区的选中值
+            var streetName = $('#street').find("option:selected").text();
+            var communityName = $('#community').find("option:selected").text();
+            formData.field.streetName = streetName;
+            formData.field.communityName = communityName;
+
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
diff --git a/src/main/resources/templates/residential/save.html b/src/main/resources/templates/residential/save.html
index ce6edb3..975de66 100644
--- a/src/main/resources/templates/residential/save.html
+++ b/src/main/resources/templates/residential/save.html
@@ -313,6 +313,12 @@
 
         // 提交表单
         form.on('submit(submitForm)', function(formData) {
+            // 设置所在街道和社区的选中值
+            var streetName = $('#street').find("option:selected").text();
+            var communityName = $('#community').find("option:selected").text();
+            formData.field.streetName = streetName;
+            formData.field.communityName = communityName;
+
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
diff --git a/src/main/resources/templates/residential/update.html b/src/main/resources/templates/residential/update.html
index afcaa1d..53fdbce 100644
--- a/src/main/resources/templates/residential/update.html
+++ b/src/main/resources/templates/residential/update.html
@@ -340,6 +340,12 @@
         
         // 提交表单
         form.on('submit(submitForm)', function(formData) {
+            // 设置所在街道和社区的选中值
+            var streetName = $('#street').find("option:selected").text();
+            var communityName = $('#community').find("option:selected").text();
+            formData.field.streetName = streetName;
+            formData.field.communityName = communityName;
+
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;