From 7a35c32284e65cad3fccbba70cc99846d1ebcaaf Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Thu, 16 May 2024 16:00:59 +0800
Subject: [PATCH] =?UTF-8?q?flat=EF=BC=9A=20=E8=A1=97=E9=81=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/city-cascader/main.vue    | 35 +++++++++++++++++------
 src/components/map/selectLocation2.vue   | 21 ++++++++++++--
 src/views/manage/company/companyList.vue | 36 +++++++++++++++++++++++-
 3 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/src/components/city-cascader/main.vue b/src/components/city-cascader/main.vue
index 1b1ac02..dd14c64 100644
--- a/src/components/city-cascader/main.vue
+++ b/src/components/city-cascader/main.vue
@@ -1,13 +1,19 @@
 <template>
-  <el-cascader
-    :options="area.data"
-    :show-all-levels="showAllLevels"
-    v-model="model"
-    :filterable="filterable"
-    :placeholder="placeholder"
-    :disabled="disabled"
-    :clearable="clearable"
-  ></el-cascader>
+  <div>
+    <el-cascader
+      :options="area.data"
+      :show-all-levels="showAllLevels"
+      v-model="model"
+      :filterable="filterable"
+      :placeholder="placeholder"
+      :disabled="disabled"
+      :clearable="clearable"
+      v-if="type !== 'view'"
+    ></el-cascader>
+    <div v-else>
+      {{ model2 }}
+    </div>
+  </div>
 </template>
 
 <script>
@@ -29,6 +35,9 @@ export default {
     showAllLevels: {type: Boolean, default: true},
     disabled: Boolean,
     clearable: Boolean,
+    type: {
+      default: 'custom',
+    }
   },
   data() {
     return {
@@ -79,6 +88,14 @@ export default {
         return null;
       },
     },
+    model2: {
+      get() {
+        if (this.county && this.county != -1) {
+          return `${this.area.dic[this.prov].label}-${this.area.dic[this.city].label}-${this.area.dic[this.county].label}`
+        }
+        return null;
+      },
+    },
   },
 };
 </script>
diff --git a/src/components/map/selectLocation2.vue b/src/components/map/selectLocation2.vue
index 05ee3b1..2d7fadc 100644
--- a/src/components/map/selectLocation2.vue
+++ b/src/components/map/selectLocation2.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-content">
     <el-input
-      v-if="type !== 'view'"
+      v-if="showInput"
       :placeholder="placeholder"
       clearable
       v-model="addressLocation"
@@ -52,7 +52,7 @@ import {
   GetFeaturesByGeometryParameters
 } from '@supermap/iclient-ol';
 
-console.log(process.env.VUE_APP_SUPPER_MAP)
+const geoJSONParser = new GeoJSON();
 export default {
   name: "uMapView",
   props: {
@@ -114,6 +114,14 @@ export default {
       default: 'custom',
     }
   },
+  computed: {
+    showInput() {
+      if (this.type === 'view' || this.type === 'select') {
+        return false
+      }
+      return true
+    }
+  },
   data() {
     return {
       // 实例化对象
@@ -281,6 +289,13 @@ export default {
     careateFeature(result) {
       if (this.vectorSourceIcon) {
         this.vectorSourceIcon.clear()
+        const geojsonObject = {
+          type: 'FeatureCollection',
+          features: result,
+        };
+        this.vectorSourceIcon.addFeatures(geoJSONParser.readFeatures(geojsonObject))
+        this.vectorSourceIcon.changed()
+        return
       }
       const geojsonObject = {
         type: 'FeatureCollection',
@@ -288,7 +303,7 @@ export default {
       };
       // 创建一个图层作为点位
       this.vectorSourceIcon = new SourceVector({
-        features: new GeoJSON().readFeatures(geojsonObject)
+        features: geoJSONParser.readFeatures(geojsonObject)
       });
       this.vectorLayerIcon = new LayerVector({
         source: this.vectorSourceIcon,
diff --git a/src/views/manage/company/companyList.vue b/src/views/manage/company/companyList.vue
index e54b522..ad1498d 100644
--- a/src/views/manage/company/companyList.vue
+++ b/src/views/manage/company/companyList.vue
@@ -17,7 +17,22 @@
         <jl-city-cascader :disabled="disabled" v-model="form.cityId"></jl-city-cascader>
       </template>
       <template slot="cityId" slot-scope="{ row }">
-        {{ row.cityId === -1 ? '' : row.cityId }}
+        <jl-city-cascader :type="'view'" :disabled="true" v-model="row.cityId"></jl-city-cascader>
+      </template>
+      <template slot="lonForm" slot-scope="{ row }">
+        <super-map-view
+          :isCanEdit="false"
+          @addAddress="changeAddress"
+          :longitude="row.lon <= 0 ? 104.397894 : row.lon"
+          :latitude="row.lat <= 0 ? 31.126855 : row.lat"
+          :open="true"
+          :zoom="10"
+          :min-zoom="10"
+          :max-zoom="20"
+          :flag-tip="false"
+          placeholder="请输入详细地址"
+          :type="'select'"
+        ></super-map-view>
       </template>
       <template slot="companyAddressForm" slot-scope="{ disabled }">
         <select-map
@@ -203,6 +218,7 @@ export default {
       },
       obj: {},
       data: [],
+      selectJW: null,
     };
   },
   computed: {
@@ -314,6 +330,7 @@ export default {
                 span: 20,
                 display: true,
                 prop: "cityId",
+                slot: true,
                 formslot: true,
                 rules: [
                   {
@@ -337,6 +354,14 @@ export default {
                   },
                 ],
               },
+              {
+                label: "所在地区",
+                prop: "lon",
+                hide: true,
+                span: 20,
+                display: true,
+                formslot: true,
+              },
             ],
           }
         ],
@@ -436,6 +461,9 @@ export default {
         }
       );
     },
+    changeAddress(val) {
+      this.selectJW = val
+    },
     rowUpdate(row, index, done, loading) {
       row.authUrlId = getPath(row.authUrlId);
       row.identityUrl4Id = getPath(row.identityUrl4Id);
@@ -444,6 +472,11 @@ export default {
       if (this.obj.address) {
         copyRow.companyAddress = this.obj.address
       }
+      if (this.selectJW) {
+        const {lng, lat} = this.selectJW
+        copyRow.lon = lng
+        copyRow.lat = lat
+      }
       update(copyRow).then(
         () => {
           this.onLoad(this.page);
@@ -540,6 +573,7 @@ export default {
       if (["add", "edit"].includes(type)) {
         this.imgList = [];
         this.initData();
+        this.selectJW = null
         done();
       }
       if (["edit", "view"].includes(type)) {