From 53175a7546ab7daa39020e5b80cea58c41e5d99e Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Mon, 26 Feb 2024 17:25:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/request/map_settings.js                   |  1 +
 .../layer_settings/components/add.vue         | 55 ++++++++++---------
 .../map_settings/layer_settings/index.vue     | 10 ++--
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/request/map_settings.js b/src/request/map_settings.js
index 1bc157f..08373e1 100644
--- a/src/request/map_settings.js
+++ b/src/request/map_settings.js
@@ -32,3 +32,4 @@ export const setPathPlanningDelete = (params) =>
 export const setPositioning = (params) =>
   post("/videomanager/setPositioning", params); // 摆放摄像头
 export const setLayAdd = (params) => post("/positAlarm/save", params); // 新建图层
+export const setLayEdit = (params) => post("/positAlarm/edit", params); // 新建图层
diff --git a/src/views/map_settings/layer_settings/components/add.vue b/src/views/map_settings/layer_settings/components/add.vue
index 64b19d6..63f630f 100644
--- a/src/views/map_settings/layer_settings/components/add.vue
+++ b/src/views/map_settings/layer_settings/components/add.vue
@@ -4,27 +4,28 @@
     :title="type === 'add' ? '新增' : '修改'"
     :on-close="fnClose"
   >
-    <el-form
-      ref="formRef"
-      :rules="rules"
-      :model="data.form"
-      label-width="150px"
-    >
+    <el-form ref="formRef" :rules="rules" :model="form" label-width="150px">
       <el-form-item label="名称" prop="layName">
-        <el-input v-model="data.form.layName" />
+        <el-input v-model="form.layName" />
       </el-form-item>
       <el-form-item label="分组" prop="layGroup">
-        <el-input v-model="data.form.layGroup" />
+        <el-input v-model="form.layGroup" />
       </el-form-item>
       <el-form-item label="楼层" prop="floor">
-        <el-input v-model="data.form.floor" />
+        <el-input v-model="form.floor" />
+      </el-form-item>
+      <el-form-item label="list" prop="floor">
+        <el-input v-model="form.list" />
+      </el-form-item>
+      <el-form-item label="modUuid" prop="floor">
+        <el-input v-model="form.modUuid" />
       </el-form-item>
     </el-form>
     <map-tools
       v-if="visible"
       ref="mapToolsRef"
-      v-model:positions="positions"
-      v-model:modUuid="modUuid"
+      v-model:positions="form.list"
+      v-model:modUuid="form.modUuid"
       :type="1"
     />
     <template #footer>
@@ -39,8 +40,8 @@ import { useVModels } from "@vueuse/core";
 import { debounce } from "throttle-debounce";
 import { ElMessage } from "element-plus";
 import MapTools from "@/components/map_tools";
-import { reactive, ref } from "vue";
-import { setLayAdd } from "@/request/map_settings.js";
+import { ref } from "vue";
+import { setLayAdd, setLayEdit } from "@/request/map_settings.js";
 import useFormValidate from "@/assets/js/useFormValidate.js";
 
 const props = defineProps({
@@ -54,22 +55,20 @@ const props = defineProps({
     required: true,
     default: "",
   },
-});
-const data = reactive({
   form: {
-    layName: "",
-    layGroup: "",
-    floor: "",
+    type: Object,
+    required: true,
+    default: () => {},
   },
 });
 const formRef = ref(null);
-const emits = defineEmits(["update:visible", "get-data"]);
+const emits = defineEmits(["update:visible", "update:form", "get-data"]);
 const rules = {
   layName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
   layGroup: [{ required: true, message: "分组不能为空", trigger: "blur" }],
   floor: [{ required: true, message: "楼层不能为空", trigger: "blur" }],
 };
-const { visible } = useVModels(props, emits);
+const { visible, form } = useVModels(props, emits);
 const fnClose = () => {
   positions.value = [];
   modUuid.value = "";
@@ -82,15 +81,19 @@ const fnSubmit = debounce(
   1000,
   async () => {
     await useFormValidate(formRef);
-    if (positions.value.length === 0 || modUuid.value === "") {
+    if (props.form.list.length === 0 || props.form.modUuid === "") {
       ElMessage.error("未选择建筑，或者未扎点");
       return;
     }
-    await setLayAdd({
-      ...data.form,
-      list: JSON.stringify(positions.value),
-      modUuid: modUuid.value,
-    });
+    props.form.layId
+      ? await setLayAdd({
+          ...props.form,
+          list: JSON.stringify(props.form.list),
+        })
+      : await setLayEdit({
+          ...props.form,
+          list: JSON.stringify(props.form.list),
+        });
     ElMessage.success("保存成功");
     fnClose();
     emits("get-data");
diff --git a/src/views/map_settings/layer_settings/index.vue b/src/views/map_settings/layer_settings/index.vue
index 732ef2c..6517698 100644
--- a/src/views/map_settings/layer_settings/index.vue
+++ b/src/views/map_settings/layer_settings/index.vue
@@ -53,7 +53,7 @@
               type="primary"
               text
               link
-              @click="fnAddOrEdit(row.layId, 'edit')"
+              @click="fnAddOrEdit(row, 'edit')"
             >
               修改图层
             </el-button>
@@ -73,6 +73,7 @@
     <add
       v-model:visible="data.addOrEditDialog.visible"
       :type="data.addOrEditDialog.type"
+      :form="data.addOrEditDialog.form"
       @get-data="fnResetPagination"
     />
     <edit-layer-info
@@ -102,8 +103,7 @@ const { list, searchForm, tableRef, pagination, fnGetData, fnResetPagination } =
 const data = reactive({
   addOrEditDialog: {
     visible: false,
-    layId: "",
-    type: "",
+    form: {},
   },
   editLayerInfoDialog: {
     visible: false,
@@ -140,8 +140,8 @@ const fnBatchDelete = debounce(
   },
   { atBegin: true }
 );
-const fnAddOrEdit = (layId, type) => {
-  data.addOrEditDialog.layId = layId;
+const fnAddOrEdit = (row, type) => {
+  data.addOrEditDialog.form = row;
   data.addOrEditDialog.type = type;
   data.addOrEditDialog.visible = true;
 };