diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }
diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue
index 9b2d7e5..0bda852 100644
--- a/src/views/dashboard/map/index.vue
+++ b/src/views/dashboard/map/index.vue
@@ -40,7 +40,8 @@
 const detailRef = ref()
 const detail = ref()
 const timer = ref()
-
+const publicPath = import.meta.env.BASE_URL
+console.log(publicPath, 'publicPath')
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -90,7 +91,7 @@
     // 绘制标记点
     for (let i = 0; i < deviceMarkerList.value.length; i++) {
       const alarmFlag = deviceList.value[i].alarmFlag ? 'alarm' : deviceList.value[i].deviceType
-      const content = `<img src="/icon/${alarmFlag}.png" class="img-map-marker">`
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
       const marker = new AMap.Marker({
         position: deviceMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         map: map.value,
@@ -110,6 +111,7 @@
           overlay: e.target,
           infoWindow: detail.value,
           info: deviceList.value[i],
+          flag: 'device',
         })
       })
       markerList.value.push(marker)
@@ -136,29 +138,45 @@
 }
 // 获取人员列表
 const fetchPersonList = (id: string) => {
-  // getPersonList(id).then((res) => {
-  //   console.log(res.data, '人员列表')
-  //   // 过滤整理数据
-  //   const data = res.data.filter((person: any) => person.lng && person.lat)
-  //   personList.value = data
-  //   personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
-  //   //  地图AMap参数
-  //   const AMap = AMap1.value
-  //   // 绘制标记点
-  //   for (let i = 0; i < personMarkerList.value.length; i++) {
-  //     const content = '<img src="/icon/person.png" class="img-map-marker">'
-  //     const marker = new AMap.Marker({
-  //       position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  //       map: map.value,
-  //       content,
-  //       offset: new AMap.Pixel(-10, -15),
-  //     })
-  //     markerList.value.push(marker)
-  //     map.value.add([marker])
-  //     // 自动适应显示想显示的范围区域
-  //     // map.value.setFitView()
-  //   }
-  // })
+  getPersonList(id).then((res) => {
+    // 过滤整理数据
+    const data = res.data.filter((person: any) => person.lng && person.lat)
+    personList.value = data
+    personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
+    //  地图AMap参数
+    const AMap = AMap1.value
+    // 绘制标记点
+    for (let i = 0; i < personMarkerList.value.length; i++) {
+      const alarmFlag = personMarkerList.value[i].alarmFlag ? 'alarm' : 'person'
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
+      const marker = new AMap.Marker({
+        position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        map: map.value,
+        content,
+        offset: new AMap.Pixel(-10, -10),
+      })
+      detail.value = new AMap.InfoWindow({
+        isCustom: true, // 自定义信息窗体
+        content: detailRef.value.$el, // 窗体内容(vue组件)
+        offset: new AMap.Pixel(9, -5), // 偏移
+      })
+      marker.on('click', (e) => {
+        // 打开信息窗口
+        detail.value.open(map.value, e.lnglat)
+        // 初始化信息窗口
+        detailRef.value.initDialog({
+          overlay: e.target,
+          infoWindow: detail.value,
+          info: personList.value[i],
+          flag: 'person',
+        })
+      })
+      markerList.value.push(marker)
+      map.value.add([marker])
+      // 自动适应显示想显示的范围区域
+      // map.value.setFitView()
+    }
+  })
 }
 // 开启定时器
 const openTimer = () => {
@@ -173,7 +191,7 @@
         }
       })
     }
-  }, 1000)
+  }, 1000 * 60)
 }
 // 获取报警列表
 const fetchAlarmList = (id: string) => {
@@ -231,7 +249,7 @@
   <div class="container">
     <!-- 地图 -->
     <div id="map" v-loading="loading" />
-    <!-- 现场列表下拉 -->
+    <!-- 报警列表下拉 -->
     <div class="collapse">
       <el-collapse v-model="activeNames">
         <el-collapse-item ref="alarmListRef" title="设备告警" :class="{ alarm: alarmList.length ? true : false }" name="2">
@@ -252,6 +270,11 @@
             </div>
           </div>
         </el-collapse-item>
+      </el-collapse>
+    </div>
+    <!-- 现场列表 -->
+    <div class="collapse1">
+      <el-collapse v-model="activeNames">
         <el-collapse-item title="作业现场列表" name="1">
           <div v-if="!sceneList.length" class="message-content" style="text-align: center;">
             暂无数据
@@ -299,7 +322,7 @@
     padding: 5px 0;
 
     .alarm-item {
-      width: 30%;
+      width: 33%;
       border: 2px solid #3969b9;
       margin-top: 5px;
       margin-left: 8px;
@@ -335,8 +358,14 @@
     right: 5px;
   }
 
+  .collapse1 {
+    position: absolute;
+    top: 15px;
+    left: 0;
+  }
+
   :deep(.el-collapse-item__wrap) {
-    background-color: rgba($color: #fff, $alpha: 50%);
+    background-color: rgba($color: #fff, $alpha: 100%);
   }
 
   :deep(.el-collapse-item) {
@@ -348,7 +377,7 @@
     font-weight: 700;
     text-align: center !important;
     // padding-left: 70px;
-    background-color: transparent;
+    // background-color: transparent;
   }
 
   :deep(.el-collapse-item__content) {
@@ -379,6 +408,10 @@
       font-size: 12px;
       color: #888;
     }
+
+    .message {
+      font-weight: 700;
+    }
   }
 }
 

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }
diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue
index 9b2d7e5..0bda852 100644
--- a/src/views/dashboard/map/index.vue
+++ b/src/views/dashboard/map/index.vue
@@ -40,7 +40,8 @@
 const detailRef = ref()
 const detail = ref()
 const timer = ref()
-
+const publicPath = import.meta.env.BASE_URL
+console.log(publicPath, 'publicPath')
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -90,7 +91,7 @@
     // 绘制标记点
     for (let i = 0; i < deviceMarkerList.value.length; i++) {
       const alarmFlag = deviceList.value[i].alarmFlag ? 'alarm' : deviceList.value[i].deviceType
-      const content = `<img src="/icon/${alarmFlag}.png" class="img-map-marker">`
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
       const marker = new AMap.Marker({
         position: deviceMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         map: map.value,
@@ -110,6 +111,7 @@
           overlay: e.target,
           infoWindow: detail.value,
           info: deviceList.value[i],
+          flag: 'device',
         })
       })
       markerList.value.push(marker)
@@ -136,29 +138,45 @@
 }
 // 获取人员列表
 const fetchPersonList = (id: string) => {
-  // getPersonList(id).then((res) => {
-  //   console.log(res.data, '人员列表')
-  //   // 过滤整理数据
-  //   const data = res.data.filter((person: any) => person.lng && person.lat)
-  //   personList.value = data
-  //   personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
-  //   //  地图AMap参数
-  //   const AMap = AMap1.value
-  //   // 绘制标记点
-  //   for (let i = 0; i < personMarkerList.value.length; i++) {
-  //     const content = '<img src="/icon/person.png" class="img-map-marker">'
-  //     const marker = new AMap.Marker({
-  //       position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  //       map: map.value,
-  //       content,
-  //       offset: new AMap.Pixel(-10, -15),
-  //     })
-  //     markerList.value.push(marker)
-  //     map.value.add([marker])
-  //     // 自动适应显示想显示的范围区域
-  //     // map.value.setFitView()
-  //   }
-  // })
+  getPersonList(id).then((res) => {
+    // 过滤整理数据
+    const data = res.data.filter((person: any) => person.lng && person.lat)
+    personList.value = data
+    personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
+    //  地图AMap参数
+    const AMap = AMap1.value
+    // 绘制标记点
+    for (let i = 0; i < personMarkerList.value.length; i++) {
+      const alarmFlag = personMarkerList.value[i].alarmFlag ? 'alarm' : 'person'
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
+      const marker = new AMap.Marker({
+        position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        map: map.value,
+        content,
+        offset: new AMap.Pixel(-10, -10),
+      })
+      detail.value = new AMap.InfoWindow({
+        isCustom: true, // 自定义信息窗体
+        content: detailRef.value.$el, // 窗体内容(vue组件)
+        offset: new AMap.Pixel(9, -5), // 偏移
+      })
+      marker.on('click', (e) => {
+        // 打开信息窗口
+        detail.value.open(map.value, e.lnglat)
+        // 初始化信息窗口
+        detailRef.value.initDialog({
+          overlay: e.target,
+          infoWindow: detail.value,
+          info: personList.value[i],
+          flag: 'person',
+        })
+      })
+      markerList.value.push(marker)
+      map.value.add([marker])
+      // 自动适应显示想显示的范围区域
+      // map.value.setFitView()
+    }
+  })
 }
 // 开启定时器
 const openTimer = () => {
@@ -173,7 +191,7 @@
         }
       })
     }
-  }, 1000)
+  }, 1000 * 60)
 }
 // 获取报警列表
 const fetchAlarmList = (id: string) => {
@@ -231,7 +249,7 @@
   <div class="container">
     <!-- 地图 -->
     <div id="map" v-loading="loading" />
-    <!-- 现场列表下拉 -->
+    <!-- 报警列表下拉 -->
     <div class="collapse">
       <el-collapse v-model="activeNames">
         <el-collapse-item ref="alarmListRef" title="设备告警" :class="{ alarm: alarmList.length ? true : false }" name="2">
@@ -252,6 +270,11 @@
             </div>
           </div>
         </el-collapse-item>
+      </el-collapse>
+    </div>
+    <!-- 现场列表 -->
+    <div class="collapse1">
+      <el-collapse v-model="activeNames">
         <el-collapse-item title="作业现场列表" name="1">
           <div v-if="!sceneList.length" class="message-content" style="text-align: center;">
             暂无数据
@@ -299,7 +322,7 @@
     padding: 5px 0;
 
     .alarm-item {
-      width: 30%;
+      width: 33%;
       border: 2px solid #3969b9;
       margin-top: 5px;
       margin-left: 8px;
@@ -335,8 +358,14 @@
     right: 5px;
   }
 
+  .collapse1 {
+    position: absolute;
+    top: 15px;
+    left: 0;
+  }
+
   :deep(.el-collapse-item__wrap) {
-    background-color: rgba($color: #fff, $alpha: 50%);
+    background-color: rgba($color: #fff, $alpha: 100%);
   }
 
   :deep(.el-collapse-item) {
@@ -348,7 +377,7 @@
     font-weight: 700;
     text-align: center !important;
     // padding-left: 70px;
-    background-color: transparent;
+    // background-color: transparent;
   }
 
   :deep(.el-collapse-item__content) {
@@ -379,6 +408,10 @@
       font-size: 12px;
       color: #888;
     }
+
+    .message {
+      font-weight: 700;
+    }
   }
 }
 
diff --git a/src/views/dashboard/video.ts b/src/views/dashboard/video.ts
new file mode 100644
index 0000000..fc8952a
--- /dev/null
+++ b/src/views/dashboard/video.ts
@@ -0,0 +1,9 @@
+// 现场智能管控平台地址和key
+export const urlAndKey = {
+  url: 'https://jls.huaweisoft.com',
+  appKey: 'fe80b2f021644b1b8c77fda743a83670',
+  secretKey: '8771ea6e931d4db646a26f67bcb89909',
+}
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }
diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue
index 9b2d7e5..0bda852 100644
--- a/src/views/dashboard/map/index.vue
+++ b/src/views/dashboard/map/index.vue
@@ -40,7 +40,8 @@
 const detailRef = ref()
 const detail = ref()
 const timer = ref()
-
+const publicPath = import.meta.env.BASE_URL
+console.log(publicPath, 'publicPath')
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -90,7 +91,7 @@
     // 绘制标记点
     for (let i = 0; i < deviceMarkerList.value.length; i++) {
       const alarmFlag = deviceList.value[i].alarmFlag ? 'alarm' : deviceList.value[i].deviceType
-      const content = `<img src="/icon/${alarmFlag}.png" class="img-map-marker">`
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
       const marker = new AMap.Marker({
         position: deviceMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         map: map.value,
@@ -110,6 +111,7 @@
           overlay: e.target,
           infoWindow: detail.value,
           info: deviceList.value[i],
+          flag: 'device',
         })
       })
       markerList.value.push(marker)
@@ -136,29 +138,45 @@
 }
 // 获取人员列表
 const fetchPersonList = (id: string) => {
-  // getPersonList(id).then((res) => {
-  //   console.log(res.data, '人员列表')
-  //   // 过滤整理数据
-  //   const data = res.data.filter((person: any) => person.lng && person.lat)
-  //   personList.value = data
-  //   personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
-  //   //  地图AMap参数
-  //   const AMap = AMap1.value
-  //   // 绘制标记点
-  //   for (let i = 0; i < personMarkerList.value.length; i++) {
-  //     const content = '<img src="/icon/person.png" class="img-map-marker">'
-  //     const marker = new AMap.Marker({
-  //       position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  //       map: map.value,
-  //       content,
-  //       offset: new AMap.Pixel(-10, -15),
-  //     })
-  //     markerList.value.push(marker)
-  //     map.value.add([marker])
-  //     // 自动适应显示想显示的范围区域
-  //     // map.value.setFitView()
-  //   }
-  // })
+  getPersonList(id).then((res) => {
+    // 过滤整理数据
+    const data = res.data.filter((person: any) => person.lng && person.lat)
+    personList.value = data
+    personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
+    //  地图AMap参数
+    const AMap = AMap1.value
+    // 绘制标记点
+    for (let i = 0; i < personMarkerList.value.length; i++) {
+      const alarmFlag = personMarkerList.value[i].alarmFlag ? 'alarm' : 'person'
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
+      const marker = new AMap.Marker({
+        position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        map: map.value,
+        content,
+        offset: new AMap.Pixel(-10, -10),
+      })
+      detail.value = new AMap.InfoWindow({
+        isCustom: true, // 自定义信息窗体
+        content: detailRef.value.$el, // 窗体内容(vue组件)
+        offset: new AMap.Pixel(9, -5), // 偏移
+      })
+      marker.on('click', (e) => {
+        // 打开信息窗口
+        detail.value.open(map.value, e.lnglat)
+        // 初始化信息窗口
+        detailRef.value.initDialog({
+          overlay: e.target,
+          infoWindow: detail.value,
+          info: personList.value[i],
+          flag: 'person',
+        })
+      })
+      markerList.value.push(marker)
+      map.value.add([marker])
+      // 自动适应显示想显示的范围区域
+      // map.value.setFitView()
+    }
+  })
 }
 // 开启定时器
 const openTimer = () => {
@@ -173,7 +191,7 @@
         }
       })
     }
-  }, 1000)
+  }, 1000 * 60)
 }
 // 获取报警列表
 const fetchAlarmList = (id: string) => {
@@ -231,7 +249,7 @@
   <div class="container">
     <!-- 地图 -->
     <div id="map" v-loading="loading" />
-    <!-- 现场列表下拉 -->
+    <!-- 报警列表下拉 -->
     <div class="collapse">
       <el-collapse v-model="activeNames">
         <el-collapse-item ref="alarmListRef" title="设备告警" :class="{ alarm: alarmList.length ? true : false }" name="2">
@@ -252,6 +270,11 @@
             </div>
           </div>
         </el-collapse-item>
+      </el-collapse>
+    </div>
+    <!-- 现场列表 -->
+    <div class="collapse1">
+      <el-collapse v-model="activeNames">
         <el-collapse-item title="作业现场列表" name="1">
           <div v-if="!sceneList.length" class="message-content" style="text-align: center;">
             暂无数据
@@ -299,7 +322,7 @@
     padding: 5px 0;
 
     .alarm-item {
-      width: 30%;
+      width: 33%;
       border: 2px solid #3969b9;
       margin-top: 5px;
       margin-left: 8px;
@@ -335,8 +358,14 @@
     right: 5px;
   }
 
+  .collapse1 {
+    position: absolute;
+    top: 15px;
+    left: 0;
+  }
+
   :deep(.el-collapse-item__wrap) {
-    background-color: rgba($color: #fff, $alpha: 50%);
+    background-color: rgba($color: #fff, $alpha: 100%);
   }
 
   :deep(.el-collapse-item) {
@@ -348,7 +377,7 @@
     font-weight: 700;
     text-align: center !important;
     // padding-left: 70px;
-    background-color: transparent;
+    // background-color: transparent;
   }
 
   :deep(.el-collapse-item__content) {
@@ -379,6 +408,10 @@
       font-size: 12px;
       color: #888;
     }
+
+    .message {
+      font-weight: 700;
+    }
   }
 }
 
diff --git a/src/views/dashboard/video.ts b/src/views/dashboard/video.ts
new file mode 100644
index 0000000..fc8952a
--- /dev/null
+++ b/src/views/dashboard/video.ts
@@ -0,0 +1,9 @@
+// 现场智能管控平台地址和key
+export const urlAndKey = {
+  url: 'https://jls.huaweisoft.com',
+  appKey: 'fe80b2f021644b1b8c77fda743a83670',
+  secretKey: '8771ea6e931d4db646a26f67bcb89909',
+}
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 9205bc0..7562ba6 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -12,4 +12,5 @@
   gasCode?: string // 激甲编号
   gasIp?: string // 激甲ip
   gasPort?: string // 激甲端口
+  hatLiningCode?: string
 }

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }
diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue
index 9b2d7e5..0bda852 100644
--- a/src/views/dashboard/map/index.vue
+++ b/src/views/dashboard/map/index.vue
@@ -40,7 +40,8 @@
 const detailRef = ref()
 const detail = ref()
 const timer = ref()
-
+const publicPath = import.meta.env.BASE_URL
+console.log(publicPath, 'publicPath')
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -90,7 +91,7 @@
     // 绘制标记点
     for (let i = 0; i < deviceMarkerList.value.length; i++) {
       const alarmFlag = deviceList.value[i].alarmFlag ? 'alarm' : deviceList.value[i].deviceType
-      const content = `<img src="/icon/${alarmFlag}.png" class="img-map-marker">`
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
       const marker = new AMap.Marker({
         position: deviceMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         map: map.value,
@@ -110,6 +111,7 @@
           overlay: e.target,
           infoWindow: detail.value,
           info: deviceList.value[i],
+          flag: 'device',
         })
       })
       markerList.value.push(marker)
@@ -136,29 +138,45 @@
 }
 // 获取人员列表
 const fetchPersonList = (id: string) => {
-  // getPersonList(id).then((res) => {
-  //   console.log(res.data, '人员列表')
-  //   // 过滤整理数据
-  //   const data = res.data.filter((person: any) => person.lng && person.lat)
-  //   personList.value = data
-  //   personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
-  //   //  地图AMap参数
-  //   const AMap = AMap1.value
-  //   // 绘制标记点
-  //   for (let i = 0; i < personMarkerList.value.length; i++) {
-  //     const content = '<img src="/icon/person.png" class="img-map-marker">'
-  //     const marker = new AMap.Marker({
-  //       position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  //       map: map.value,
-  //       content,
-  //       offset: new AMap.Pixel(-10, -15),
-  //     })
-  //     markerList.value.push(marker)
-  //     map.value.add([marker])
-  //     // 自动适应显示想显示的范围区域
-  //     // map.value.setFitView()
-  //   }
-  // })
+  getPersonList(id).then((res) => {
+    // 过滤整理数据
+    const data = res.data.filter((person: any) => person.lng && person.lat)
+    personList.value = data
+    personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
+    //  地图AMap参数
+    const AMap = AMap1.value
+    // 绘制标记点
+    for (let i = 0; i < personMarkerList.value.length; i++) {
+      const alarmFlag = personMarkerList.value[i].alarmFlag ? 'alarm' : 'person'
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
+      const marker = new AMap.Marker({
+        position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        map: map.value,
+        content,
+        offset: new AMap.Pixel(-10, -10),
+      })
+      detail.value = new AMap.InfoWindow({
+        isCustom: true, // 自定义信息窗体
+        content: detailRef.value.$el, // 窗体内容(vue组件)
+        offset: new AMap.Pixel(9, -5), // 偏移
+      })
+      marker.on('click', (e) => {
+        // 打开信息窗口
+        detail.value.open(map.value, e.lnglat)
+        // 初始化信息窗口
+        detailRef.value.initDialog({
+          overlay: e.target,
+          infoWindow: detail.value,
+          info: personList.value[i],
+          flag: 'person',
+        })
+      })
+      markerList.value.push(marker)
+      map.value.add([marker])
+      // 自动适应显示想显示的范围区域
+      // map.value.setFitView()
+    }
+  })
 }
 // 开启定时器
 const openTimer = () => {
@@ -173,7 +191,7 @@
         }
       })
     }
-  }, 1000)
+  }, 1000 * 60)
 }
 // 获取报警列表
 const fetchAlarmList = (id: string) => {
@@ -231,7 +249,7 @@
   <div class="container">
     <!-- 地图 -->
     <div id="map" v-loading="loading" />
-    <!-- 现场列表下拉 -->
+    <!-- 报警列表下拉 -->
     <div class="collapse">
       <el-collapse v-model="activeNames">
         <el-collapse-item ref="alarmListRef" title="设备告警" :class="{ alarm: alarmList.length ? true : false }" name="2">
@@ -252,6 +270,11 @@
             </div>
           </div>
         </el-collapse-item>
+      </el-collapse>
+    </div>
+    <!-- 现场列表 -->
+    <div class="collapse1">
+      <el-collapse v-model="activeNames">
         <el-collapse-item title="作业现场列表" name="1">
           <div v-if="!sceneList.length" class="message-content" style="text-align: center;">
             暂无数据
@@ -299,7 +322,7 @@
     padding: 5px 0;
 
     .alarm-item {
-      width: 30%;
+      width: 33%;
       border: 2px solid #3969b9;
       margin-top: 5px;
       margin-left: 8px;
@@ -335,8 +358,14 @@
     right: 5px;
   }
 
+  .collapse1 {
+    position: absolute;
+    top: 15px;
+    left: 0;
+  }
+
   :deep(.el-collapse-item__wrap) {
-    background-color: rgba($color: #fff, $alpha: 50%);
+    background-color: rgba($color: #fff, $alpha: 100%);
   }
 
   :deep(.el-collapse-item) {
@@ -348,7 +377,7 @@
     font-weight: 700;
     text-align: center !important;
     // padding-left: 70px;
-    background-color: transparent;
+    // background-color: transparent;
   }
 
   :deep(.el-collapse-item__content) {
@@ -379,6 +408,10 @@
       font-size: 12px;
       color: #888;
     }
+
+    .message {
+      font-weight: 700;
+    }
   }
 }
 
diff --git a/src/views/dashboard/video.ts b/src/views/dashboard/video.ts
new file mode 100644
index 0000000..fc8952a
--- /dev/null
+++ b/src/views/dashboard/video.ts
@@ -0,0 +1,9 @@
+// 现场智能管控平台地址和key
+export const urlAndKey = {
+  url: 'https://jls.huaweisoft.com',
+  appKey: 'fe80b2f021644b1b8c77fda743a83670',
+  secretKey: '8771ea6e931d4db646a26f67bcb89909',
+}
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 9205bc0..7562ba6 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -12,4 +12,5 @@
   gasCode?: string // 激甲编号
   gasIp?: string // 激甲ip
   gasPort?: string // 激甲端口
+  hatLiningCode?: string
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 2f6e4af..3e3216b 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -29,6 +29,7 @@
   gasCode: '', // 激甲编号
   gasIp: '', // 激甲ip
   gasPort: '', // 激甲端口
+  hatLiningCode: '', // 只能帽衬编号
 
 }) // 表单
 const textMap: { [key: string]: string } = {
@@ -36,16 +37,35 @@
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 身份证号码验证规则
+const validateIP = (rule: any, value: any, callback: any) => {
+  const rr = /^((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const validatePort = (rule: any, value: any, callback: any) => {
+  if (Number(value) > 1 && Number(value) < 65535) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   deviceType: [{ required: true, message: '请选择设备类型', trigger: ['blur', 'change'] }],
   deviceCode: [{ required: true, message: '请输入设备编号', trigger: ['blur', 'change'] }],
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
-  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
-  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
-  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
-  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  cameraIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  hatLiningCode: [{ required: true, message: '请输入帽衬编号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -64,6 +84,7 @@
     gasCode: '', // 激甲编号
     gasIp: '', // 激甲ip
     gasPort: '', // 激甲端口
+    hatLiningCode: '', // 只能帽衬编号
   }
   // dataFormRef.value.clearValidate()
 }
@@ -214,7 +235,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-input v-model.trim="deviceForm.deviceCode" type="text" placeholder="必填" />
+            <el-input v-model.trim="deviceForm.deviceCode" :disabled="dialogStatus === 'update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -239,6 +260,11 @@
             <el-input v-model.trim="deviceForm.deviceBatch" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col v-if="deviceForm.deviceType === '2'" :span="12">
+          <el-form-item label="智能帽衬编号" prop="hatLiningCode">
+            <el-input v-model.trim="deviceForm.hatLiningCode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row v-if="isANQUANMAO" :gutter="20">
         <el-col :span="12">

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }
diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue
index 9b2d7e5..0bda852 100644
--- a/src/views/dashboard/map/index.vue
+++ b/src/views/dashboard/map/index.vue
@@ -40,7 +40,8 @@
 const detailRef = ref()
 const detail = ref()
 const timer = ref()
-
+const publicPath = import.meta.env.BASE_URL
+console.log(publicPath, 'publicPath')
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -90,7 +91,7 @@
     // 绘制标记点
     for (let i = 0; i < deviceMarkerList.value.length; i++) {
       const alarmFlag = deviceList.value[i].alarmFlag ? 'alarm' : deviceList.value[i].deviceType
-      const content = `<img src="/icon/${alarmFlag}.png" class="img-map-marker">`
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
       const marker = new AMap.Marker({
         position: deviceMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         map: map.value,
@@ -110,6 +111,7 @@
           overlay: e.target,
           infoWindow: detail.value,
           info: deviceList.value[i],
+          flag: 'device',
         })
       })
       markerList.value.push(marker)
@@ -136,29 +138,45 @@
 }
 // 获取人员列表
 const fetchPersonList = (id: string) => {
-  // getPersonList(id).then((res) => {
-  //   console.log(res.data, '人员列表')
-  //   // 过滤整理数据
-  //   const data = res.data.filter((person: any) => person.lng && person.lat)
-  //   personList.value = data
-  //   personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
-  //   //  地图AMap参数
-  //   const AMap = AMap1.value
-  //   // 绘制标记点
-  //   for (let i = 0; i < personMarkerList.value.length; i++) {
-  //     const content = '<img src="/icon/person.png" class="img-map-marker">'
-  //     const marker = new AMap.Marker({
-  //       position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  //       map: map.value,
-  //       content,
-  //       offset: new AMap.Pixel(-10, -15),
-  //     })
-  //     markerList.value.push(marker)
-  //     map.value.add([marker])
-  //     // 自动适应显示想显示的范围区域
-  //     // map.value.setFitView()
-  //   }
-  // })
+  getPersonList(id).then((res) => {
+    // 过滤整理数据
+    const data = res.data.filter((person: any) => person.lng && person.lat)
+    personList.value = data
+    personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
+    //  地图AMap参数
+    const AMap = AMap1.value
+    // 绘制标记点
+    for (let i = 0; i < personMarkerList.value.length; i++) {
+      const alarmFlag = personMarkerList.value[i].alarmFlag ? 'alarm' : 'person'
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
+      const marker = new AMap.Marker({
+        position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        map: map.value,
+        content,
+        offset: new AMap.Pixel(-10, -10),
+      })
+      detail.value = new AMap.InfoWindow({
+        isCustom: true, // 自定义信息窗体
+        content: detailRef.value.$el, // 窗体内容(vue组件)
+        offset: new AMap.Pixel(9, -5), // 偏移
+      })
+      marker.on('click', (e) => {
+        // 打开信息窗口
+        detail.value.open(map.value, e.lnglat)
+        // 初始化信息窗口
+        detailRef.value.initDialog({
+          overlay: e.target,
+          infoWindow: detail.value,
+          info: personList.value[i],
+          flag: 'person',
+        })
+      })
+      markerList.value.push(marker)
+      map.value.add([marker])
+      // 自动适应显示想显示的范围区域
+      // map.value.setFitView()
+    }
+  })
 }
 // 开启定时器
 const openTimer = () => {
@@ -173,7 +191,7 @@
         }
       })
     }
-  }, 1000)
+  }, 1000 * 60)
 }
 // 获取报警列表
 const fetchAlarmList = (id: string) => {
@@ -231,7 +249,7 @@
   <div class="container">
     <!-- 地图 -->
     <div id="map" v-loading="loading" />
-    <!-- 现场列表下拉 -->
+    <!-- 报警列表下拉 -->
     <div class="collapse">
       <el-collapse v-model="activeNames">
         <el-collapse-item ref="alarmListRef" title="设备告警" :class="{ alarm: alarmList.length ? true : false }" name="2">
@@ -252,6 +270,11 @@
             </div>
           </div>
         </el-collapse-item>
+      </el-collapse>
+    </div>
+    <!-- 现场列表 -->
+    <div class="collapse1">
+      <el-collapse v-model="activeNames">
         <el-collapse-item title="作业现场列表" name="1">
           <div v-if="!sceneList.length" class="message-content" style="text-align: center;">
             暂无数据
@@ -299,7 +322,7 @@
     padding: 5px 0;
 
     .alarm-item {
-      width: 30%;
+      width: 33%;
       border: 2px solid #3969b9;
       margin-top: 5px;
       margin-left: 8px;
@@ -335,8 +358,14 @@
     right: 5px;
   }
 
+  .collapse1 {
+    position: absolute;
+    top: 15px;
+    left: 0;
+  }
+
   :deep(.el-collapse-item__wrap) {
-    background-color: rgba($color: #fff, $alpha: 50%);
+    background-color: rgba($color: #fff, $alpha: 100%);
   }
 
   :deep(.el-collapse-item) {
@@ -348,7 +377,7 @@
     font-weight: 700;
     text-align: center !important;
     // padding-left: 70px;
-    background-color: transparent;
+    // background-color: transparent;
   }
 
   :deep(.el-collapse-item__content) {
@@ -379,6 +408,10 @@
       font-size: 12px;
       color: #888;
     }
+
+    .message {
+      font-weight: 700;
+    }
   }
 }
 
diff --git a/src/views/dashboard/video.ts b/src/views/dashboard/video.ts
new file mode 100644
index 0000000..fc8952a
--- /dev/null
+++ b/src/views/dashboard/video.ts
@@ -0,0 +1,9 @@
+// 现场智能管控平台地址和key
+export const urlAndKey = {
+  url: 'https://jls.huaweisoft.com',
+  appKey: 'fe80b2f021644b1b8c77fda743a83670',
+  secretKey: '8771ea6e931d4db646a26f67bcb89909',
+}
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 9205bc0..7562ba6 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -12,4 +12,5 @@
   gasCode?: string // 激甲编号
   gasIp?: string // 激甲ip
   gasPort?: string // 激甲端口
+  hatLiningCode?: string
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 2f6e4af..3e3216b 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -29,6 +29,7 @@
   gasCode: '', // 激甲编号
   gasIp: '', // 激甲ip
   gasPort: '', // 激甲端口
+  hatLiningCode: '', // 只能帽衬编号
 
 }) // 表单
 const textMap: { [key: string]: string } = {
@@ -36,16 +37,35 @@
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 身份证号码验证规则
+const validateIP = (rule: any, value: any, callback: any) => {
+  const rr = /^((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const validatePort = (rule: any, value: any, callback: any) => {
+  if (Number(value) > 1 && Number(value) < 65535) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   deviceType: [{ required: true, message: '请选择设备类型', trigger: ['blur', 'change'] }],
   deviceCode: [{ required: true, message: '请输入设备编号', trigger: ['blur', 'change'] }],
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
-  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
-  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
-  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
-  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  cameraIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  hatLiningCode: [{ required: true, message: '请输入帽衬编号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -64,6 +84,7 @@
     gasCode: '', // 激甲编号
     gasIp: '', // 激甲ip
     gasPort: '', // 激甲端口
+    hatLiningCode: '', // 只能帽衬编号
   }
   // dataFormRef.value.clearValidate()
 }
@@ -214,7 +235,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-input v-model.trim="deviceForm.deviceCode" type="text" placeholder="必填" />
+            <el-input v-model.trim="deviceForm.deviceCode" :disabled="dialogStatus === 'update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -239,6 +260,11 @@
             <el-input v-model.trim="deviceForm.deviceBatch" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col v-if="deviceForm.deviceType === '2'" :span="12">
+          <el-form-item label="智能帽衬编号" prop="hatLiningCode">
+            <el-input v-model.trim="deviceForm.hatLiningCode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row v-if="isANQUANMAO" :gutter="20">
         <el-col :span="12">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 55f30e6..a5a439c 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -119,14 +119,20 @@
       type: 'info',
     }).then((res) => {
       // 点击确认
-      const ids = selectList.value.map(item => item.id)
-      delDevice(ids).then((res) => {
-        if (res.code === 200) {
-          selectList.value = []
-          ElMessage.success('删除成功')
-          fetchData()
-        }
-      })
+      // 判断所选设备状态
+      if (selectList.value.every(item => item.status === '0')) {
+        const ids = selectList.value.map(item => item.id)
+        delDevice(ids).then((res) => {
+          if (res.code === 200) {
+            selectList.value = []
+            ElMessage.success('删除成功')
+            fetchData()
+          }
+        })
+      }
+      else {
+        ElMessage.warning('所选设备正在使用中，请先解绑')
+      }
     }).catch(() => {
       // 点击取消
       selectList.value = []

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }
diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue
index 9b2d7e5..0bda852 100644
--- a/src/views/dashboard/map/index.vue
+++ b/src/views/dashboard/map/index.vue
@@ -40,7 +40,8 @@
 const detailRef = ref()
 const detail = ref()
 const timer = ref()
-
+const publicPath = import.meta.env.BASE_URL
+console.log(publicPath, 'publicPath')
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -90,7 +91,7 @@
     // 绘制标记点
     for (let i = 0; i < deviceMarkerList.value.length; i++) {
       const alarmFlag = deviceList.value[i].alarmFlag ? 'alarm' : deviceList.value[i].deviceType
-      const content = `<img src="/icon/${alarmFlag}.png" class="img-map-marker">`
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
       const marker = new AMap.Marker({
         position: deviceMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         map: map.value,
@@ -110,6 +111,7 @@
           overlay: e.target,
           infoWindow: detail.value,
           info: deviceList.value[i],
+          flag: 'device',
         })
       })
       markerList.value.push(marker)
@@ -136,29 +138,45 @@
 }
 // 获取人员列表
 const fetchPersonList = (id: string) => {
-  // getPersonList(id).then((res) => {
-  //   console.log(res.data, '人员列表')
-  //   // 过滤整理数据
-  //   const data = res.data.filter((person: any) => person.lng && person.lat)
-  //   personList.value = data
-  //   personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
-  //   //  地图AMap参数
-  //   const AMap = AMap1.value
-  //   // 绘制标记点
-  //   for (let i = 0; i < personMarkerList.value.length; i++) {
-  //     const content = '<img src="/icon/person.png" class="img-map-marker">'
-  //     const marker = new AMap.Marker({
-  //       position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  //       map: map.value,
-  //       content,
-  //       offset: new AMap.Pixel(-10, -15),
-  //     })
-  //     markerList.value.push(marker)
-  //     map.value.add([marker])
-  //     // 自动适应显示想显示的范围区域
-  //     // map.value.setFitView()
-  //   }
-  // })
+  getPersonList(id).then((res) => {
+    // 过滤整理数据
+    const data = res.data.filter((person: any) => person.lng && person.lat)
+    personList.value = data
+    personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
+    //  地图AMap参数
+    const AMap = AMap1.value
+    // 绘制标记点
+    for (let i = 0; i < personMarkerList.value.length; i++) {
+      const alarmFlag = personMarkerList.value[i].alarmFlag ? 'alarm' : 'person'
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
+      const marker = new AMap.Marker({
+        position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        map: map.value,
+        content,
+        offset: new AMap.Pixel(-10, -10),
+      })
+      detail.value = new AMap.InfoWindow({
+        isCustom: true, // 自定义信息窗体
+        content: detailRef.value.$el, // 窗体内容(vue组件)
+        offset: new AMap.Pixel(9, -5), // 偏移
+      })
+      marker.on('click', (e) => {
+        // 打开信息窗口
+        detail.value.open(map.value, e.lnglat)
+        // 初始化信息窗口
+        detailRef.value.initDialog({
+          overlay: e.target,
+          infoWindow: detail.value,
+          info: personList.value[i],
+          flag: 'person',
+        })
+      })
+      markerList.value.push(marker)
+      map.value.add([marker])
+      // 自动适应显示想显示的范围区域
+      // map.value.setFitView()
+    }
+  })
 }
 // 开启定时器
 const openTimer = () => {
@@ -173,7 +191,7 @@
         }
       })
     }
-  }, 1000)
+  }, 1000 * 60)
 }
 // 获取报警列表
 const fetchAlarmList = (id: string) => {
@@ -231,7 +249,7 @@
   <div class="container">
     <!-- 地图 -->
     <div id="map" v-loading="loading" />
-    <!-- 现场列表下拉 -->
+    <!-- 报警列表下拉 -->
     <div class="collapse">
       <el-collapse v-model="activeNames">
         <el-collapse-item ref="alarmListRef" title="设备告警" :class="{ alarm: alarmList.length ? true : false }" name="2">
@@ -252,6 +270,11 @@
             </div>
           </div>
         </el-collapse-item>
+      </el-collapse>
+    </div>
+    <!-- 现场列表 -->
+    <div class="collapse1">
+      <el-collapse v-model="activeNames">
         <el-collapse-item title="作业现场列表" name="1">
           <div v-if="!sceneList.length" class="message-content" style="text-align: center;">
             暂无数据
@@ -299,7 +322,7 @@
     padding: 5px 0;
 
     .alarm-item {
-      width: 30%;
+      width: 33%;
       border: 2px solid #3969b9;
       margin-top: 5px;
       margin-left: 8px;
@@ -335,8 +358,14 @@
     right: 5px;
   }
 
+  .collapse1 {
+    position: absolute;
+    top: 15px;
+    left: 0;
+  }
+
   :deep(.el-collapse-item__wrap) {
-    background-color: rgba($color: #fff, $alpha: 50%);
+    background-color: rgba($color: #fff, $alpha: 100%);
   }
 
   :deep(.el-collapse-item) {
@@ -348,7 +377,7 @@
     font-weight: 700;
     text-align: center !important;
     // padding-left: 70px;
-    background-color: transparent;
+    // background-color: transparent;
   }
 
   :deep(.el-collapse-item__content) {
@@ -379,6 +408,10 @@
       font-size: 12px;
       color: #888;
     }
+
+    .message {
+      font-weight: 700;
+    }
   }
 }
 
diff --git a/src/views/dashboard/video.ts b/src/views/dashboard/video.ts
new file mode 100644
index 0000000..fc8952a
--- /dev/null
+++ b/src/views/dashboard/video.ts
@@ -0,0 +1,9 @@
+// 现场智能管控平台地址和key
+export const urlAndKey = {
+  url: 'https://jls.huaweisoft.com',
+  appKey: 'fe80b2f021644b1b8c77fda743a83670',
+  secretKey: '8771ea6e931d4db646a26f67bcb89909',
+}
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 9205bc0..7562ba6 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -12,4 +12,5 @@
   gasCode?: string // 激甲编号
   gasIp?: string // 激甲ip
   gasPort?: string // 激甲端口
+  hatLiningCode?: string
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 2f6e4af..3e3216b 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -29,6 +29,7 @@
   gasCode: '', // 激甲编号
   gasIp: '', // 激甲ip
   gasPort: '', // 激甲端口
+  hatLiningCode: '', // 只能帽衬编号
 
 }) // 表单
 const textMap: { [key: string]: string } = {
@@ -36,16 +37,35 @@
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 身份证号码验证规则
+const validateIP = (rule: any, value: any, callback: any) => {
+  const rr = /^((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const validatePort = (rule: any, value: any, callback: any) => {
+  if (Number(value) > 1 && Number(value) < 65535) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   deviceType: [{ required: true, message: '请选择设备类型', trigger: ['blur', 'change'] }],
   deviceCode: [{ required: true, message: '请输入设备编号', trigger: ['blur', 'change'] }],
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
-  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
-  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
-  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
-  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  cameraIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  hatLiningCode: [{ required: true, message: '请输入帽衬编号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -64,6 +84,7 @@
     gasCode: '', // 激甲编号
     gasIp: '', // 激甲ip
     gasPort: '', // 激甲端口
+    hatLiningCode: '', // 只能帽衬编号
   }
   // dataFormRef.value.clearValidate()
 }
@@ -214,7 +235,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-input v-model.trim="deviceForm.deviceCode" type="text" placeholder="必填" />
+            <el-input v-model.trim="deviceForm.deviceCode" :disabled="dialogStatus === 'update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -239,6 +260,11 @@
             <el-input v-model.trim="deviceForm.deviceBatch" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col v-if="deviceForm.deviceType === '2'" :span="12">
+          <el-form-item label="智能帽衬编号" prop="hatLiningCode">
+            <el-input v-model.trim="deviceForm.hatLiningCode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row v-if="isANQUANMAO" :gutter="20">
         <el-col :span="12">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 55f30e6..a5a439c 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -119,14 +119,20 @@
       type: 'info',
     }).then((res) => {
       // 点击确认
-      const ids = selectList.value.map(item => item.id)
-      delDevice(ids).then((res) => {
-        if (res.code === 200) {
-          selectList.value = []
-          ElMessage.success('删除成功')
-          fetchData()
-        }
-      })
+      // 判断所选设备状态
+      if (selectList.value.every(item => item.status === '0')) {
+        const ids = selectList.value.map(item => item.id)
+        delDevice(ids).then((res) => {
+          if (res.code === 200) {
+            selectList.value = []
+            ElMessage.success('删除成功')
+            fetchData()
+          }
+        })
+      }
+      else {
+        ElMessage.warning('所选设备正在使用中，请先解绑')
+      }
     }).catch(() => {
       // 点击取消
       selectList.value = []
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 0c1ed5b..8f6b57b 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -19,6 +19,7 @@
   status: '',
   deptId: '',
   endDate: '',
+  workerType: '1',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -114,14 +115,19 @@
       type: 'info',
     }).then((res) => {
       // 点击确认
-      const ids = selectList.value.map(item => item.id)
-      delPerson(ids).then((res) => {
-        if (res.code === 200) {
-          selectList.value = []
-          ElMessage.success('删除成功')
-          fetchData()
-        }
-      })
+      if (selectList.value.every(item => item.status === '0')) {
+        const ids = selectList.value.map(item => item.id)
+        delPerson(ids).then((res) => {
+          if (res.code === 200) {
+            selectList.value = []
+            ElMessage.success('删除成功')
+            fetchData()
+          }
+        })
+      }
+      else {
+        ElMessage.warning('所选人员正在作业中，请先解绑')
+      }
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -199,7 +205,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/person/register')" label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
+                <el-button
+                  link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small"
+                  @click="register(scope.row)"
+                >
                   注册
                 </el-button>
               </template>

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }
diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue
index 9b2d7e5..0bda852 100644
--- a/src/views/dashboard/map/index.vue
+++ b/src/views/dashboard/map/index.vue
@@ -40,7 +40,8 @@
 const detailRef = ref()
 const detail = ref()
 const timer = ref()
-
+const publicPath = import.meta.env.BASE_URL
+console.log(publicPath, 'publicPath')
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -90,7 +91,7 @@
     // 绘制标记点
     for (let i = 0; i < deviceMarkerList.value.length; i++) {
       const alarmFlag = deviceList.value[i].alarmFlag ? 'alarm' : deviceList.value[i].deviceType
-      const content = `<img src="/icon/${alarmFlag}.png" class="img-map-marker">`
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
       const marker = new AMap.Marker({
         position: deviceMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         map: map.value,
@@ -110,6 +111,7 @@
           overlay: e.target,
           infoWindow: detail.value,
           info: deviceList.value[i],
+          flag: 'device',
         })
       })
       markerList.value.push(marker)
@@ -136,29 +138,45 @@
 }
 // 获取人员列表
 const fetchPersonList = (id: string) => {
-  // getPersonList(id).then((res) => {
-  //   console.log(res.data, '人员列表')
-  //   // 过滤整理数据
-  //   const data = res.data.filter((person: any) => person.lng && person.lat)
-  //   personList.value = data
-  //   personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
-  //   //  地图AMap参数
-  //   const AMap = AMap1.value
-  //   // 绘制标记点
-  //   for (let i = 0; i < personMarkerList.value.length; i++) {
-  //     const content = '<img src="/icon/person.png" class="img-map-marker">'
-  //     const marker = new AMap.Marker({
-  //       position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  //       map: map.value,
-  //       content,
-  //       offset: new AMap.Pixel(-10, -15),
-  //     })
-  //     markerList.value.push(marker)
-  //     map.value.add([marker])
-  //     // 自动适应显示想显示的范围区域
-  //     // map.value.setFitView()
-  //   }
-  // })
+  getPersonList(id).then((res) => {
+    // 过滤整理数据
+    const data = res.data.filter((person: any) => person.lng && person.lat)
+    personList.value = data
+    personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
+    //  地图AMap参数
+    const AMap = AMap1.value
+    // 绘制标记点
+    for (let i = 0; i < personMarkerList.value.length; i++) {
+      const alarmFlag = personMarkerList.value[i].alarmFlag ? 'alarm' : 'person'
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
+      const marker = new AMap.Marker({
+        position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        map: map.value,
+        content,
+        offset: new AMap.Pixel(-10, -10),
+      })
+      detail.value = new AMap.InfoWindow({
+        isCustom: true, // 自定义信息窗体
+        content: detailRef.value.$el, // 窗体内容(vue组件)
+        offset: new AMap.Pixel(9, -5), // 偏移
+      })
+      marker.on('click', (e) => {
+        // 打开信息窗口
+        detail.value.open(map.value, e.lnglat)
+        // 初始化信息窗口
+        detailRef.value.initDialog({
+          overlay: e.target,
+          infoWindow: detail.value,
+          info: personList.value[i],
+          flag: 'person',
+        })
+      })
+      markerList.value.push(marker)
+      map.value.add([marker])
+      // 自动适应显示想显示的范围区域
+      // map.value.setFitView()
+    }
+  })
 }
 // 开启定时器
 const openTimer = () => {
@@ -173,7 +191,7 @@
         }
       })
     }
-  }, 1000)
+  }, 1000 * 60)
 }
 // 获取报警列表
 const fetchAlarmList = (id: string) => {
@@ -231,7 +249,7 @@
   <div class="container">
     <!-- 地图 -->
     <div id="map" v-loading="loading" />
-    <!-- 现场列表下拉 -->
+    <!-- 报警列表下拉 -->
     <div class="collapse">
       <el-collapse v-model="activeNames">
         <el-collapse-item ref="alarmListRef" title="设备告警" :class="{ alarm: alarmList.length ? true : false }" name="2">
@@ -252,6 +270,11 @@
             </div>
           </div>
         </el-collapse-item>
+      </el-collapse>
+    </div>
+    <!-- 现场列表 -->
+    <div class="collapse1">
+      <el-collapse v-model="activeNames">
         <el-collapse-item title="作业现场列表" name="1">
           <div v-if="!sceneList.length" class="message-content" style="text-align: center;">
             暂无数据
@@ -299,7 +322,7 @@
     padding: 5px 0;
 
     .alarm-item {
-      width: 30%;
+      width: 33%;
       border: 2px solid #3969b9;
       margin-top: 5px;
       margin-left: 8px;
@@ -335,8 +358,14 @@
     right: 5px;
   }
 
+  .collapse1 {
+    position: absolute;
+    top: 15px;
+    left: 0;
+  }
+
   :deep(.el-collapse-item__wrap) {
-    background-color: rgba($color: #fff, $alpha: 50%);
+    background-color: rgba($color: #fff, $alpha: 100%);
   }
 
   :deep(.el-collapse-item) {
@@ -348,7 +377,7 @@
     font-weight: 700;
     text-align: center !important;
     // padding-left: 70px;
-    background-color: transparent;
+    // background-color: transparent;
   }
 
   :deep(.el-collapse-item__content) {
@@ -379,6 +408,10 @@
       font-size: 12px;
       color: #888;
     }
+
+    .message {
+      font-weight: 700;
+    }
   }
 }
 
diff --git a/src/views/dashboard/video.ts b/src/views/dashboard/video.ts
new file mode 100644
index 0000000..fc8952a
--- /dev/null
+++ b/src/views/dashboard/video.ts
@@ -0,0 +1,9 @@
+// 现场智能管控平台地址和key
+export const urlAndKey = {
+  url: 'https://jls.huaweisoft.com',
+  appKey: 'fe80b2f021644b1b8c77fda743a83670',
+  secretKey: '8771ea6e931d4db646a26f67bcb89909',
+}
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 9205bc0..7562ba6 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -12,4 +12,5 @@
   gasCode?: string // 激甲编号
   gasIp?: string // 激甲ip
   gasPort?: string // 激甲端口
+  hatLiningCode?: string
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 2f6e4af..3e3216b 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -29,6 +29,7 @@
   gasCode: '', // 激甲编号
   gasIp: '', // 激甲ip
   gasPort: '', // 激甲端口
+  hatLiningCode: '', // 只能帽衬编号
 
 }) // 表单
 const textMap: { [key: string]: string } = {
@@ -36,16 +37,35 @@
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 身份证号码验证规则
+const validateIP = (rule: any, value: any, callback: any) => {
+  const rr = /^((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const validatePort = (rule: any, value: any, callback: any) => {
+  if (Number(value) > 1 && Number(value) < 65535) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   deviceType: [{ required: true, message: '请选择设备类型', trigger: ['blur', 'change'] }],
   deviceCode: [{ required: true, message: '请输入设备编号', trigger: ['blur', 'change'] }],
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
-  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
-  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
-  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
-  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  cameraIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  hatLiningCode: [{ required: true, message: '请输入帽衬编号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -64,6 +84,7 @@
     gasCode: '', // 激甲编号
     gasIp: '', // 激甲ip
     gasPort: '', // 激甲端口
+    hatLiningCode: '', // 只能帽衬编号
   }
   // dataFormRef.value.clearValidate()
 }
@@ -214,7 +235,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-input v-model.trim="deviceForm.deviceCode" type="text" placeholder="必填" />
+            <el-input v-model.trim="deviceForm.deviceCode" :disabled="dialogStatus === 'update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -239,6 +260,11 @@
             <el-input v-model.trim="deviceForm.deviceBatch" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col v-if="deviceForm.deviceType === '2'" :span="12">
+          <el-form-item label="智能帽衬编号" prop="hatLiningCode">
+            <el-input v-model.trim="deviceForm.hatLiningCode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row v-if="isANQUANMAO" :gutter="20">
         <el-col :span="12">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 55f30e6..a5a439c 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -119,14 +119,20 @@
       type: 'info',
     }).then((res) => {
       // 点击确认
-      const ids = selectList.value.map(item => item.id)
-      delDevice(ids).then((res) => {
-        if (res.code === 200) {
-          selectList.value = []
-          ElMessage.success('删除成功')
-          fetchData()
-        }
-      })
+      // 判断所选设备状态
+      if (selectList.value.every(item => item.status === '0')) {
+        const ids = selectList.value.map(item => item.id)
+        delDevice(ids).then((res) => {
+          if (res.code === 200) {
+            selectList.value = []
+            ElMessage.success('删除成功')
+            fetchData()
+          }
+        })
+      }
+      else {
+        ElMessage.warning('所选设备正在使用中，请先解绑')
+      }
     }).catch(() => {
       // 点击取消
       selectList.value = []
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 0c1ed5b..8f6b57b 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -19,6 +19,7 @@
   status: '',
   deptId: '',
   endDate: '',
+  workerType: '1',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -114,14 +115,19 @@
       type: 'info',
     }).then((res) => {
       // 点击确认
-      const ids = selectList.value.map(item => item.id)
-      delPerson(ids).then((res) => {
-        if (res.code === 200) {
-          selectList.value = []
-          ElMessage.success('删除成功')
-          fetchData()
-        }
-      })
+      if (selectList.value.every(item => item.status === '0')) {
+        const ids = selectList.value.map(item => item.id)
+        delPerson(ids).then((res) => {
+          if (res.code === 200) {
+            selectList.value = []
+            ElMessage.success('删除成功')
+            fetchData()
+          }
+        })
+      }
+      else {
+        ElMessage.warning('所选人员正在作业中，请先解绑')
+      }
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -199,7 +205,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/person/register')" label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
+                <el-button
+                  link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small"
+                  @click="register(scope.row)"
+                >
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue
index 318c9ad..b4479db 100644
--- a/src/views/person/personEdit.vue
+++ b/src/views/person/personEdit.vue
@@ -39,12 +39,22 @@
     callback(new Error('验证失败'))
   }
 }
+// 手机号验证规则
+const validatePhone = (rule: any, value: any, callback: any) => {
+  const rr = /^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\d{8}$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules = ref({
-  workerName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
-  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
-  deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
-  phoneNumber: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  idCardNumber: [{ required: true, message: '身份证号码不符合规范', trigger: 'blur', validator: validateIDcard }],
+  workerName: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
+  gender: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '所属部门不能为空', trigger: ['blur', 'change'] }],
+  phoneNumber: [{ required: true, message: '联系方式不符合规范或为空', trigger: ['blur', 'change'], validator: validatePhone }],
+  idCardNumber: [{ required: true, message: '身份证号码不符合规范或为空', trigger: ['blur', 'change'], validator: validateIDcard }],
 }) // 表单验证规则
 
 // 图片上传请求
@@ -151,33 +161,39 @@
     <!-- 拍照组件 -->
     <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot" />
     <detail-page :title="title">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
-        stripe>
+      <el-form
+        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
+        stripe
+      >
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item>
-              <el-upload class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
-                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg">
+              <el-upload
+                class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg"
+              >
                 <img v-if="ruleForm.workerAvatar" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
               </el-upload>
-              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;"
-                @click="register">人脸注册</el-button>
+              <el-button
+                type="primary" style="margin-top: 20px; display: block; width: 190px;"
+                @click="register"
+              >
+                人脸注册
+              </el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="workerName" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名">
-              </el-input>
+              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名" />
             </el-form-item>
             <el-form-item label="所属部门" prop="deptId" class="marg-item" style="margin-top: 40px;">
               <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="职务" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'">
-              </el-input>
+              <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -187,15 +203,12 @@
               </el-select>
             </el-form-item>
             <el-form-item label="联系方式" prop="phoneNumber" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'">
-              </el-input>
+              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="证件号码" prop="idCardNumber" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'">
-              </el-input>
+              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
       <div class="dialog-footer">
@@ -237,9 +250,8 @@
 
 .isDetail {
   ::v-deep {
-
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label::before {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
       display: none;
     }
   }
@@ -277,4 +289,3 @@
 }
 </style>
 
-

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }
diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue
index 9b2d7e5..0bda852 100644
--- a/src/views/dashboard/map/index.vue
+++ b/src/views/dashboard/map/index.vue
@@ -40,7 +40,8 @@
 const detailRef = ref()
 const detail = ref()
 const timer = ref()
-
+const publicPath = import.meta.env.BASE_URL
+console.log(publicPath, 'publicPath')
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -90,7 +91,7 @@
     // 绘制标记点
     for (let i = 0; i < deviceMarkerList.value.length; i++) {
       const alarmFlag = deviceList.value[i].alarmFlag ? 'alarm' : deviceList.value[i].deviceType
-      const content = `<img src="/icon/${alarmFlag}.png" class="img-map-marker">`
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
       const marker = new AMap.Marker({
         position: deviceMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         map: map.value,
@@ -110,6 +111,7 @@
           overlay: e.target,
           infoWindow: detail.value,
           info: deviceList.value[i],
+          flag: 'device',
         })
       })
       markerList.value.push(marker)
@@ -136,29 +138,45 @@
 }
 // 获取人员列表
 const fetchPersonList = (id: string) => {
-  // getPersonList(id).then((res) => {
-  //   console.log(res.data, '人员列表')
-  //   // 过滤整理数据
-  //   const data = res.data.filter((person: any) => person.lng && person.lat)
-  //   personList.value = data
-  //   personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
-  //   //  地图AMap参数
-  //   const AMap = AMap1.value
-  //   // 绘制标记点
-  //   for (let i = 0; i < personMarkerList.value.length; i++) {
-  //     const content = '<img src="/icon/person.png" class="img-map-marker">'
-  //     const marker = new AMap.Marker({
-  //       position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  //       map: map.value,
-  //       content,
-  //       offset: new AMap.Pixel(-10, -15),
-  //     })
-  //     markerList.value.push(marker)
-  //     map.value.add([marker])
-  //     // 自动适应显示想显示的范围区域
-  //     // map.value.setFitView()
-  //   }
-  // })
+  getPersonList(id).then((res) => {
+    // 过滤整理数据
+    const data = res.data.filter((person: any) => person.lng && person.lat)
+    personList.value = data
+    personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
+    //  地图AMap参数
+    const AMap = AMap1.value
+    // 绘制标记点
+    for (let i = 0; i < personMarkerList.value.length; i++) {
+      const alarmFlag = personMarkerList.value[i].alarmFlag ? 'alarm' : 'person'
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
+      const marker = new AMap.Marker({
+        position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        map: map.value,
+        content,
+        offset: new AMap.Pixel(-10, -10),
+      })
+      detail.value = new AMap.InfoWindow({
+        isCustom: true, // 自定义信息窗体
+        content: detailRef.value.$el, // 窗体内容(vue组件)
+        offset: new AMap.Pixel(9, -5), // 偏移
+      })
+      marker.on('click', (e) => {
+        // 打开信息窗口
+        detail.value.open(map.value, e.lnglat)
+        // 初始化信息窗口
+        detailRef.value.initDialog({
+          overlay: e.target,
+          infoWindow: detail.value,
+          info: personList.value[i],
+          flag: 'person',
+        })
+      })
+      markerList.value.push(marker)
+      map.value.add([marker])
+      // 自动适应显示想显示的范围区域
+      // map.value.setFitView()
+    }
+  })
 }
 // 开启定时器
 const openTimer = () => {
@@ -173,7 +191,7 @@
         }
       })
     }
-  }, 1000)
+  }, 1000 * 60)
 }
 // 获取报警列表
 const fetchAlarmList = (id: string) => {
@@ -231,7 +249,7 @@
   <div class="container">
     <!-- 地图 -->
     <div id="map" v-loading="loading" />
-    <!-- 现场列表下拉 -->
+    <!-- 报警列表下拉 -->
     <div class="collapse">
       <el-collapse v-model="activeNames">
         <el-collapse-item ref="alarmListRef" title="设备告警" :class="{ alarm: alarmList.length ? true : false }" name="2">
@@ -252,6 +270,11 @@
             </div>
           </div>
         </el-collapse-item>
+      </el-collapse>
+    </div>
+    <!-- 现场列表 -->
+    <div class="collapse1">
+      <el-collapse v-model="activeNames">
         <el-collapse-item title="作业现场列表" name="1">
           <div v-if="!sceneList.length" class="message-content" style="text-align: center;">
             暂无数据
@@ -299,7 +322,7 @@
     padding: 5px 0;
 
     .alarm-item {
-      width: 30%;
+      width: 33%;
       border: 2px solid #3969b9;
       margin-top: 5px;
       margin-left: 8px;
@@ -335,8 +358,14 @@
     right: 5px;
   }
 
+  .collapse1 {
+    position: absolute;
+    top: 15px;
+    left: 0;
+  }
+
   :deep(.el-collapse-item__wrap) {
-    background-color: rgba($color: #fff, $alpha: 50%);
+    background-color: rgba($color: #fff, $alpha: 100%);
   }
 
   :deep(.el-collapse-item) {
@@ -348,7 +377,7 @@
     font-weight: 700;
     text-align: center !important;
     // padding-left: 70px;
-    background-color: transparent;
+    // background-color: transparent;
   }
 
   :deep(.el-collapse-item__content) {
@@ -379,6 +408,10 @@
       font-size: 12px;
       color: #888;
     }
+
+    .message {
+      font-weight: 700;
+    }
   }
 }
 
diff --git a/src/views/dashboard/video.ts b/src/views/dashboard/video.ts
new file mode 100644
index 0000000..fc8952a
--- /dev/null
+++ b/src/views/dashboard/video.ts
@@ -0,0 +1,9 @@
+// 现场智能管控平台地址和key
+export const urlAndKey = {
+  url: 'https://jls.huaweisoft.com',
+  appKey: 'fe80b2f021644b1b8c77fda743a83670',
+  secretKey: '8771ea6e931d4db646a26f67bcb89909',
+}
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 9205bc0..7562ba6 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -12,4 +12,5 @@
   gasCode?: string // 激甲编号
   gasIp?: string // 激甲ip
   gasPort?: string // 激甲端口
+  hatLiningCode?: string
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 2f6e4af..3e3216b 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -29,6 +29,7 @@
   gasCode: '', // 激甲编号
   gasIp: '', // 激甲ip
   gasPort: '', // 激甲端口
+  hatLiningCode: '', // 只能帽衬编号
 
 }) // 表单
 const textMap: { [key: string]: string } = {
@@ -36,16 +37,35 @@
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 身份证号码验证规则
+const validateIP = (rule: any, value: any, callback: any) => {
+  const rr = /^((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const validatePort = (rule: any, value: any, callback: any) => {
+  if (Number(value) > 1 && Number(value) < 65535) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   deviceType: [{ required: true, message: '请选择设备类型', trigger: ['blur', 'change'] }],
   deviceCode: [{ required: true, message: '请输入设备编号', trigger: ['blur', 'change'] }],
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
-  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
-  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
-  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
-  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  cameraIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  hatLiningCode: [{ required: true, message: '请输入帽衬编号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -64,6 +84,7 @@
     gasCode: '', // 激甲编号
     gasIp: '', // 激甲ip
     gasPort: '', // 激甲端口
+    hatLiningCode: '', // 只能帽衬编号
   }
   // dataFormRef.value.clearValidate()
 }
@@ -214,7 +235,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-input v-model.trim="deviceForm.deviceCode" type="text" placeholder="必填" />
+            <el-input v-model.trim="deviceForm.deviceCode" :disabled="dialogStatus === 'update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -239,6 +260,11 @@
             <el-input v-model.trim="deviceForm.deviceBatch" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col v-if="deviceForm.deviceType === '2'" :span="12">
+          <el-form-item label="智能帽衬编号" prop="hatLiningCode">
+            <el-input v-model.trim="deviceForm.hatLiningCode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row v-if="isANQUANMAO" :gutter="20">
         <el-col :span="12">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 55f30e6..a5a439c 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -119,14 +119,20 @@
       type: 'info',
     }).then((res) => {
       // 点击确认
-      const ids = selectList.value.map(item => item.id)
-      delDevice(ids).then((res) => {
-        if (res.code === 200) {
-          selectList.value = []
-          ElMessage.success('删除成功')
-          fetchData()
-        }
-      })
+      // 判断所选设备状态
+      if (selectList.value.every(item => item.status === '0')) {
+        const ids = selectList.value.map(item => item.id)
+        delDevice(ids).then((res) => {
+          if (res.code === 200) {
+            selectList.value = []
+            ElMessage.success('删除成功')
+            fetchData()
+          }
+        })
+      }
+      else {
+        ElMessage.warning('所选设备正在使用中，请先解绑')
+      }
     }).catch(() => {
       // 点击取消
       selectList.value = []
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 0c1ed5b..8f6b57b 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -19,6 +19,7 @@
   status: '',
   deptId: '',
   endDate: '',
+  workerType: '1',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -114,14 +115,19 @@
       type: 'info',
     }).then((res) => {
       // 点击确认
-      const ids = selectList.value.map(item => item.id)
-      delPerson(ids).then((res) => {
-        if (res.code === 200) {
-          selectList.value = []
-          ElMessage.success('删除成功')
-          fetchData()
-        }
-      })
+      if (selectList.value.every(item => item.status === '0')) {
+        const ids = selectList.value.map(item => item.id)
+        delPerson(ids).then((res) => {
+          if (res.code === 200) {
+            selectList.value = []
+            ElMessage.success('删除成功')
+            fetchData()
+          }
+        })
+      }
+      else {
+        ElMessage.warning('所选人员正在作业中，请先解绑')
+      }
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -199,7 +205,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/person/register')" label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
+                <el-button
+                  link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small"
+                  @click="register(scope.row)"
+                >
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue
index 318c9ad..b4479db 100644
--- a/src/views/person/personEdit.vue
+++ b/src/views/person/personEdit.vue
@@ -39,12 +39,22 @@
     callback(new Error('验证失败'))
   }
 }
+// 手机号验证规则
+const validatePhone = (rule: any, value: any, callback: any) => {
+  const rr = /^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\d{8}$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules = ref({
-  workerName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
-  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
-  deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
-  phoneNumber: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  idCardNumber: [{ required: true, message: '身份证号码不符合规范', trigger: 'blur', validator: validateIDcard }],
+  workerName: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
+  gender: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '所属部门不能为空', trigger: ['blur', 'change'] }],
+  phoneNumber: [{ required: true, message: '联系方式不符合规范或为空', trigger: ['blur', 'change'], validator: validatePhone }],
+  idCardNumber: [{ required: true, message: '身份证号码不符合规范或为空', trigger: ['blur', 'change'], validator: validateIDcard }],
 }) // 表单验证规则
 
 // 图片上传请求
@@ -151,33 +161,39 @@
     <!-- 拍照组件 -->
     <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot" />
     <detail-page :title="title">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
-        stripe>
+      <el-form
+        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
+        stripe
+      >
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item>
-              <el-upload class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
-                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg">
+              <el-upload
+                class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg"
+              >
                 <img v-if="ruleForm.workerAvatar" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
               </el-upload>
-              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;"
-                @click="register">人脸注册</el-button>
+              <el-button
+                type="primary" style="margin-top: 20px; display: block; width: 190px;"
+                @click="register"
+              >
+                人脸注册
+              </el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="workerName" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名">
-              </el-input>
+              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名" />
             </el-form-item>
             <el-form-item label="所属部门" prop="deptId" class="marg-item" style="margin-top: 40px;">
               <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="职务" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'">
-              </el-input>
+              <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -187,15 +203,12 @@
               </el-select>
             </el-form-item>
             <el-form-item label="联系方式" prop="phoneNumber" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'">
-              </el-input>
+              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="证件号码" prop="idCardNumber" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'">
-              </el-input>
+              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
       <div class="dialog-footer">
@@ -237,9 +250,8 @@
 
 .isDetail {
   ::v-deep {
-
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label::before {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
       display: none;
     }
   }
@@ -277,4 +289,3 @@
 }
 </style>
 
-
diff --git a/src/views/scene/components/personListDialog.vue b/src/views/scene/components/personListDialog.vue
index c01e138..cc50471 100644
--- a/src/views/scene/components/personListDialog.vue
+++ b/src/views/scene/components/personListDialog.vue
@@ -22,6 +22,7 @@
   // logType: '业务日志',
   offset: 1,
   limit: 5,
+  workerType: '1',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -43,6 +44,7 @@
   getPersonListPage(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
+      console.log()
       total.value = res.data.rows.length
     }
   })
@@ -123,8 +125,10 @@
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
-      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" @change="changePage">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :list-loading="loadingTable" @change="changePage"
+      >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
             <template #default="scope">

diff --git a/src/api/alarm.ts b/src/api/alarm.ts
index 6a39aeb..ed3f6b1 100644
--- a/src/api/alarm.ts
+++ b/src/api/alarm.ts
@@ -12,3 +12,18 @@
     params,
   })
 }
+// 消除报警
+export function alarmCancel(alarmId: string) {
+  return request({
+    url: `${prefix}/cancel?alarmId=${alarmId}`,
+    method: 'post',
+  })
+}
+// 删除报警
+export function alarmDel(data: object) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index befae46..363a960 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -41,7 +41,7 @@
 // 添加组织机构
 export function addDept(data: object) {
   return request({
-    url: '/sys/extend/dept/add',
+    url: '/sys/dept/add',
     method: 'post',
     data,
   })
@@ -49,7 +49,7 @@
 // 修改组织机构
 export function updateDept(data: object) {
   return request({
-    url: '/sys/extend/dept/update',
+    url: '/sys/dept/update',
     method: 'post',
     data,
   })
@@ -57,7 +57,7 @@
 // 删除组织机构
 export function delDept(id: string) {
   return request({
-    url: '/sys/extend/dept/delete',
+    url: '/sys/dept/delete',
     method: 'post',
     data: {
       id,
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..80f9f2c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,8 +7,6 @@
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workFlow/addNode.vue')['default']
-    AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
@@ -41,8 +39,6 @@
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
-    NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
-    NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
deleted file mode 100644
index b773386..0000000
--- a/src/components/workFlow/addNode.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<script setup lang="ts" name="AddNode">
-import { ref } from 'vue'
-
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false) // 对话框显隐
-
-// 添加节点（给节点设置初始值）
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) { // 审核
-      data = {
-        nodeName: '审核人', // 节点名称
-        error: true, // 控制空节点提示
-        type: 1, // 节点类型
-        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1, // 审批终点-主管
-        examineMode: 1, // 审批方式
-        noHanderAction: 1, // 审批人为空时
-        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) { // 抄送
-      data = {
-        nodeName: '抄送人', // 节点名称
-        type: 2, // 节点类型
-        ccSelfSelectFlag: 1,
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [], // 抄送人数据
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', { // 条件
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1', // 节点名称
-        error: true, // 控制空节点提示
-        type: 3, // 节点类型
-        priorityLevel: 1, // 优先级
-        conditionList: [],
-        nodeUserList: [],
-        childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <!-- <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a> -->
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <template #reference>
-          <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button>
-        </template>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
deleted file mode 100644
index 95a601f..0000000
--- a/src/components/workFlow/addNodeBan.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<script setup lang="ts" name="AddNodeBan">
-import { ref } from 'vue'
-const props = defineProps({
-  childNodeP: {
-    type: Object,
-    default: () => ({}),
-  },
-})
-const emits = defineEmits(['update:childNodeP'])
-const visible = ref(false)
-const addType = (type: number) => {
-  visible.value = false
-  if (type != 4) {
-    let data
-    if (type == 1) {
-      data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
-        selectMode: 0,
-        selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    else if (type == 2) {
-      data = {
-        nodeName: '抄送人',
-        type: 2,
-        ccSelfSelectFlag: 1,
-        childNode: props.childNodeP,
-        nodeUserList: [],
-      }
-    }
-    emits('update:childNodeP', data)
-  }
-  else {
-    emits('update:childNodeP', {
-      nodeName: '路由',
-      type: 4,
-      childNode: null,
-      conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: props.childNodeP,
-      }, {
-        nodeName: '条件2',
-        type: 3,
-        priorityLevel: 2,
-        conditionList: [],
-        nodeUserList: [],
-        childNode: null,
-      }],
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover v-model="visible" placement="right-start" width="auto">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-      </el-popover>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: inline-box;
-  display: inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    margin: auto;
-    width: 2px;
-    height: 100%;
-    background-color: #cacaca;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgb(0 0 0 / 10%);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgb(0 0 0 / 10%);
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgb(50 150 250 / 40%);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
deleted file mode 100644
index 92b26e4..0000000
--- a/src/components/workFlow/nodeWrap.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<script setup lang="ts" name="NodeWrap">
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const userStore = useUserStore()
-
-const workFlowStore = useWorkFlowStore() // store
-const proxy = getCurrentInstance() as any
-const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 默认节点名字
-  return placeholderList[props.nodeConfig.type]
-})
-
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || userStore.name
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, () => {
-  if (props.nodeConfig.type == 1) { // 审批
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-// 条件控制节点显示输入框的字段{0: true}
-const isInputList = ref<{ [key: number]: boolean }>([])
-// 审批和抄送控制节点名称显示输入框的字段
-const isInput = ref(false)
-
-// 条件设置提醒（红色感叹号）
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-
-onMounted(() => {
-  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  // 抄送
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  // 条件
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-
-// 审批（监听到审批设置的改变，更新父组件节点）
-watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 发起人
-watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:flowPermission', val.value)
-  }
-})
-// 条件
-watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-  console.log('val.flag', val.flag, val.id, _uid)
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
-// 抄送
-// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
-//   if (val.flag && val.id === _uid) {
-//     emits('update:nodeConfig', val.value)
-//   }
-// })
-
-const {
-  setApprover,
-  setCopyer,
-  setCondition,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-
-// 点击节点名称--显示输入框（条件会有index）
-const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = true
-  }
-  else { // 审批、抄送
-    isInput.value = true
-  }
-}
-// 节点名称失去焦点--保存名称
-const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) { // 条件
-    isInputList.value[index as number] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else { // 审批、抄送
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-
-// 删除节点--（审批、抄送）
-const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
-}
-
-// 点击添加条件
-const addTerm = () => {
-  const len = props.nodeConfig.conditionNodes.length + 1
-  props.nodeConfig.conditionNodes.push({
-    nodeName: `条件${len}`,
-    type: 3,
-    priorityLevel: len,
-    conditionList: [],
-    nodeUserList: [],
-    childNode: null,
-  })
-  resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
-}
-
-const reData = (data: any, addData: any) => {
-  if (!data.childNode) {
-    data.childNode = addData
-  }
-  else {
-    reData(data.childNode, addData)
-  }
-}
-// 删除条件设置
-const delTerm = (index: number) => {
-  props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-    item.nodeName = `条件${index + 1}`
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
-  if (props.nodeConfig.conditionNodes.length == 1) {
-    if (props.nodeConfig.childNode) {
-      if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode)
-      }
-      else {
-        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode
-      }
-    }
-    emits('update:nodeConfig', props.nodeConfig.conditionNodes[0].childNode)
-  }
-}
-
-// 点击节点--节点设置
-const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig // 节点类型
-  if (type == 1) { // 审批
-    // 控制审批抽屉显隐
-    setApprover(true)
-    // 审批节点数据设置
-    setApproverConfig({
-      value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig)),
-        ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
-      },
-      flag: false,
-      id: _uid,
-    })
-  }
-  else if (type == 2) { // 抄送
-    // 控制抄送抽屉显隐
-    setCopyer(true)
-    // 抄送节点数据设置
-    setCopyerConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      flag: false,
-      id: _uid,
-    })
-  }
-  else { // 条件
-    // 控制条件抽屉显隐
-    setCondition(true)
-    // 条件节点数据设置
-    setConditionsConfig({
-      value: JSON.parse(JSON.stringify(props.nodeConfig)),
-      priorityLevel,
-      flag: false,
-      id: _uid,
-    })
-  }
-}
-// 条件左右切换
-const arrTransfer = (index: number, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
-  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
-}
-</script>
-
-<template>
-  <!-- 非条件 -->
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-            @blur="blurEvent(null)"
-          >
-          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
-          <i class="anticon anticon-close close" @click="delNode" />
-        </template>
-      </div>
-      <div class="content" @click="setPerson">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-        <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
-      </div>
-      <div v-if="nodeConfig.error" class="error_tip">
-        <i class="anticon anticon-exclamation-circle" />
-      </div>
-    </div>
-    <add-node v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <!-- 条件 -->
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch" @click="addTerm">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
-                  &lt;
-                </div>
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                  >
-                  <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
-                  <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
-                  <i class="anticon anticon-close close" @click="delTerm(index)" />
-                </div>
-                <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right" @click="arrTransfer(index)">
-                  &gt;
-                </div>
-                <div class="content" @click="setPerson(item.priorityLevel)">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-                <div v-if="item.error" class="error_tip">
-                  <i class="anticon anticon-exclamation-circle" />
-                </div>
-              </div>
-              <add-node v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
deleted file mode 100644
index 4a3affb..0000000
--- a/src/components/workFlow/nodeWrapBan.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<script setup lang="ts" name="NodeWrapBan">
-import { computed, ref, watch } from 'vue'
-import $func from '@/plugins/preload'
-const props = defineProps({
-  nodeConfig: {
-    type: Object,
-    default: () => ({}),
-  },
-  flowPermission: {
-    type: Object,
-    default: () => {},
-  },
-})
-
-const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
-
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
-const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
-const defaultText = computed(() => { // 节点默认名字
-  return placeholderList[props.nodeConfig.type]
-})
-const showText = computed(() => {
-  // 设置发起人节点的showText显示文字
-  if (props.nodeConfig.type == 0) {
-    // return $func.arrToStr(props.flowPermission) || '所有人'
-    // return props.flowPermission.name || userStore.name
-    return '所有人'
-  }
-  // 设置审批节点的showText显示文字
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  // 设置审批节点的showText显示文字
-  return $func.copyerStr(props.nodeConfig)
-})
-
-// 监听到节点配置的变化，重新设置节点文字内容
-watch(() => props.nodeConfig, (val) => {
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig) // 审批
-  }
-  return $func.copyerStr(props.nodeConfig) // 抄送
-}, {
-  deep: true, // 深度监听的参数
-})
-
-const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
-const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
-</script>
-
-<template>
-  <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
-      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
-        <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
-        <template v-else>
-          <span class="iconfont">{{ nodeConfig.type === 1 ? '' : '' }}</span>
-          <input
-            v-if="isInput"
-            v-model="nodeConfig.nodeName"
-            v-focus
-            type="text"
-            class="ant-input editable-title-input"
-            :placeholder="defaultText"
-          >
-          <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-        </template>
-      </div>
-      <div class="content">
-        <div class="text">
-          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
-          {{ showText }}
-        </div>
-      </div>
-    </div>
-    <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-  </div>
-  <div v-if="nodeConfig.type === 4" class="branch-wrap">
-    <div class="branch-box-wrap">
-      <div class="branch-box">
-        <button class="add-branch">
-          添加条件
-        </button>
-        <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
-          <div class="condition-node">
-            <div class="condition-node-box">
-              <div class="auto-judge" :class="item.error ? 'error active' : ''">
-                <div class="title-wrapper">
-                  <input
-                    v-if="isInputList[index]"
-                    v-model="item.nodeName"
-                    v-focus
-                    type="text"
-                    class="ant-input editable-title-input"
-                  >
-                  <span v-else class="editable-title">{{ item.nodeName }}</span>
-                  <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                </div>
-                <div class="content">
-                  {{ $func.conditionStr(nodeConfig, index) }}
-                </div>
-              </div>
-              <add-node-ban v-model:childNodeP="item.childNode" />
-            </div>
-          </div>
-          <node-wrap-ban v-if="item.childNode" v-model:nodeConfig="item.childNode" />
-          <template v-if="index === 0">
-            <div class="top-left-cover-line" />
-            <div class="bottom-left-cover-line" />
-          </template>
-          <template v-if="index === nodeConfig.conditionNodes.length - 1">
-            <div class="top-right-cover-line" />
-            <div class="bottom-right-cover-line" />
-          </template>
-        </div>
-      </div>
-      <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
-    </div>
-  </div>
-  <node-wrap-ban v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" />
-</template>
-
-<style>
-.error_tip {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translate(150%, 0);
-  font-size: 24px;
-}
-
-.promoter_person .el-dialog__body {
-  padding: 10px 20px 14px;
-}
-
-.selected_list {
-  margin-bottom: 20px;
-  line-height: 30px;
-}
-
-.selected_list span {
-  margin-right: 10px;
-  padding: 3px 6px 3px 9px;
-  line-height: 12px;
-  white-space: nowrap;
-  border-radius: 2px;
-  border: 1px solid rgb(220 220 220 / 100%);
-}
-
-.selected_list img {
-  margin-left: 5px;
-  width: 7px;
-  height: 7px;
-  cursor: pointer;
-}
-</style>
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index 923029d..88eceb5 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -6,7 +6,7 @@
 <script lang="ts" setup name="alarmlist">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { getAlarmListPage } from '@/api/alarm'
+import { alarmCancel, alarmDel, getAlarmListPage } from '@/api/alarm'
 import { getDictByCode } from '@/api/system/dict'
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
@@ -17,6 +17,8 @@
   alarmStatus: '',
   alarmEndTime: '',
   alarmStartTime: '',
+  sort: 'desc',
+  orderBy: 'alarmTime',
   offset: 1,
   limit: 20,
 })
@@ -47,11 +49,13 @@
     text: '负责人',
     value: 'workPersonName',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人联系方式',
     value: 'workPersonPhoneNumber',
     align: 'center',
+    width: '130',
   },
   {
     text: '报警时间',
@@ -62,6 +66,7 @@
     text: '当前状态',
     value: 'alarmStatusName',
     align: 'center',
+    width: '120',
   },
 ])
 const list = ref([])
@@ -105,10 +110,10 @@
     type: 'info',
   }).then((res) => {
     // 发送请求
-    // alarmCancel(row.id).then(res => {
-    //   ElMessage.success('消警成功')
-    //   search()
-    // })
+    alarmCancel(row.id).then((res) => {
+      ElMessage.success('消警成功')
+      search()
+    })
   })
 }
 
@@ -138,13 +143,13 @@
     }).then((res) => {
       // 点击确认
       const ids = selectList.value.map(item => item.id)
-      // alarmDel(ids).then((res) => {
-      //   if (res.code === 200) {
-      //     selectList.value = []
-      //     ElMessage.success('删除成功')
-      //     fetchData()
-      //   }
-      // })
+      alarmDel(ids).then((res) => {
+        if (res.code === 200) {
+          selectList.value = []
+          ElMessage.success('删除成功')
+          fetchData()
+        }
+      })
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -219,7 +224,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/alarm/cancel')" label="消警" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="eliminate(scope.row)">
+                <el-button
+                  link type="primary" :disabled="scope.row.alarmStatus !== '0'" size="small"
+                  @click="eliminate(scope.row)"
+                >
                   消警
                 </el-button>
               </template>
diff --git a/src/views/dashboard/icon/1.png b/src/views/dashboard/icon/1.png
deleted file mode 100644
index 0e4a59a..0000000
--- a/src/views/dashboard/icon/1.png
+++ /dev/null
Binary files differ
diff --git a/src/views/dashboard/icon/alarm.png b/src/views/dashboard/icon/alarm.png
deleted file mode 100644
index d4101a4..0000000
--- a/src/views/dashboard/icon/alarm.png
+++ /dev/null
Binary files differ
diff --git "a/src/views/dashboard/icon/\344\277\241\345\217\267.png" "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
new file mode 100644
index 0000000..9560c67
--- /dev/null
+++ "b/src/views/dashboard/icon/\344\277\241\345\217\267.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\347\224\265\351\207\217.png" "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
new file mode 100644
index 0000000..e9a02ad
--- /dev/null
+++ "b/src/views/dashboard/icon/\347\224\265\351\207\217.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\247\206\351\242\221.png" "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
new file mode 100644
index 0000000..3fb6749
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\247\206\351\242\221.png"
Binary files differ
diff --git "a/src/views/dashboard/icon/\350\257\255\351\237\263.png" "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
new file mode 100644
index 0000000..f75a856
--- /dev/null
+++ "b/src/views/dashboard/icon/\350\257\255\351\237\263.png"
Binary files differ
diff --git a/src/views/dashboard/map/callDialog.vue b/src/views/dashboard/map/callDialog.vue
new file mode 100644
index 0000000..fb93ee8
--- /dev/null
+++ b/src/views/dashboard/map/callDialog.vue
@@ -0,0 +1,121 @@
+<!--
+  Description: 通话弹窗
+  Author: 李亚光
+  Date: 2023-05-18
+ -->
+<script lang="ts" setup name="EditPerson">
+import { RefreshRight } from '@element-plus/icons-vue'
+import { urlAndKey } from '@/views/dashboard/video'
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类
+const loading = ref(true)
+const timer = ref()
+// 表头显示标题
+const textMap: { [key: string]: string } = {
+  video: '视频通话',
+  voice: '语音对讲',
+}
+const baseUrl = urlAndKey.url
+const baseParams = {
+  id: '',
+  appKey: urlAndKey.appKey,
+  secretKey: urlAndKey.secretKey,
+
+}
+// 用于拼接url的query字符串参数
+const getUrlToStr = (url: string, params: { [key: string]: string }) => {
+  return params ? `${url}?${Object.keys(params).filter(key => params[key] || params[key] === 0).map(key => `${key}=${params[key]}`).toString().replace(/,/g, '&')}` : url
+}
+// iframe地址
+const iframeUrl = ref('')
+// 获取区域类型
+const data = ref()
+const initDialog = (flag: string, row: any) => {
+  data.value = row
+  dialogStatus.value = flag
+  dialogFormVisible.value = true
+  if (flag === 'video') {
+    const url = `${baseUrl}/#/realvideo`
+    baseParams.id = row.hatCode
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  else {
+    const url = `${baseUrl}/#/Intercom`
+    baseParams.id = ''
+    iframeUrl.value = getUrlToStr(url, baseParams)
+  }
+  // timer.value = setTimeout(() => {
+  //   var iframe: any = document.querySelector('#player-iframe')
+  //   if (iframe?.attachEvent) {
+  //     iframe.attachEvent('onload', () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     })
+  //   }
+  //   else {
+  //     iframe.onload = () => {
+  //       // iframe加载完毕以后执行操作
+  //       loading.value = false
+  //     }
+  //   }
+  // })
+}
+// 弹窗关闭
+watch(() => dialogFormVisible.value, (newVal) => {
+  if (!newVal) {
+    loading.value = true
+    iframeUrl.value = ''
+    clearTimeout(timer.value)
+    console.log('通话关闭')
+  }
+})
+// 刷新
+const refresh = () => {
+  dialogFormVisible.value = false
+  setTimeout(() => {
+    initDialog(dialogStatus.value, data.value)
+  })
+}
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" append-to-body width="1000px" draggable>
+    <template #header>
+      <div class="header">
+        {{ textMap[dialogStatus] }}
+        <el-icon style="margin-left: 15px;" class="icon" @click="refresh">
+          <refresh-right />
+        </el-icon>
+      </div>
+    </template>
+    <iframe
+      v-if="dialogFormVisible" id="player-iframe" frameborder="false" :src="iframeUrl" height="500"
+      width="100%"
+    />
+    <!-- <div v-if="loading" v-loading="loading" style="width: 100%;height: 500px;"></div> -->
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  //  flex-direction: column;
+  .icon {
+    &:hover {
+      cursor: pointer;
+      color: #3d7eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/map/deviceDetail.vue b/src/views/dashboard/map/deviceDetail.vue
index 3e75c45..05941c4 100644
--- a/src/views/dashboard/map/deviceDetail.vue
+++ b/src/views/dashboard/map/deviceDetail.vue
@@ -4,52 +4,154 @@
   Date: 2023-05-17
  -->
 <script lang="ts" setup name="infoWindow">
+import dialog1 from './callDialog.vue'
+const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const flag = ref()
+const dialogRef = ref()
 // 初始化
 const initDialog = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  flag.value = e.flag
+  dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+// 通话
+const call = (flag: string) => {
+  dialogRef.value.initDialog(flag, info.value)
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="title">
-      <div class="text">
-        安全树设备-{{ info?.deviceCode }}
+  <div v-show="dialogFormVisible">
+    <div v-if="flag === 'device'" class="container">
+      <div class="title">
+        <div class="text">
+          安全树设备-{{ info?.deviceCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
       </div>
-      <div class="close" @click="close">
-        x
+      <div :title="info?.location" class="item text-hidden">
+        位置: {{ info?.location }}
+      </div>
+      <div class="item">
+        <span>时间: {{ info?.time }}</span>
+      </div>
+      <div class="item">
+        <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
       </div>
     </div>
-    <div class="item">
-      位置: {{ info?.location }}
+    <div v-else class="container" style="height: 240px;width: 360px;">
+      <div class="title">
+        <div class="text" style="width: 95%;" :class="{ alarm: info?.alarmFlag ? true : false }">
+          {{ info?.workerName }}-{{ info?.hatCode }}
+        </div>
+        <div class="close" @click="close">
+          x
+        </div>
+      </div>
+      <div class="content">
+        <div style="width: 100%;">
+          <div :title="info?.location" class="item text-hidden">
+            位置: {{ info?.location }}
+          </div>
+          <div class="item">
+            时间: {{ info?.time }}
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              心率: {{ info?.heartRate }}
+            </div>
+            <div style="width: 40%;">
+              血氧: {{ info?.bloodOxygen }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              一氧化碳: {{ info?.co }}
+            </div>
+            <div style="width: 40%;">
+              甲烷: {{ info?.gas }}
+            </div>
+          </div>
+          <div class="item" style="font-weight: 700;">
+            <div style="width: 60%;">
+              硫化氢: {{ info?.h2s }}
+            </div>
+            <div style="width: 40%;">
+              氧气: {{ info?.o2 }}
+            </div>
+          </div>
+        </div>
+        <!-- <div style="width: 30%;display:flex;justify-content: space-around;padding-top: 50px;">
+          <div class="img-container">
+            <img src="../icon/信号.png" width="24" height="24">
+            <div>信号</div>
+            <div>{{ info?.signal }}</div>
+          </div>
+          <div class="img-container">
+            <img src="../icon/电量.png" width="24" height="24">
+            <div>电量</div>
+            <div>{{ info?.cell }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div style="width: 100%;display: flex;justify-content: space-around;padding-top: 5px;">
+        <div class="img-container hover" @click="call('video')">
+          <img src="../icon/视频.png" width="24" height="24">
+          <div>视频通话</div>
+        </div>
+        <div class="img-container hover" @click="call('voice')">
+          <img src="../icon/语音.png" width="24" height="24">
+          <div>语音对讲</div>
+        </div>
+      </div>
     </div>
-    <div class="item">
-      <span>时间: {{ info?.time }}</span>
-    </div>
-    <div class="item">
-      <span :class="{ alarm: info?.alarmFlag ? true : false }">甲烷浓度: {{ info?.gasValue }}</span>
-    </div>
+    <dialog1 ref="dialogRef" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 360px;
+  height: 120px;
   padding: 0;
   background-color: #fff;
   border: 1px solid #6d9ece;
 
+  .text-hidden {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .content {
+    display: flex;
+  }
+
+  .hover {
+    &:hover {
+      cursor: pointer;
+    }
+  }
+
+  .img-container {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+
   .alarm {
     color: red;
   }
@@ -64,7 +166,7 @@
 
     .close {
       // color: #ccc;
-      margin-left: 100px;
+      // margin-left: 10px;
 
       &:hover {
         cursor: pointer;
@@ -77,7 +179,7 @@
     color: #111213;
     font-size: 14px;
     margin: 10px;
-    border-bottom: 1px solid #ccc;
+    // border-bottom: 1px solid #ccc;
     display: flex;
     justify-content: space-between;
   }
diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue
index 9b2d7e5..0bda852 100644
--- a/src/views/dashboard/map/index.vue
+++ b/src/views/dashboard/map/index.vue
@@ -40,7 +40,8 @@
 const detailRef = ref()
 const detail = ref()
 const timer = ref()
-
+const publicPath = import.meta.env.BASE_URL
+console.log(publicPath, 'publicPath')
 // 初始化地图
 const initMap = () => {
   AMapLoader.load({
@@ -90,7 +91,7 @@
     // 绘制标记点
     for (let i = 0; i < deviceMarkerList.value.length; i++) {
       const alarmFlag = deviceList.value[i].alarmFlag ? 'alarm' : deviceList.value[i].deviceType
-      const content = `<img src="/icon/${alarmFlag}.png" class="img-map-marker">`
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
       const marker = new AMap.Marker({
         position: deviceMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
         map: map.value,
@@ -110,6 +111,7 @@
           overlay: e.target,
           infoWindow: detail.value,
           info: deviceList.value[i],
+          flag: 'device',
         })
       })
       markerList.value.push(marker)
@@ -136,29 +138,45 @@
 }
 // 获取人员列表
 const fetchPersonList = (id: string) => {
-  // getPersonList(id).then((res) => {
-  //   console.log(res.data, '人员列表')
-  //   // 过滤整理数据
-  //   const data = res.data.filter((person: any) => person.lng && person.lat)
-  //   personList.value = data
-  //   personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
-  //   //  地图AMap参数
-  //   const AMap = AMap1.value
-  //   // 绘制标记点
-  //   for (let i = 0; i < personMarkerList.value.length; i++) {
-  //     const content = '<img src="/icon/person.png" class="img-map-marker">'
-  //     const marker = new AMap.Marker({
-  //       position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  //       map: map.value,
-  //       content,
-  //       offset: new AMap.Pixel(-10, -15),
-  //     })
-  //     markerList.value.push(marker)
-  //     map.value.add([marker])
-  //     // 自动适应显示想显示的范围区域
-  //     // map.value.setFitView()
-  //   }
-  // })
+  getPersonList(id).then((res) => {
+    // 过滤整理数据
+    const data = res.data.filter((person: any) => person.lng && person.lat)
+    personList.value = data
+    personMarkerList.value = data.map((item: any) => ([Number(item.lng), Number(item.lat)]))
+    //  地图AMap参数
+    const AMap = AMap1.value
+    // 绘制标记点
+    for (let i = 0; i < personMarkerList.value.length; i++) {
+      const alarmFlag = personMarkerList.value[i].alarmFlag ? 'alarm' : 'person'
+      const content = `<img src="${publicPath}icon/${alarmFlag}.png" class="img-map-marker">`
+      const marker = new AMap.Marker({
+        position: personMarkerList.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        map: map.value,
+        content,
+        offset: new AMap.Pixel(-10, -10),
+      })
+      detail.value = new AMap.InfoWindow({
+        isCustom: true, // 自定义信息窗体
+        content: detailRef.value.$el, // 窗体内容(vue组件)
+        offset: new AMap.Pixel(9, -5), // 偏移
+      })
+      marker.on('click', (e) => {
+        // 打开信息窗口
+        detail.value.open(map.value, e.lnglat)
+        // 初始化信息窗口
+        detailRef.value.initDialog({
+          overlay: e.target,
+          infoWindow: detail.value,
+          info: personList.value[i],
+          flag: 'person',
+        })
+      })
+      markerList.value.push(marker)
+      map.value.add([marker])
+      // 自动适应显示想显示的范围区域
+      // map.value.setFitView()
+    }
+  })
 }
 // 开启定时器
 const openTimer = () => {
@@ -173,7 +191,7 @@
         }
       })
     }
-  }, 1000)
+  }, 1000 * 60)
 }
 // 获取报警列表
 const fetchAlarmList = (id: string) => {
@@ -231,7 +249,7 @@
   <div class="container">
     <!-- 地图 -->
     <div id="map" v-loading="loading" />
-    <!-- 现场列表下拉 -->
+    <!-- 报警列表下拉 -->
     <div class="collapse">
       <el-collapse v-model="activeNames">
         <el-collapse-item ref="alarmListRef" title="设备告警" :class="{ alarm: alarmList.length ? true : false }" name="2">
@@ -252,6 +270,11 @@
             </div>
           </div>
         </el-collapse-item>
+      </el-collapse>
+    </div>
+    <!-- 现场列表 -->
+    <div class="collapse1">
+      <el-collapse v-model="activeNames">
         <el-collapse-item title="作业现场列表" name="1">
           <div v-if="!sceneList.length" class="message-content" style="text-align: center;">
             暂无数据
@@ -299,7 +322,7 @@
     padding: 5px 0;
 
     .alarm-item {
-      width: 30%;
+      width: 33%;
       border: 2px solid #3969b9;
       margin-top: 5px;
       margin-left: 8px;
@@ -335,8 +358,14 @@
     right: 5px;
   }
 
+  .collapse1 {
+    position: absolute;
+    top: 15px;
+    left: 0;
+  }
+
   :deep(.el-collapse-item__wrap) {
-    background-color: rgba($color: #fff, $alpha: 50%);
+    background-color: rgba($color: #fff, $alpha: 100%);
   }
 
   :deep(.el-collapse-item) {
@@ -348,7 +377,7 @@
     font-weight: 700;
     text-align: center !important;
     // padding-left: 70px;
-    background-color: transparent;
+    // background-color: transparent;
   }
 
   :deep(.el-collapse-item__content) {
@@ -379,6 +408,10 @@
       font-size: 12px;
       color: #888;
     }
+
+    .message {
+      font-weight: 700;
+    }
   }
 }
 
diff --git a/src/views/dashboard/video.ts b/src/views/dashboard/video.ts
new file mode 100644
index 0000000..fc8952a
--- /dev/null
+++ b/src/views/dashboard/video.ts
@@ -0,0 +1,9 @@
+// 现场智能管控平台地址和key
+export const urlAndKey = {
+  url: 'https://jls.huaweisoft.com',
+  appKey: 'fe80b2f021644b1b8c77fda743a83670',
+  secretKey: '8771ea6e931d4db646a26f67bcb89909',
+}
+// 设备的实时视频页面 /#/realvideo?id={serialNumber}&appKey={appKey}&secretKey={secretKey}
+// 语音通话页面 /#/Intercom?appKey={appKey}&secretKey={secretKey}
+
diff --git a/src/views/device/device-interface.ts b/src/views/device/device-interface.ts
index 9205bc0..7562ba6 100644
--- a/src/views/device/device-interface.ts
+++ b/src/views/device/device-interface.ts
@@ -12,4 +12,5 @@
   gasCode?: string // 激甲编号
   gasIp?: string // 激甲ip
   gasPort?: string // 激甲端口
+  hatLiningCode?: string
 }
diff --git a/src/views/device/deviceEdit.vue b/src/views/device/deviceEdit.vue
index 2f6e4af..3e3216b 100644
--- a/src/views/device/deviceEdit.vue
+++ b/src/views/device/deviceEdit.vue
@@ -29,6 +29,7 @@
   gasCode: '', // 激甲编号
   gasIp: '', // 激甲ip
   gasPort: '', // 激甲端口
+  hatLiningCode: '', // 只能帽衬编号
 
 }) // 表单
 const textMap: { [key: string]: string } = {
@@ -36,16 +37,35 @@
   create: '新增',
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
+// 身份证号码验证规则
+const validateIP = (rule: any, value: any, callback: any) => {
+  const rr = /^((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const validatePort = (rule: any, value: any, callback: any) => {
+  if (Number(value) > 1 && Number(value) < 65535) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules: FormRules = {
   deviceType: [{ required: true, message: '请选择设备类型', trigger: ['blur', 'change'] }],
   deviceCode: [{ required: true, message: '请输入设备编号', trigger: ['blur', 'change'] }],
   deviceBatch: [{ required: true, message: '请输入设备批次', trigger: ['blur', 'change'] }],
   isPowerSupply: [{ required: true, message: '请输入设备是否供电', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '请输入设备厂家', trigger: ['blur', 'change'] }],
-  cameraPort: [{ required: true, message: '请输入摄像头端口号', trigger: ['blur', 'change'] }],
-  cameraIp: [{ required: true, message: '请输入摄像头ip', trigger: ['blur', 'change'] }],
-  gasIp: [{ required: true, message: '请输入激甲ip', trigger: ['blur', 'change'] }],
-  gasPort: [{ required: true, message: '请输入激甲端口号', trigger: ['blur', 'change'] }],
+  cameraPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  cameraIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasIp: [{ required: true, message: 'IP地址不合法或为空', trigger: ['blur', 'change'], validator: validateIP }],
+  gasPort: [{ required: true, message: '端口号不合法或为空', trigger: ['blur', 'change'], validator: validatePort }],
+  hatLiningCode: [{ required: true, message: '请输入帽衬编号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 // 重置表单
@@ -64,6 +84,7 @@
     gasCode: '', // 激甲编号
     gasIp: '', // 激甲ip
     gasPort: '', // 激甲端口
+    hatLiningCode: '', // 只能帽衬编号
   }
   // dataFormRef.value.clearValidate()
 }
@@ -214,7 +235,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-input v-model.trim="deviceForm.deviceCode" type="text" placeholder="必填" />
+            <el-input v-model.trim="deviceForm.deviceCode" :disabled="dialogStatus === 'update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -239,6 +260,11 @@
             <el-input v-model.trim="deviceForm.deviceBatch" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col v-if="deviceForm.deviceType === '2'" :span="12">
+          <el-form-item label="智能帽衬编号" prop="hatLiningCode">
+            <el-input v-model.trim="deviceForm.hatLiningCode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row v-if="isANQUANMAO" :gutter="20">
         <el-col :span="12">
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 55f30e6..a5a439c 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -119,14 +119,20 @@
       type: 'info',
     }).then((res) => {
       // 点击确认
-      const ids = selectList.value.map(item => item.id)
-      delDevice(ids).then((res) => {
-        if (res.code === 200) {
-          selectList.value = []
-          ElMessage.success('删除成功')
-          fetchData()
-        }
-      })
+      // 判断所选设备状态
+      if (selectList.value.every(item => item.status === '0')) {
+        const ids = selectList.value.map(item => item.id)
+        delDevice(ids).then((res) => {
+          if (res.code === 200) {
+            selectList.value = []
+            ElMessage.success('删除成功')
+            fetchData()
+          }
+        })
+      }
+      else {
+        ElMessage.warning('所选设备正在使用中，请先解绑')
+      }
     }).catch(() => {
       // 点击取消
       selectList.value = []
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 0c1ed5b..8f6b57b 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -19,6 +19,7 @@
   status: '',
   deptId: '',
   endDate: '',
+  workerType: '1',
   // logType: '业务日志',
   offset: 1,
   limit: 20,
@@ -114,14 +115,19 @@
       type: 'info',
     }).then((res) => {
       // 点击确认
-      const ids = selectList.value.map(item => item.id)
-      delPerson(ids).then((res) => {
-        if (res.code === 200) {
-          selectList.value = []
-          ElMessage.success('删除成功')
-          fetchData()
-        }
-      })
+      if (selectList.value.every(item => item.status === '0')) {
+        const ids = selectList.value.map(item => item.id)
+        delPerson(ids).then((res) => {
+          if (res.code === 200) {
+            selectList.value = []
+            ElMessage.success('删除成功')
+            fetchData()
+          }
+        })
+      }
+      else {
+        ElMessage.warning('所选人员正在作业中，请先解绑')
+      }
     }).catch(() => {
       // 点击取消
       selectList.value = []
@@ -199,7 +205,10 @@
           <template #columns>
             <el-table-column v-if="proxy.hasPerm('/person/register')" label="人脸注册" width="90" align="center">
               <template #default="scope">
-                <el-button link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small" @click="register(scope.row)">
+                <el-button
+                  link type="primary" :disabled="Boolean(scope.row.workerAvatar)" size="small"
+                  @click="register(scope.row)"
+                >
                   注册
                 </el-button>
               </template>
diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue
index 318c9ad..b4479db 100644
--- a/src/views/person/personEdit.vue
+++ b/src/views/person/personEdit.vue
@@ -39,12 +39,22 @@
     callback(new Error('验证失败'))
   }
 }
+// 手机号验证规则
+const validatePhone = (rule: any, value: any, callback: any) => {
+  const rr = /^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\d{8}$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
 const rules = ref({
-  workerName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
-  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
-  deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
-  phoneNumber: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  idCardNumber: [{ required: true, message: '身份证号码不符合规范', trigger: 'blur', validator: validateIDcard }],
+  workerName: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
+  gender: [{ required: true, message: '性别不能为空', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '所属部门不能为空', trigger: ['blur', 'change'] }],
+  phoneNumber: [{ required: true, message: '联系方式不符合规范或为空', trigger: ['blur', 'change'], validator: validatePhone }],
+  idCardNumber: [{ required: true, message: '身份证号码不符合规范或为空', trigger: ['blur', 'change'], validator: validateIDcard }],
 }) // 表单验证规则
 
 // 图片上传请求
@@ -151,33 +161,39 @@
     <!-- 拍照组件 -->
     <photograph ref="photographRef" :tack-photo="tackPhoto" @off="offPthot" />
     <detail-page :title="title">
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
-        stripe>
+      <el-form
+        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" border
+        stripe
+      >
         <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item>
-              <el-upload class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
-                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg">
+              <el-upload
+                class="avatar-uploader" :show-file-list="false" :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload" accept="image/png, image/jpeg,image/jpg"
+              >
                 <img v-if="ruleForm.workerAvatar" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
               </el-upload>
-              <el-button type="primary" style="margin-top: 20px; display: block; width: 190px;"
-                @click="register">人脸注册</el-button>
+              <el-button
+                type="primary" style="margin-top: 20px; display: block; width: 190px;"
+                @click="register"
+              >
+                人脸注册
+              </el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="workerName" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名">
-              </el-input>
+              <el-input v-model.trim="ruleForm.workerName" placeholder="姓名" />
             </el-form-item>
             <el-form-item label="所属部门" prop="deptId" class="marg-item" style="margin-top: 40px;">
               <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="所属部门" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="职务" prop="name" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'">
-              </el-input>
+              <el-input v-model.trim="ruleForm.name" placeholder="职务" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -187,15 +203,12 @@
               </el-select>
             </el-form-item>
             <el-form-item label="联系方式" prop="phoneNumber" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'">
-              </el-input>
+              <el-input v-model.trim="ruleForm.phoneNumber" placeholder="联系方式" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="证件号码" prop="idCardNumber" style="margin-top: 40px;">
-              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'">
-              </el-input>
+              <el-input v-model.trim="ruleForm.idCardNumber" placeholder="证件号码" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
       <div class="dialog-footer">
@@ -237,9 +250,8 @@
 
 .isDetail {
   ::v-deep {
-
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label::before {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
       display: none;
     }
   }
@@ -277,4 +289,3 @@
 }
 </style>
 
-
diff --git a/src/views/scene/components/personListDialog.vue b/src/views/scene/components/personListDialog.vue
index c01e138..cc50471 100644
--- a/src/views/scene/components/personListDialog.vue
+++ b/src/views/scene/components/personListDialog.vue
@@ -22,6 +22,7 @@
   // logType: '业务日志',
   offset: 1,
   limit: 5,
+  workerType: '1',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -43,6 +44,7 @@
   getPersonListPage(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
+      console.log()
       total.value = res.data.rows.length
     }
   })
@@ -123,8 +125,10 @@
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
-      <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" @change="changePage">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :list-loading="loadingTable" @change="changePage"
+      >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/scene/sceneEdit.vue b/src/views/scene/sceneEdit.vue
index bbd31bb..2e3a718 100644
--- a/src/views/scene/sceneEdit.vue
+++ b/src/views/scene/sceneEdit.vue
@@ -25,12 +25,12 @@
 }) // 表单
 const title = ref('')
 const rules = ref({
-  workTitle: [{ required: true, message: '作业名称不能为空', trigger: 'blur' }],
-  workRoad: [{ required: true, message: '所属道路不能为空', trigger: 'blur' }],
-  workSiteDesc: [{ required: true, message: '作业描述不能为空', trigger: 'blur' }],
-  workPersonName: [{ required: true, message: '责任人不能为空', trigger: 'blur' }],
-  deviceList: [{ required: true, message: '安全树列表不能为空', trigger: 'blur' }],
-  workerList: [{ required: true, message: '人员列表不能为空', trigger: 'blur' }],
+  workTitle: [{ required: true, message: '作业名称不能为空', trigger: ['blur', 'change'] }],
+  workRoad: [{ required: true, message: '所属道路不能为空', trigger: ['blur', 'change'] }],
+  workSiteDesc: [{ required: true, message: '作业描述不能为空', trigger: ['blur', 'change'] }],
+  workPersonName: [{ required: true, message: '责任人不能为空', trigger: ['blur', 'change'] }],
+  deviceList: [{ required: true, message: '安全树列表不能为空', trigger: ['blur', 'change'] }],
+  workerList: [{ required: true, message: '人员列表不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 人员列表弹窗组件
 const selectPersonRef = ref()