From e988d6014dd88b72ba66ebfd5cf1e810b3e0c42c Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Fri, 23 Feb 2024 15:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/index.vue                |   5 +
 src/request/alarm_configuration.js            |  20 ++
 src/request/axios.js                          |   3 +
 src/request/map_settings.js                   |  13 +
 .../components/batch_processing.vue           |  86 +++++
 .../alarm_information/index.vue               | 160 +++++++++
 .../other_alarm_areas/index.vue               |   9 +
 .../components/add.vue                        | 317 ++++++++++++++++++
 .../other_alarm_configurations/index.vue      | 185 ++++++++++
 .../components/add.vue                        |  40 ++-
 .../assignment_ticket_area_settings/index.vue |  23 +-
 .../path_planning/components/add.vue          |  38 +++
 .../map_settings/path_planning/index.vue      | 124 +++++++
 13 files changed, 1013 insertions(+), 10 deletions(-)
 create mode 100644 src/request/alarm_configuration.js
 create mode 100644 src/views/alarm_configuration/alarm_information/components/batch_processing.vue
 create mode 100644 src/views/alarm_configuration/alarm_information/index.vue
 create mode 100644 src/views/alarm_configuration/other_alarm_areas/index.vue
 create mode 100644 src/views/alarm_configuration/other_alarm_configurations/components/add.vue
 create mode 100644 src/views/alarm_configuration/other_alarm_configurations/index.vue
 create mode 100644 src/views/map_settings/path_planning/components/add.vue
 create mode 100644 src/views/map_settings/path_planning/index.vue

diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 8b6cbcc..07a4ad3 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -15,6 +15,7 @@
     :summary-method="summaryMethod"
     :span-method="spanMethod"
     :default-expand-all="defaultExpandAll"
+    :tree-props="treeProps"
     @row-click="rowClick"
     @row-dblclick="rowDblclick"
   >
@@ -102,6 +103,10 @@ const props = defineProps({
   spanMethod: {
     type: Function,
   },
+  treeProps: {
+    type: Object,
+    default: () => ({ hasChildren: "hasChildren", children: "children" }),
+  },
 });
 const emits = defineEmits([
   "update:pagination",
diff --git a/src/request/alarm_configuration.js b/src/request/alarm_configuration.js
new file mode 100644
index 0000000..cd4326a
--- /dev/null
+++ b/src/request/alarm_configuration.js
@@ -0,0 +1,20 @@
+import { post } from "@/request/axios.js";
+
+export const getOtherAlarmConfigurationsList = (params) =>
+  post("/positAlarm/electronicFence/list", params); // 其他告警配置列表
+export const getOtherAlarmConfigurationsView = (params) =>
+  post("/positAlarm/electronicFenceGoEdit", params); // 其他告警配置查看
+export const setOtherAlarmConfigurationsDelete = (params) =>
+  post("/positAlarm/electronicFenceDelete", params); // 其他告警配置删除
+export const setOtherAlarmConfigurationsDeactivateOrEnable = (params) =>
+  post("/positAlarm/electronicFenceStatus", params); // 其他告警配置停用启用
+export const setOtherAlarmConfigurationsAdd = (params) =>
+  post("/positAlarm/electronicFenceSave", params); // 其他告警配置新增
+export const setOtherAlarmConfigurationsEdit = (params) =>
+  post("/positAlarm/electronicFenceEdit", params); // 其他告警配置修改
+export const getAlarmInformationList = (params) =>
+  post("/positAlarm/getAlArmDataList", params); // 告警信息列表
+export const setAlarmInformationBatchProcessing = (params) =>
+  post("/positAlarm/alarmHandling", params); // 告警信息批量处理
+export const setAlarmInformationOneClickProcessing = (params) =>
+  post("/positAlarm/alarmHandlingAll", params); // 告警信息一键处理
diff --git a/src/request/axios.js b/src/request/axios.js
index 4357615..9869ab6 100644
--- a/src/request/axios.js
+++ b/src/request/axios.js
@@ -58,6 +58,9 @@ axios.interceptors.response.use(
           error.message = `连接错误${error.response.status}`;
           import.meta.env.DEV &&
             ElMessage.error(`连接错误${error.response.status}`);
+          endLoading();
+          ElMessage.error("登录失效，请重新登陆");
+          router.push("/login").then();
       }
     } else {
       error.message = "连接到服务器失败";
diff --git a/src/request/map_settings.js b/src/request/map_settings.js
index 231bc14..13a8e61 100644
--- a/src/request/map_settings.js
+++ b/src/request/map_settings.js
@@ -11,7 +11,20 @@ export const setLayerSettingsEdit = (params) =>
   post("/positAlarm/edit", params); // 图层设置编辑
 export const getAssignmentTicketAreaSettingsList = (params) =>
   post("/positAlarm/otherRegion/list", params); // 作业票区域设置列表
+export const getAssignmentTicketAreaSettingsView = (params) =>
+  post("/positAlarm/otherRegion/regionGoEdit", params); // 作业票区域设置查看
+export const setAssignmentTicketAreaSettingsAdd = (params) =>
+  post("/positAlarm/otherRegion/save", params); // 作业票区域设置新增
+export const setAssignmentTicketAreaSettingsEdit = (params) =>
+  post("/positAlarm/otherRegion/regionEdit", params); // 作业票区域设置修改
+export const getSelectRegionTreeVo = (params) =>
+  post("/positAlarm/otherRegion/selectRegionTreeVo", params); // 所属图层
 export const setAssignmentTicketAreaSettingsDeactivateOrEnable = (params) =>
   post("/positAlarm/otherRegion/editStatus", params); // 作业票区域设置停用启用
 export const setAssignmentTicketAreaSettingsDelete = (params) =>
   post("/positAlarm/otherRegion/regionDelete", params); // 作业票区域设置删除
+// TODO 接口不对
+export const getPathPlanningList = (params) =>
+  post("/positAlarm/coordinateLine/addCoordinateLine", params); // 路径规划列表
+export const setPathPlanningDelete = (params) =>
+  post("/positAlarm/coordinateLine/batchDelete", params); // 路径规划删除
diff --git a/src/views/alarm_configuration/alarm_information/components/batch_processing.vue b/src/views/alarm_configuration/alarm_information/components/batch_processing.vue
new file mode 100644
index 0000000..b2a3bab
--- /dev/null
+++ b/src/views/alarm_configuration/alarm_information/components/batch_processing.vue
@@ -0,0 +1,86 @@
+<template>
+  <el-dialog
+    v-model="visible"
+    :title="type === 'add' ? '新增' : '修改'"
+    :on-close="fnClose"
+  >
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="150px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="处理方式" prop="disposeStr">
+            <el-input
+              v-model="form.disposeStr"
+              type="textarea"
+              :autosize="{ minRows: 3 }"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              type="textarea"
+              :autosize="{ minRows: 3 }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button @click="fnClose">关闭</el-button>
+      <el-button type="primary" @click="fnSubmit">保存</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { useVModels } from "@vueuse/core";
+import { debounce } from "throttle-debounce";
+import { ElMessage } from "element-plus";
+import { ref } from "vue";
+import useFormValidate from "@/assets/js/useFormValidate.js";
+import { setAlarmInformationBatchProcessing } from "@/request/alarm_configuration.js";
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  ids: {
+    type: String,
+    required: true,
+    default: "",
+  },
+});
+const emits = defineEmits(["update:visible", "get-data"]);
+const { visible } = useVModels(props, emits);
+const rules = {
+  disposeStr: [{ required: true, message: "请输入处理方式", trigger: "blur" }],
+};
+const form = ref({
+  disposeStr: "",
+  remark: "",
+});
+const formRef = ref(null);
+const fnClose = () => {
+  formRef.value.resetFields();
+  visible.value = false;
+};
+const fnSubmit = debounce(
+  1000,
+  async () => {
+    await useFormValidate(formRef);
+    await setAlarmInformationBatchProcessing({
+      ids: props.ids,
+      ...form.value,
+    });
+    ElMessage.success("处理成功");
+    fnClose();
+    emits("get-data");
+  },
+  { atBegin: true }
+);
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/alarm_configuration/alarm_information/index.vue b/src/views/alarm_configuration/alarm_information/index.vue
new file mode 100644
index 0000000..8762a67
--- /dev/null
+++ b/src/views/alarm_configuration/alarm_information/index.vue
@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <el-card>
+      <el-form
+        :model="searchForm"
+        label-width="80px"
+        @submit.prevent="fnResetPagination"
+      >
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="关键字" prop="str">
+              <el-input v-model="searchForm.str" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="报警类型" prop="eleType">
+              <el-select v-model="searchForm.eleType">
+                <el-option
+                  v-for="item in eleTypeList"
+                  :key="item.ID"
+                  :label="item.NAME"
+                  :value="item.ID"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="处理状态" prop="status">
+              <el-select v-model="searchForm.status">
+                <el-option
+                  v-for="item in statusList"
+                  :key="item.ID"
+                  :label="item.NAME"
+                  :value="item.ID"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label-width="30px">
+              <el-button type="primary" native-type="submit">搜索</el-button>
+              <el-button native-type="reset" @click="fnResetPagination">
+                重置
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <layout-card>
+      <layout-table
+        ref="tableRef"
+        v-model:pagination="pagination"
+        row-key="id"
+        :data="list"
+        @get-data="fnGetData"
+      >
+        <el-table-column reserve-selection type="selection" width="55" />
+        <el-table-column label="序号" width="70">
+          <template #default="{ $index }">
+            {{ serialNumber(pagination, $index) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="状态">
+          <template #default="{ row }">
+            {{ translationStatus(row.status, statusList) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="告警类型">
+          <template #default="{ row }">
+            {{ translationStatus(row.eleType, eleTypeList) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="eleName" label="告警名称" />
+        <el-table-column prop="name" label="触发人员" />
+        <el-table-column prop="layerGroup" label="触发地点" />
+        <el-table-column prop="alarmTime" label="触发时间" />
+        <el-table-column prop="disposeTime" label="处理时间" />
+        <el-table-column prop="disposeStr" label="处理方式" />
+        <el-table-column prop="disposeBy" label="处理人" />
+        <el-table-column prop="regName" label="备注" />
+        <template #button>
+          <el-button type="primary" @click="fnBatchProcessing">
+            批量处理
+          </el-button>
+          <el-button type="primary" @click="fnOneClickProcessing">
+            一键处理
+          </el-button>
+        </template>
+      </layout-table>
+    </layout-card>
+    <batch-processing
+      v-model:visible="data.batchProcessingDialog.visible"
+      :ids="data.batchProcessingDialog.ids"
+      @get-data="fnResetPagination"
+    />
+  </div>
+</template>
+
+<script setup>
+import useListData from "@/assets/js/useListData.js";
+import { serialNumber, translationStatus } from "@/assets/js/utils.js";
+import {
+  getAlarmInformationList,
+  setAlarmInformationOneClickProcessing,
+} from "@/request/alarm_configuration.js";
+import { debounce } from "throttle-debounce";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { reactive } from "vue";
+import BatchProcessing from "./components/batch_processing.vue";
+
+const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
+  useListData(getAlarmInformationList, {
+    defaultSearchForm: { status: "0", eleType: "1" },
+    immediate: false,
+  });
+const statusList = [
+  { NAME: "未处理", ID: "0" },
+  { NAME: "已处理", ID: "1" },
+];
+const eleTypeList = [
+  { NAME: "越界报警", ID: "7" },
+  { NAME: "滞留报警", ID: "1" },
+  { NAME: "串岗报警", ID: "2" },
+  { NAME: "超员报警", ID: "3" },
+  { NAME: "缺员报警", ID: "4" },
+  { NAME: "静止报警", ID: "5" },
+  { NAME: "一键报警", ID: "6" },
+  { NAME: "聚集报警", ID: "8" },
+];
+const data = reactive({
+  batchProcessingDialog: {
+    visible: false,
+    ids: "",
+  },
+});
+const fnOneClickProcessing = debounce(
+  1000,
+  async () => {
+    await ElMessageBox.confirm("是否处理全部告警记录？", { type: "warning" });
+    await setAlarmInformationOneClickProcessing();
+    ElMessage.success("一键处理成功");
+    fnResetPagination();
+  },
+  { atBegin: true }
+);
+const fnBatchProcessing = () => {
+  const selectionData = tableRef.value.getSelectionRows();
+  if (selectionData.length === 0) {
+    ElMessage.warning("请选中要处理的项");
+    return;
+  }
+  data.batchProcessingDialog.ids = selectionData
+    .map((item) => item.id)
+    .join(",");
+  data.batchProcessingDialog.visible = true;
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/alarm_configuration/other_alarm_areas/index.vue b/src/views/alarm_configuration/other_alarm_areas/index.vue
new file mode 100644
index 0000000..862d86e
--- /dev/null
+++ b/src/views/alarm_configuration/other_alarm_areas/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <index-view type="0" />
+</template>
+
+<script setup>
+import IndexView from "@/views/map_settings/assignment_ticket_area_settings/index.vue";
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/alarm_configuration/other_alarm_configurations/components/add.vue b/src/views/alarm_configuration/other_alarm_configurations/components/add.vue
new file mode 100644
index 0000000..41b3025
--- /dev/null
+++ b/src/views/alarm_configuration/other_alarm_configurations/components/add.vue
@@ -0,0 +1,317 @@
+<template>
+  <el-dialog
+    v-model="visible"
+    :title="type === 'add' ? '新增' : '修改'"
+    :on-close="fnClose"
+  >
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="150px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="名称" prop="eleName">
+            <el-input v-model="form.eleName" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="所属图层" prop="regId">
+            <el-select v-model="form.regId" filterable multiple>
+              <el-option
+                v-for="item in regionList"
+                :key="item.id"
+                :value="item.id"
+                :disabled="item.list.length === 0 || item.status === '1'"
+                :label="`${item.regName}（${item.layName}）`"
+              >
+                <div style="display: flex; justify-content: space-between">
+                  <div>{{ item.regName }}（图层：{{ item.layName }}）</div>
+                  <div>
+                    <span v-if="item.list.length === 0" class="text-red">
+                      [未选点]
+                    </span>
+                    <span v-if="item.status === '1'" class="text-red ml-10">
+                      [已停用]
+                    </span>
+                  </div>
+                </div>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="eleType">
+            <el-select v-model="form.eleType" multiple>
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.id"
+                :label="item.label"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="围栏颜色" prop="color">
+            <el-color-picker
+              v-model="form.color"
+              :predefine="[
+                '#ff1900',
+                '#ff8c00',
+                '#fff200',
+                '#006aff',
+                '#00ff1e',
+                '#000000',
+              ]"
+            />
+          </el-form-item>
+        </el-col>
+        <template v-if="form.eleType.includes('1')">
+          <el-col :span="24">
+            <el-divider>滞留告警参数</el-divider>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="滞留时间(秒)" prop="resTime">
+              <el-select v-model="form.resTime">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </template>
+        <template v-if="form.eleType.includes('2')">
+          <el-col :span="24">
+            <el-divider>越界告警参数</el-divider>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="告警间隔(秒)" prop="eleTimeCrossed">
+              <el-select v-model="form.eleTimeCrossed">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="允许进入人员" prop="eleCrossed">
+              <el-select v-model="form.eleCrossed" multiple>
+                <el-option
+                  v-for="item in timeList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </template>
+        <template v-if="form.eleType.includes('3')">
+          <el-col :span="24">
+            <el-divider>超员告警参数</el-divider>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="告警间隔(秒)" prop="eleTimeOver">
+              <el-select v-model="form.eleTimeOver">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="最大人数" prop="overNum">
+              <el-input v-model="form.overNum" />
+            </el-form-item>
+          </el-col>
+        </template>
+        <template v-if="form.eleType.includes('4')">
+          <el-col :span="24">
+            <el-divider>缺员告警参数</el-divider>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="告警间隔(秒)" prop="eleTimeLack">
+              <el-select v-model="form.eleTimeLack">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="最小人数" prop="lackNum">
+              <el-input v-model="form.lackNum" />
+            </el-form-item>
+          </el-col>
+        </template>
+        <template v-if="form.eleType.includes('5')">
+          <el-col :span="24">
+            <el-divider>静止告警参数</el-divider>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="静止时间(秒)" prop="stillTime">
+              <el-select v-model="form.stillTime">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </template>
+        <template v-if="form.eleType.includes('7')">
+          <el-col :span="24">
+            <el-divider>串岗告警参数</el-divider>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="告警间隔(秒)" prop="eleTimeDept">
+              <el-select v-model="form.eleTimeDept">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="允许进入部门" prop="eleDept">
+              <el-select v-model="form.eleDept" multiple>
+                <el-option
+                  v-for="item in timeList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </template>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button @click="fnClose">关闭</el-button>
+      <el-button type="primary" @click="fnSubmit">保存</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { useVModels } from "@vueuse/core";
+import { debounce } from "throttle-debounce";
+import { ElMessage } from "element-plus";
+import { ref } from "vue";
+import useFormValidate from "@/assets/js/useFormValidate.js";
+import { getAssignmentTicketAreaSettingsList } from "@/request/map_settings.js";
+import {
+  setOtherAlarmConfigurationsAdd,
+  setOtherAlarmConfigurationsEdit,
+} from "@/request/alarm_configuration.js";
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  form: {
+    type: Object,
+    required: true,
+    default: () => ({}),
+  },
+  type: {
+    type: String,
+    required: true,
+    default: "",
+  },
+});
+const emits = defineEmits(["update:visible", "update:form", "get-data"]);
+const { visible, form } = useVModels(props, emits);
+const alarmTypeList = [
+  { id: "1", label: "滞留报警" },
+  { id: "2", label: "串岗报警" },
+  { id: "3", label: "超员报警" },
+  { id: "4", label: "缺员报警" },
+  { id: "5", label: "静止报警" },
+  { id: "7", label: "越界报警" },
+];
+const timeList = [10, 20, 30, 60, 120, 300, 600];
+const rules = {
+  eleName: [{ required: true, message: "请输入名称", trigger: "blur" }],
+  regId: [{ required: true, message: "请选择所属图层", trigger: "change" }],
+  eleType: [{ required: true, message: "请选择告警类型", trigger: "change" }],
+  color: [{ required: true, message: "请选择围栏颜色", trigger: "change" }],
+  resTime: [{ required: true, message: "请选择滞留时间", trigger: "change" }],
+  eleTimeCrossed: [
+    { required: true, message: "请选择告警间隔", trigger: "change" },
+  ],
+  eleTimeOver: [
+    { required: true, message: "请选择告警间隔", trigger: "change" },
+  ],
+  overNum: [
+    { required: true, message: "请输入最大人数", trigger: "blur" },
+    { type: "number", message: "请输入数字", trigger: "blur" },
+  ],
+  eleTimeLack: [
+    { required: true, message: "请选择告警间隔", trigger: "change" },
+  ],
+  lackNum: [
+    { required: true, message: "请输入最小人数", trigger: "blur" },
+    { type: "number", message: "请输入数字", trigger: "blur" },
+  ],
+  stillTime: [{ required: true, message: "请选择静止时间", trigger: "change" }],
+  eleTimeDept: [
+    { required: true, message: "请选择告警间隔", trigger: "change" },
+  ],
+};
+const formRef = ref(null);
+const regionList = ref([]);
+const fnGetRegionList = async () => {
+  const resData = await getAssignmentTicketAreaSettingsList({
+    currentPage: 1,
+    showCount: 99999,
+    type: 0,
+  });
+  regionList.value = resData.rows;
+};
+fnGetRegionList();
+const fnClose = () => {
+  formRef.value.resetFields();
+  visible.value = false;
+};
+const fnSubmit = debounce(
+  1000,
+  async () => {
+    await useFormValidate(formRef);
+    const params = {
+      ...form.value,
+      regId: JSON.stringify(form.value.regId),
+      eleType: JSON.stringify(form.value.eleType),
+      eleCrossed: JSON.stringify(form.value.eleCrossed),
+      eleDept: JSON.stringify(form.value.eleDept),
+    };
+    console.log(params);
+    props.type === "add"
+      ? await setOtherAlarmConfigurationsAdd(params)
+      : await setOtherAlarmConfigurationsEdit(params);
+    ElMessage.success("保存成功");
+    fnClose();
+    emits("get-data");
+  },
+  { atBegin: true }
+);
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/alarm_configuration/other_alarm_configurations/index.vue b/src/views/alarm_configuration/other_alarm_configurations/index.vue
new file mode 100644
index 0000000..bf8c378
--- /dev/null
+++ b/src/views/alarm_configuration/other_alarm_configurations/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <el-card>
+      <el-form
+        :model="searchForm"
+        label-width="60px"
+        @submit.prevent="fnResetPagination"
+      >
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="关键字" prop="str">
+              <el-input v-model="searchForm.str" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label-width="30px">
+              <el-button type="primary" native-type="submit">搜索</el-button>
+              <el-button native-type="reset" @click="fnResetPagination">
+                重置
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <layout-card>
+      <layout-table
+        ref="tableRef"
+        v-model:pagination="pagination"
+        row-key="id"
+        :data="list"
+        @get-data="fnGetData"
+      >
+        <el-table-column reserve-selection type="selection" width="55" />
+        <el-table-column label="序号" width="70">
+          <template #default="{ $index }">
+            {{ serialNumber(pagination, $index) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="名称" prop="eleName" />
+        <el-table-column label="所属图层区域">
+          <template #default="{ row }">
+            {{ row.regions.map((item) => item.regName).join("、") }}
+          </template>
+        </el-table-column>
+        <el-table-column label="类型">其它告警</el-table-column>
+        <el-table-column label="状态" width="100">
+          <template #default="{ row }">
+            {{ row.status === "1" ? "停用" : "启用" }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <template #default="{ row }">
+            <el-button
+              type="primary"
+              text
+              link
+              @click="
+                fnDeactivateOrEnable(row.id, row.status === '1' ? '0' : '1')
+              "
+            >
+              {{ row.status === "1" ? "启用" : "停用" }}
+            </el-button>
+            <el-button
+              type="primary"
+              text
+              link
+              @click="fnAddOrEdit(row.id, 'edit')"
+            >
+              修改
+            </el-button>
+            <el-button type="primary" text link @click="fnDelete(row.id)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+        <template #button>
+          <el-button type="primary" @click="fnAddOrEdit('', 'add')">
+            新增
+          </el-button>
+          <el-button type="danger" @click="fnBatchDelete">批量删除</el-button>
+        </template>
+      </layout-table>
+    </layout-card>
+    <add
+      v-model:visible="data.addOrEditDialog.visible"
+      v-model:form="data.addOrEditDialog.form"
+      :type="data.addOrEditDialog.type"
+      @get-data="fnResetPagination"
+    />
+  </div>
+</template>
+
+<script setup>
+import useListData from "@/assets/js/useListData.js";
+import { serialNumber } from "@/assets/js/utils.js";
+import { debounce } from "throttle-debounce";
+import { ElMessage, ElMessageBox } from "element-plus";
+import {
+  getOtherAlarmConfigurationsList,
+  getOtherAlarmConfigurationsView,
+  setOtherAlarmConfigurationsDeactivateOrEnable,
+  setOtherAlarmConfigurationsDelete,
+} from "@/request/alarm_configuration.js";
+import Add from "./components/add.vue";
+import { nextTick, reactive } from "vue";
+
+const { list, searchForm, tableRef, pagination, fnGetData, fnResetPagination } =
+  useListData(getOtherAlarmConfigurationsList, {
+    otherParams: { isGatheringAlarm: 0 },
+    defaultSearchForm: { str: "" },
+    key: "rows",
+  });
+const data = reactive({
+  addOrEditDialog: {
+    visible: false,
+    type: "",
+    form: {
+      isGatheringAlarm: 0,
+      eleName: "",
+      regId: [],
+      eleType: [],
+      color: "#ff1900",
+      resTime: "",
+      eleTimeCrossed: "",
+      eleCrossed: [],
+      overNum: "",
+      eleTimeLack: "",
+      lackNum: "",
+      stillTime: "",
+      eleTimeDept: "",
+      eleDept: [],
+    },
+  },
+});
+const fnDeactivateOrEnable = debounce(
+  1000,
+  async (id, status) => {
+    const message = status === "1" ? "停用" : "启用";
+    await ElMessageBox.confirm(`确定要${message}吗？`, { type: "warning" });
+    await setOtherAlarmConfigurationsDeactivateOrEnable({ id, status });
+    ElMessage.success(`${message}成功`);
+    fnResetPagination();
+  },
+  { atBegin: true }
+);
+const fnDelete = debounce(
+  1000,
+  async (DATA_IDS) => {
+    await ElMessageBox.confirm("确定要删除吗？", { type: "warning" });
+    await setOtherAlarmConfigurationsDelete({ DATA_IDS });
+    ElMessage.success("删除成功");
+    fnResetPagination();
+  },
+  { atBegin: true }
+);
+const fnBatchDelete = debounce(
+  1000,
+  async () => {
+    const selectionData = tableRef.value.getSelectionRows();
+    if (selectionData.length === 0) {
+      ElMessage.warning("请选中要删除的项");
+      return;
+    }
+    await ElMessageBox.confirm("确定要删除选中的数据吗？", { type: "warning" });
+    const DATA_IDS = selectionData.map((item) => item.id).join(",");
+    await setOtherAlarmConfigurationsDelete({ DATA_IDS });
+    ElMessage.success("删除成功");
+    fnResetPagination();
+  },
+  { atBegin: true }
+);
+const fnAddOrEdit = async (id, type) => {
+  data.addOrEditDialog.type = type;
+  data.addOrEditDialog.visible = true;
+  await nextTick();
+  if (type === "edit") {
+    const resData = await getOtherAlarmConfigurationsView({ id });
+    resData.data.regId = resData.data.regId.map(Number);
+    data.addOrEditDialog.form = resData.data;
+  }
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/map_settings/assignment_ticket_area_settings/components/add.vue b/src/views/map_settings/assignment_ticket_area_settings/components/add.vue
index 107eb4e..570a579 100644
--- a/src/views/map_settings/assignment_ticket_area_settings/components/add.vue
+++ b/src/views/map_settings/assignment_ticket_area_settings/components/add.vue
@@ -9,7 +9,14 @@
         <el-input v-model="form.regName" />
       </el-form-item>
       <el-form-item label="所属图层" prop="layId">
-        <el-input v-model="form.layId" />
+        <el-select v-model="form.layId" filterable>
+          <el-option
+            v-for="item in selectRegionTreeVoList"
+            :key="item.layId"
+            :value="item.layId"
+            :label="item.label"
+          />
+        </el-select>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -25,7 +32,11 @@ import { debounce } from "throttle-debounce";
 import { ElMessage } from "element-plus";
 import { ref } from "vue";
 import useFormValidate from "@/assets/js/useFormValidate.js";
-import { setLayerSettingsEdit } from "@/request/map_settings.js";
+import {
+  getSelectRegionTreeVo,
+  setAssignmentTicketAreaSettingsAdd,
+  setAssignmentTicketAreaSettingsEdit,
+} from "@/request/map_settings.js";
 
 const props = defineProps({
   visible: {
@@ -43,6 +54,11 @@ const props = defineProps({
     required: true,
     default: "",
   },
+  queryType: {
+    type: String,
+    required: true,
+    default: "",
+  },
 });
 const emits = defineEmits(["update:visible", "update:form", "get-data"]);
 const { visible, form } = useVModels(props, emits);
@@ -51,6 +67,12 @@ const rules = {
   layId: [{ required: true, message: "请新增所属图层", trigger: "change" }],
 };
 const formRef = ref(null);
+const selectRegionTreeVoList = ref([]);
+const fnGetSelectRegionTreeVo = async () => {
+  const resData = await getSelectRegionTreeVo();
+  selectRegionTreeVoList.value = resData.data;
+};
+fnGetSelectRegionTreeVo();
 const fnClose = () => {
   formRef.value.resetFields();
   visible.value = false;
@@ -59,10 +81,16 @@ const fnSubmit = debounce(
   1000,
   async () => {
     await useFormValidate(formRef);
-    await setLayerSettingsEdit({
-      ...form.value,
-      list: JSON.stringify(form.value.list),
-    });
+    props.type === "add"
+      ? await setAssignmentTicketAreaSettingsAdd({
+          ...form.value,
+          type: props.queryType,
+          status: 0,
+        })
+      : await setAssignmentTicketAreaSettingsEdit({
+          ...form.value,
+          list: JSON.stringify(form.value.list),
+        });
     ElMessage.success("保存成功");
     fnClose();
     emits("get-data");
diff --git a/src/views/map_settings/assignment_ticket_area_settings/index.vue b/src/views/map_settings/assignment_ticket_area_settings/index.vue
index c7dd05a..3ae906c 100644
--- a/src/views/map_settings/assignment_ticket_area_settings/index.vue
+++ b/src/views/map_settings/assignment_ticket_area_settings/index.vue
@@ -38,7 +38,9 @@
           </template>
         </el-table-column>
         <el-table-column label="名称" prop="regName" />
-        <el-table-column label="类型"> 作业票区域 </el-table-column>
+        <el-table-column label="类型">
+          {{ type === 1 ? "作业票区域" : "告警区域" }}
+        </el-table-column>
         <el-table-column label="所属图层" prop="layName" />
         <el-table-column label="定位状态" width="100">
           <template #default="{ row }">
@@ -96,6 +98,7 @@
       v-model:visible="data.addOrEditDialog.visible"
       v-model:form="data.addOrEditDialog.form"
       :type="data.addOrEditDialog.type"
+      :query-type="type"
       @get-data="fnResetPagination"
     />
     <selecting-points
@@ -109,19 +112,26 @@
 import useListData from "@/assets/js/useListData.js";
 import {
   getAssignmentTicketAreaSettingsList,
+  getAssignmentTicketAreaSettingsView,
   setAssignmentTicketAreaSettingsDeactivateOrEnable,
   setAssignmentTicketAreaSettingsDelete,
 } from "@/request/map_settings.js";
 import { serialNumber } from "@/assets/js/utils.js";
 import { debounce } from "throttle-debounce";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { reactive } from "vue";
+import { nextTick, reactive } from "vue";
 import Add from "./components/add.vue";
 import SelectingPoints from "./components/selecting_points.vue";
 
+const props = defineProps({
+  type: {
+    type: String,
+    default: "1",
+  },
+});
 const { list, searchForm, tableRef, pagination, fnGetData, fnResetPagination } =
   useListData(getAssignmentTicketAreaSettingsList, {
-    otherParams: { type: 1 },
+    otherParams: { type: props.type },
     key: "rows",
   });
 const data = reactive({
@@ -175,9 +185,14 @@ const fnBatchDelete = debounce(
   },
   { atBegin: true }
 );
-const fnAddOrEdit = (id, type) => {
+const fnAddOrEdit = async (id, type) => {
   data.addOrEditDialog.type = type;
   data.addOrEditDialog.visible = true;
+  await nextTick();
+  if (type === "edit") {
+    const resData = await getAssignmentTicketAreaSettingsView({ id });
+    data.addOrEditDialog.form = resData.data;
+  }
 };
 const fnSelectingPoints = (id) => {
   data.selectingPointsDialog.id = id;
diff --git a/src/views/map_settings/path_planning/components/add.vue b/src/views/map_settings/path_planning/components/add.vue
new file mode 100644
index 0000000..d66de27
--- /dev/null
+++ b/src/views/map_settings/path_planning/components/add.vue
@@ -0,0 +1,38 @@
+<template>
+  <el-dialog v-model="visible" title="新增" :on-close="fnClose">
+    <template #footer>
+      <el-button @click="fnClose">关闭</el-button>
+      <el-button type="primary" @click="fnSubmit">保存</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { useVModels } from "@vueuse/core";
+import { debounce } from "throttle-debounce";
+import { ElMessage } from "element-plus";
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+});
+const emits = defineEmits(["update:visible", "get-data"]);
+const { visible } = useVModels(props, emits);
+const fnClose = () => {
+  visible.value = false;
+};
+const fnSubmit = debounce(
+  1000,
+  async () => {
+    ElMessage.success("保存成功");
+    fnClose();
+    emits("get-data");
+  },
+  { atBegin: true }
+);
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/map_settings/path_planning/index.vue b/src/views/map_settings/path_planning/index.vue
new file mode 100644
index 0000000..bf4c839
--- /dev/null
+++ b/src/views/map_settings/path_planning/index.vue
@@ -0,0 +1,124 @@
+<template>
+  <div>
+    <el-card>
+      <el-form
+        :model="searchForm"
+        label-width="60px"
+        @submit.prevent="fnResetPagination"
+      >
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="关键字" prop="str">
+              <el-input v-model="searchForm.str" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label-width="30px">
+              <el-button type="primary" native-type="submit">搜索</el-button>
+              <el-button native-type="reset" @click="fnResetPagination">
+                重置
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <layout-card>
+      <layout-table
+        ref="tableRef"
+        v-model:pagination="pagination"
+        row-key="id"
+        :data="list"
+        :tree-props="{ children: '' }"
+        @get-data="fnGetData"
+      >
+        <el-table-column reserve-selection type="selection" width="55" />
+        <el-table-column type="expand" width="55">
+          <template #default="{ row }">
+            <div class="plr-20 pt-20">
+              <layout-table :data="row.children" :show-pagination="false">
+                <el-table-column label="交点路径" prop="name" />
+                <el-table-column label="交点">
+                  <template #default="{ row: row1 }">
+                    经度：{{ row1.longitude }} 纬度：{{ row1.latitude }}
+                  </template>
+                </el-table-column>
+              </layout-table>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="序号" width="70">
+          <template #default="{ $index }">
+            {{ serialNumber(pagination, $index) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="名称" prop="name" />
+        <el-table-column label="操作" width="80">
+          <template #default="{ row }">
+            <el-button type="primary" text link @click="fnDelete(row.id)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+        <template #button>
+          <el-button type="primary" @click="fnAdd"> 新增 </el-button>
+          <el-button type="danger" @click="fnBatchDelete">批量删除</el-button>
+        </template>
+      </layout-table>
+    </layout-card>
+    <add
+      v-model:visible="data.addDialogVisible"
+      @get-data="fnResetPagination"
+    />
+  </div>
+</template>
+
+<script setup>
+import useListData from "@/assets/js/useListData.js";
+import {
+  getPathPlanningList,
+  setPathPlanningDelete,
+} from "@/request/map_settings.js";
+import { serialNumber } from "@/assets/js/utils.js";
+import { debounce } from "throttle-debounce";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { reactive } from "vue";
+import Add from "./components/add.vue";
+
+const { list, searchForm, tableRef, pagination, fnGetData, fnResetPagination } =
+  useListData(getPathPlanningList);
+const data = reactive({
+  addDialogVisible: false,
+});
+const fnDelete = debounce(
+  1000,
+  async (DATA_IDS) => {
+    await ElMessageBox.confirm("确定要删除吗？", { type: "warning" });
+    await setPathPlanningDelete({ DATA_IDS });
+    ElMessage.success("删除成功");
+    fnResetPagination();
+  },
+  { atBegin: true }
+);
+const fnBatchDelete = debounce(
+  1000,
+  async () => {
+    const selectionData = tableRef.value.getSelectionRows();
+    if (selectionData.length === 0) {
+      ElMessage.warning("请选中要删除的项");
+      return;
+    }
+    await ElMessageBox.confirm("确定要删除选中的数据吗？", { type: "warning" });
+    const DATA_IDS = selectionData.map((item) => item.id).join(",");
+    await setPathPlanningDelete({ DATA_IDS });
+    ElMessage.success("删除成功");
+    fnResetPagination();
+  },
+  { atBegin: true }
+);
+const fnAdd = () => {
+  data.addDialogVisible = true;
+};
+</script>
+
+<style scoped lang="scss"></style>