From 4c0157d65a88d17fccdeba464ef0dd450fcf0af3 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 10 Aug 2024 15:41:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=202=E3=80=81=E6=8E=92=E6=B0=B4=E4=BA=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drainage_well/components/list.vue         | 106 +++++++++++++-----
 .../equipment_library/components/list.vue     |   1 -
 .../resource_management/util/getPoint.vue     |   2 +-
 3 files changed, 77 insertions(+), 32 deletions(-)

diff --git a/src/views/emergen_cyrescue/resource_management/drainage_well/components/list.vue b/src/views/emergen_cyrescue/resource_management/drainage_well/components/list.vue
index 461b67b..16277ef 100644
--- a/src/views/emergen_cyrescue/resource_management/drainage_well/components/list.vue
+++ b/src/views/emergen_cyrescue/resource_management/drainage_well/components/list.vue
@@ -48,39 +48,73 @@
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
     <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="1000px">
-      <el-form ref="form" :rules="rules" :model="form" label-width="250px">
-        <el-form-item label="名称" prop="NAME">
-          <el-input v-model="form.NAME" placeholder="请输入名称..." />
-        </el-form-item>
-        <el-form-item label="类型" prop="TYPE">
-          <Treeselect
-            :options="yjTypeData"
-            :normalizer="normalizer"
-            v-model="form.TYPE"
-            placeholder="请选择类型"
-            no-options-text="暂无数据"
-            no-children-text="暂无数据"
-            @input="handleTypeChange"
-          />
-        </el-form-item>
-        <el-form-item label="地址" prop="ADDRESS">
-          <el-input v-model="form.ADDRESS" placeholder="请输入地址..." />
-        </el-form-item>
-        <el-form-item label="联系人" prop="CONTACT_PERSON">
-          <el-input v-model="form.CONTACT_PERSON" placeholder="请输入联系人..." />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="CONTACT_PHONE">
-          <el-input v-model="form.CONTACT_PHONE" placeholder="请输入联系电话..." />
-        </el-form-item>
-        <el-form-item label="描述" prop="DESCRIPTION">
-          <el-input v-model="form.DESCRIPTION" type="textarea" placeholder="请输入描述..." />
-        </el-form-item>
+      <el-form ref="form" :rules="rules" :model="form" label-width="100px" style="margin-right: 50px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="NAME">
+              <el-input v-model="form.NAME" placeholder="请输入名称..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="类型" prop="TYPE">
+              <Treeselect
+                :options="yjTypeData"
+                :normalizer="normalizer"
+                v-model="form.TYPE"
+                placeholder="请选择类型"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+                @input="handleTypeChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="ADDRESS">
+              <el-input v-model="form.ADDRESS" placeholder="请输入地址..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人" prop="CONTACT_PERSON">
+              <el-input v-model="form.CONTACT_PERSON" placeholder="请输入联系人..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="CONTACT_PHONE">
+              <el-input v-model="form.CONTACT_PHONE" placeholder="请输入联系电话..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="描述" prop="DESCRIPTION">
+              <el-input v-model="form.DESCRIPTION" type="textarea" placeholder="请输入描述..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item :key="form.LONGITUDE" label="经度" prop="LONGITUDE">
+              <el-input v-model="form.LONGITUDE" placeholder="请输入内容" disabled @focus="handleMap" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :key="form.LATITUDE" label="纬度" prop="LATITUDE">
+              <div style="display: flex">
+                <el-input v-model="form.LATITUDE" placeholder="请输入内容" disabled style="width: 100%" @focus="handleMap"/>
+                <el-button style="margin-left:10px" @click="handleMap">
+                  <span class="svg-container">
+                    <svg-icon icon-class="international" />
+                  </span>
+                </el-button>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormEdit = false">取消</el-button>
         <el-button type="primary" @click="confirm">确定</el-button>
       </div>
     </el-dialog>
+    <get-point ref="getPoint" @getPosition = "getPosition"/>
   </div>
 </template>
 
@@ -89,9 +123,10 @@ import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import { Treeselect } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import getPoint from '../../util/getPoint.vue'
 
 export default {
-  components: { Treeselect, Pagination },
+  components: { getPoint, Treeselect, Pagination },
   data() {
     return {
       listQuery: {
@@ -113,7 +148,9 @@ export default {
         ADDRESS: '',
         CONTACT_PERSON: '',
         CONTACT_PHONE: '',
-        DESCRIPTION: ''
+        DESCRIPTION: '',
+        LATITUDE: '',
+        LONGITUDE: ''
       },
       rules: {
         NAME: [
@@ -191,7 +228,9 @@ export default {
           ADDRESS: data.ADDRESS,
           CONTACT_PERSON: data.CONTACT_PERSON,
           CONTACT_PHONE: data.CONTACT_PHONE,
-          DESCRIPTION: data.DESCRIPTION
+          DESCRIPTION: data.DESCRIPTION,
+          LONGITUDE: data.LONGITUDE,
+          LATITUDE: data.LATITUDE
         }
       }).catch((e) => {
         console.error('获取详情数据失败', e)
@@ -276,6 +315,13 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    getPosition(e) {
+      this.form.LATITUDE = e.LATITUDE
+      this.form.LONGITUDE = e.LONGITUDE
+    },
+    handleMap() {
+      this.$refs.getPoint.init({ LATITUDE: this.form.LATITUDE, LONGITUDE: this.form.LONGITUDE })
     }
   }
 }
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue
index 150fad2..ad04a0b 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue
@@ -346,7 +346,6 @@ export default {
     getPosition(e) {
       this.form.LATITUDE = e.LATITUDE
       this.form.LONGITUDE = e.LONGITUDE
-      console.log(this.form)
     }
   }
 }
diff --git a/src/views/emergen_cyrescue/resource_management/util/getPoint.vue b/src/views/emergen_cyrescue/resource_management/util/getPoint.vue
index bcc3097..ce4a34e 100644
--- a/src/views/emergen_cyrescue/resource_management/util/getPoint.vue
+++ b/src/views/emergen_cyrescue/resource_management/util/getPoint.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="visible" title="编辑坐标" width="800px" class="dy-dialog">
+  <el-dialog :visible.sync="visible" title="编辑坐标" width="800px" class="dy-dialog" append-to-body>
     <baidu-map
       :zoom="zoom"
       :scroll-wheel-zoom="true"