From fc6966597cfeea46bce2a54aec1de86b659243bc Mon Sep 17 00:00:00 2001
From: kongyeqing <2697454777@qq.com>
Date: Thu, 12 Oct 2023 17:52:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:mapbox=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/blank.component.vue                | 2 +-
 src/views/hiddenDanger/common.component.html | 4 ++--
 src/views/hiddenDanger/manager.component.vue | 6 +++---
 src/views/risk/area/area.component.vue       | 6 ++++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/blank.component.vue b/src/views/blank.component.vue
index d142bbf..cdf2e9b 100644
--- a/src/views/blank.component.vue
+++ b/src/views/blank.component.vue
@@ -61,7 +61,7 @@ export default class BlankComponent extends Vue {
             this.$store.commit("setUserList", results[2].data.datas.map((item) => {
                 return {
                     name: item.nickName,
-                    value: item.userId
+                    value:item.userId
                 }
             }))
 
diff --git a/src/views/hiddenDanger/common.component.html b/src/views/hiddenDanger/common.component.html
index fed0b34..4d69685 100644
--- a/src/views/hiddenDanger/common.component.html
+++ b/src/views/hiddenDanger/common.component.html
@@ -121,8 +121,8 @@
 
 
     <el-dialog v-if="showMap" :close-on-click-modal="false" destroy-on-close title="地图定位" :visible.sync="showMap"
-        width="980px" :before-close="handleClose" destroy-on-close>
-        <MapComponent @onLoad="getMap"></MapComponent>
+        width="980px" :before-close="handleClose">
+        <MapComponent :id="'manager_map'" @onLoad="getMap"></MapComponent>
         <div class="full" style="margin-top: 20px; text-align: center;">
             <el-button @click="handleClose">取消</el-button>
             <el-button type="primary" @click="onDragEnd">确定</el-button>
diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue
index 2c9128e..263de64 100644
--- a/src/views/hiddenDanger/manager.component.vue
+++ b/src/views/hiddenDanger/manager.component.vue
@@ -105,8 +105,8 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
     public showFile = false;
     public currentUrl = null;
     public center = [118.751353, 31.969568];
-    public marker: any = null;
-    public map: any = null;
+    public marker: any;
+    public map: any;
     public showMap = false;
 
     //排序属性转换
@@ -1241,7 +1241,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         if (this.showMap) {
             this.showMap = false;
             this.marker.remove();
-            this.marker = null;
+            this.marker = undefined;
             return
         }
         this.photoList = [];
diff --git a/src/views/risk/area/area.component.vue b/src/views/risk/area/area.component.vue
index 113cd4c..61e5f3a 100644
--- a/src/views/risk/area/area.component.vue
+++ b/src/views/risk/area/area.component.vue
@@ -251,8 +251,10 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
         }, {
             name: "责任部门",
             key: "chargeDeptId",
-            type: "select",
-            datas: this.$store.state.deptList
+            type: "treeSelect",
+            expandLevel: Infinity,
+            width:"280px",
+            datas: this.$store.state.deptTreeList
         }, {
             name: "是否重大危险源",
             key: "majorHazardFlag",