From cfd0f1ae6327984bdfca7c3b9124ec9be5795a2c Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Fri, 1 Mar 2024 10:37:52 +0800
Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A14355=E3=80=8114342=E3=80=8114333?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map_tools/index.vue                 |  8 ++++++++
 src/views/BI/js/echarts5.js                        | 14 +++++---------
 .../other_alarm_configurations/index.vue           |  4 ++--
 src/views/map_settings/layer_settings/index.vue    | 13 +++++++++----
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/map_tools/index.vue b/src/components/map_tools/index.vue
index ddb9ea2..aa027d0 100644
--- a/src/components/map_tools/index.vue
+++ b/src/components/map_tools/index.vue
@@ -141,4 +141,12 @@ onBeforeUnmount(() => {
     }
   }
 }
+
+:deep {
+  div#menu {
+    button {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/BI/js/echarts5.js b/src/views/BI/js/echarts5.js
index 8a16838..312a2e6 100644
--- a/src/views/BI/js/echarts5.js
+++ b/src/views/BI/js/echarts5.js
@@ -12,9 +12,11 @@ function echarts2(id, data) {
   myChart5 = echarts.init(document.querySelector(`#${id}`));
   const option = {
     backgroundColor: "",
-    tooltip: {},
+    tooltip: {
+      trigger: "axis",
+    },
     grid: {
-      top: "5%",
+      top: "15%",
       left: "1%",
       right: "1%",
       bottom: "0%",
@@ -24,7 +26,7 @@ function echarts2(id, data) {
       icon: "circle",
       data: ["累计工作", "本月工作"],
       textStyle: {
-        color: "#999999",
+        color: "#fff",
         borderColor: "#fff",
       },
     },
@@ -88,9 +90,6 @@ function echarts2(id, data) {
           color: "#28ffb3",
           borderColor: "#fff",
         },
-        tooltip: {
-          show: true,
-        },
         areaStyle: {
           // 区域填充样式
           // 线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
@@ -120,9 +119,6 @@ function echarts2(id, data) {
         name: "本月工作",
         type: "bar",
         barWidth: 20,
-        tooltip: {
-          show: true,
-        },
         itemStyle: {
           color: "#1492FF",
         },
diff --git a/src/views/alarm_configuration/other_alarm_configurations/index.vue b/src/views/alarm_configuration/other_alarm_configurations/index.vue
index fd2044b..41eb539 100644
--- a/src/views/alarm_configuration/other_alarm_configurations/index.vue
+++ b/src/views/alarm_configuration/other_alarm_configurations/index.vue
@@ -199,8 +199,8 @@ const fnAddOrEdit = async (id, type) => {
   await nextTick();
   if (type === "edit") {
     const resData = await getOtherAlarmConfigurationsView({ id });
-    resData.data.regId = resData.data.regId.map(Number);
-    resData.data.regGatherId = resData.data.regGatherId.map(Number);
+    resData.data.regId = resData.data.regId?.map(Number);
+    resData.data.regGatherId = resData.data.regGatherId?.map(Number);
     data.addOrEditDialog.form = resData.data;
   }
 };
diff --git a/src/views/map_settings/layer_settings/index.vue b/src/views/map_settings/layer_settings/index.vue
index 6517698..cd70d93 100644
--- a/src/views/map_settings/layer_settings/index.vue
+++ b/src/views/map_settings/layer_settings/index.vue
@@ -63,7 +63,7 @@
           </template>
         </el-table-column>
         <template #button>
-          <el-button type="primary" @click="fnAddOrEdit('', 'add')">
+          <el-button type="primary" @click="fnAddOrEdit({}, 'add')">
             新增
           </el-button>
           <el-button type="danger" @click="fnBatchDelete">批量删除</el-button>
@@ -103,7 +103,11 @@ const { list, searchForm, tableRef, pagination, fnGetData, fnResetPagination } =
 const data = reactive({
   addOrEditDialog: {
     visible: false,
-    form: {},
+    form: {
+      layName: "",
+      layGroup: "",
+      floor: "",
+    },
   },
   editLayerInfoDialog: {
     visible: false,
@@ -140,10 +144,11 @@ const fnBatchDelete = debounce(
   },
   { atBegin: true }
 );
-const fnAddOrEdit = (row, type) => {
+const fnAddOrEdit = async (row, type) => {
+  data.addOrEditDialog.visible = true;
+  await nextTick();
   data.addOrEditDialog.form = row;
   data.addOrEditDialog.type = type;
-  data.addOrEditDialog.visible = true;
 };
 const fnEditLayerInfo = async (layId) => {
   data.editLayerInfoDialog.visible = true;