diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index ec6c441..a1468aa 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -152,14 +152,16 @@
 const loading = ref(true)
 const detailById = (id: string) => {
   loading.value = true
-  detailDevice({ id }).then((res) => {
-    if (res.code === 200) {
-      deviceInfo.value = res.data
-    }
-    loading.value = false
-  }).catch(() => {
-    loading.value = false
-  })
+  // detailDevice({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     deviceInfo.value = res.data
+  //   }
+  deviceInfo.value = JSON.parse(route.query.row as string)
+  console.log(deviceInfo.value, 'deviceInfo.value')
+  loading.value = false
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 
   detailDeviceConfig(id).then((res) => {
     if (res.code === 200) {
@@ -213,86 +215,115 @@
           关闭
         </el-button>
       </template>
-
-      <el-form v-loading="loading" ref="basicFormRef" :model="deviceInfo" label-position="left" label-width="110px"
-        stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="设备编号：">
-              {{ deviceInfo.devcode }}
-            </el-form-item>
-            <el-form-item label="设备IMEI：">
-              {{ deviceInfo.imei }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="所属产品：">
-              {{ deviceInfo.productName }}
-            </el-form-item>
-
-            <el-form-item label="ICCID：">
-              {{ deviceInfo.iccid }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="设备类型：">
-              {{ deviceInfo.deviceTypeName }}
-            </el-form-item>
-
-            <el-form-item label="加密方式：">
-              {{ deviceInfo.encipherTypeName }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="设备型号：">
-              {{ deviceInfo.modelName }}
-            </el-form-item>
-
-            <el-form-item label="创建时间：">
-              {{ deviceInfo.createTime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;">
-          <el-col :span="18">
-            <el-form-item label="当前配置：">
-              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
-                {{ item.text }} : {{ item.value }}
-              </el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="收到时间：">
-              {{ deviceConfig.logtime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">设备编号</div>
+          <div class="item-value" :title="deviceInfo.devcode">{{ deviceInfo.devcode }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备类型</div>
+          <div class="item-value" :title="deviceInfo.deviceTypeName">{{ deviceInfo.deviceTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备型号</div>
+          <div class="item-value" :title="deviceInfo.model">{{ deviceInfo.model }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属产品</div>
+          <div class="item-value" :title="deviceInfo.productName">{{ deviceInfo.productName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属分组</div>
+          <div class="item-value" :title="deviceInfo.groupName">{{ deviceInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备IMEI</div>
+          <div class="item-value" :title="deviceInfo.imei">{{ deviceInfo.imei }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">加密方式</div>
+          <div class="item-value" :title="deviceInfo.encipherTypeName">{{ deviceInfo.encipherTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="deviceInfo.createTime">{{ deviceInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item" style="width: 75%;">
+          <div class="item-label" style="width: 13.32%;">当前配置</div>
+          <div class="item-value" style="width: 86.68%;">
+            <el-tag v-for="item in configItemList" :key="item.idx" size="small" style="margin-right: 10px;">
+              {{ item.text }} : {{ item.value }}
+            </el-tag>
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">收到时间</div>
+          <div class="item-value" :title="deviceConfig.logtime">{{ deviceConfig.logtime }}</div>
+        </div>
+      </div>
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
 
       <template v-if="current === 'device-data'">
         <data-query-list :embedded="true" :dev-code="deviceInfo.devcode" />
       </template>
 
       <template v-if="current === 'device-config'">
-        <device-config-list :devcode="deviceInfo.devcode" />
+        <device-config-list :devcode="deviceInfo.devcode" :device-type="deviceInfo.deviceType" />
       </template>
 
       <!-- <template v-if="current === 'device-cell'">
         <DeviceElectricityList :devcode="deviceInfo.devcode" />
       </template> -->
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index ec6c441..a1468aa 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -152,14 +152,16 @@
 const loading = ref(true)
 const detailById = (id: string) => {
   loading.value = true
-  detailDevice({ id }).then((res) => {
-    if (res.code === 200) {
-      deviceInfo.value = res.data
-    }
-    loading.value = false
-  }).catch(() => {
-    loading.value = false
-  })
+  // detailDevice({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     deviceInfo.value = res.data
+  //   }
+  deviceInfo.value = JSON.parse(route.query.row as string)
+  console.log(deviceInfo.value, 'deviceInfo.value')
+  loading.value = false
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 
   detailDeviceConfig(id).then((res) => {
     if (res.code === 200) {
@@ -213,86 +215,115 @@
           关闭
         </el-button>
       </template>
-
-      <el-form v-loading="loading" ref="basicFormRef" :model="deviceInfo" label-position="left" label-width="110px"
-        stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="设备编号：">
-              {{ deviceInfo.devcode }}
-            </el-form-item>
-            <el-form-item label="设备IMEI：">
-              {{ deviceInfo.imei }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="所属产品：">
-              {{ deviceInfo.productName }}
-            </el-form-item>
-
-            <el-form-item label="ICCID：">
-              {{ deviceInfo.iccid }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="设备类型：">
-              {{ deviceInfo.deviceTypeName }}
-            </el-form-item>
-
-            <el-form-item label="加密方式：">
-              {{ deviceInfo.encipherTypeName }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="设备型号：">
-              {{ deviceInfo.modelName }}
-            </el-form-item>
-
-            <el-form-item label="创建时间：">
-              {{ deviceInfo.createTime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;">
-          <el-col :span="18">
-            <el-form-item label="当前配置：">
-              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
-                {{ item.text }} : {{ item.value }}
-              </el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="收到时间：">
-              {{ deviceConfig.logtime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">设备编号</div>
+          <div class="item-value" :title="deviceInfo.devcode">{{ deviceInfo.devcode }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备类型</div>
+          <div class="item-value" :title="deviceInfo.deviceTypeName">{{ deviceInfo.deviceTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备型号</div>
+          <div class="item-value" :title="deviceInfo.model">{{ deviceInfo.model }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属产品</div>
+          <div class="item-value" :title="deviceInfo.productName">{{ deviceInfo.productName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属分组</div>
+          <div class="item-value" :title="deviceInfo.groupName">{{ deviceInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备IMEI</div>
+          <div class="item-value" :title="deviceInfo.imei">{{ deviceInfo.imei }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">加密方式</div>
+          <div class="item-value" :title="deviceInfo.encipherTypeName">{{ deviceInfo.encipherTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="deviceInfo.createTime">{{ deviceInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item" style="width: 75%;">
+          <div class="item-label" style="width: 13.32%;">当前配置</div>
+          <div class="item-value" style="width: 86.68%;">
+            <el-tag v-for="item in configItemList" :key="item.idx" size="small" style="margin-right: 10px;">
+              {{ item.text }} : {{ item.value }}
+            </el-tag>
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">收到时间</div>
+          <div class="item-value" :title="deviceConfig.logtime">{{ deviceConfig.logtime }}</div>
+        </div>
+      </div>
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
 
       <template v-if="current === 'device-data'">
         <data-query-list :embedded="true" :dev-code="deviceInfo.devcode" />
       </template>
 
       <template v-if="current === 'device-config'">
-        <device-config-list :devcode="deviceInfo.devcode" />
+        <device-config-list :devcode="deviceInfo.devcode" :device-type="deviceInfo.deviceType" />
       </template>
 
       <!-- <template v-if="current === 'device-cell'">
         <DeviceElectricityList :devcode="deviceInfo.devcode" />
       </template> -->
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index a89a9be..ed365f4 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -12,6 +12,7 @@
 import { getDeviceLatestBizData } from '@/api/data/query'
 import AddDeviceDialog from './addDeviceDialog.vue'
 import batchconfig from './batchconfig.vue'
+import $bus from '@/utils/eventBus'
 import axios from 'axios'
 const route = useRoute()
 const router = useRouter()
@@ -43,16 +44,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '状态', value: 'statusName', align: 'center', width: '80' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
-  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
-  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
-  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
-  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
-  { text: '最新数据', value: 'dataValue', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '170' },
-  { text: '最新上线时间', value: 'logtime', align: 'center', width: '170' },
+  { text: '状态', value: 'statusName', align: 'center', width: '70' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '140' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '170' },
+  { text: '设备型号', value: 'model', align: 'center', width: '170' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '150' },
+  { text: '所属分组', value: 'groupName', align: 'center', width: '150' },
+  { text: 'IMEI', value: 'imei', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center', width: '90' },
+  { text: '最新数据', value: 'dataValue', align: 'center', width: '90' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '165' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '165' },
 ])
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
@@ -110,6 +112,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
@@ -129,6 +132,7 @@
     batchImportDevice(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        $bus.emit('refresh-devicelist')
         loading.close()
         fileRef.value.value = ''
         fetchData(true)
@@ -173,15 +177,15 @@
     calcTableHeight()
     loadingTable.value = false
 
-    dataList.value.forEach((item) => {
-      getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
-        if (res.code === 200) {
-          item.dataValue = res.data.value
-          item.logtime = res.data.logtime
-          item.cell = res.data.cell
-        }
-      })
-    })
+    // dataList.value.forEach((item) => {
+    //   getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
+    //     if (res.code === 200) {
+    //       item.dataValue = res.data.value
+    //       item.logtime = res.data.logtime
+    //       item.cell = res.data.cell
+    //     }
+    //   })
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -308,7 +312,7 @@
 onMounted(async () => {
   await getDict()
   // 点击首页的低电量表格标题跳转过来
-  if(route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
+  if (route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
     cell.value = 1 as any
     searchQuery.value.beginCell = '0'
     searchQuery.value.endCell = '10'
@@ -355,7 +359,7 @@
   <app-container>
     <add-device-dialog ref="refAddDeviceDialog" :needGroup="true" @record-saved="searchList" />
     <!-- 批量下发配置弹窗 -->
-    <batchconfig ref="batchConfigRef" />
+    <batchconfig ref="batchConfigRef" @refresh="searchList" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index ec6c441..a1468aa 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -152,14 +152,16 @@
 const loading = ref(true)
 const detailById = (id: string) => {
   loading.value = true
-  detailDevice({ id }).then((res) => {
-    if (res.code === 200) {
-      deviceInfo.value = res.data
-    }
-    loading.value = false
-  }).catch(() => {
-    loading.value = false
-  })
+  // detailDevice({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     deviceInfo.value = res.data
+  //   }
+  deviceInfo.value = JSON.parse(route.query.row as string)
+  console.log(deviceInfo.value, 'deviceInfo.value')
+  loading.value = false
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 
   detailDeviceConfig(id).then((res) => {
     if (res.code === 200) {
@@ -213,86 +215,115 @@
           关闭
         </el-button>
       </template>
-
-      <el-form v-loading="loading" ref="basicFormRef" :model="deviceInfo" label-position="left" label-width="110px"
-        stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="设备编号：">
-              {{ deviceInfo.devcode }}
-            </el-form-item>
-            <el-form-item label="设备IMEI：">
-              {{ deviceInfo.imei }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="所属产品：">
-              {{ deviceInfo.productName }}
-            </el-form-item>
-
-            <el-form-item label="ICCID：">
-              {{ deviceInfo.iccid }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="设备类型：">
-              {{ deviceInfo.deviceTypeName }}
-            </el-form-item>
-
-            <el-form-item label="加密方式：">
-              {{ deviceInfo.encipherTypeName }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="设备型号：">
-              {{ deviceInfo.modelName }}
-            </el-form-item>
-
-            <el-form-item label="创建时间：">
-              {{ deviceInfo.createTime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;">
-          <el-col :span="18">
-            <el-form-item label="当前配置：">
-              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
-                {{ item.text }} : {{ item.value }}
-              </el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="收到时间：">
-              {{ deviceConfig.logtime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">设备编号</div>
+          <div class="item-value" :title="deviceInfo.devcode">{{ deviceInfo.devcode }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备类型</div>
+          <div class="item-value" :title="deviceInfo.deviceTypeName">{{ deviceInfo.deviceTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备型号</div>
+          <div class="item-value" :title="deviceInfo.model">{{ deviceInfo.model }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属产品</div>
+          <div class="item-value" :title="deviceInfo.productName">{{ deviceInfo.productName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属分组</div>
+          <div class="item-value" :title="deviceInfo.groupName">{{ deviceInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备IMEI</div>
+          <div class="item-value" :title="deviceInfo.imei">{{ deviceInfo.imei }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">加密方式</div>
+          <div class="item-value" :title="deviceInfo.encipherTypeName">{{ deviceInfo.encipherTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="deviceInfo.createTime">{{ deviceInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item" style="width: 75%;">
+          <div class="item-label" style="width: 13.32%;">当前配置</div>
+          <div class="item-value" style="width: 86.68%;">
+            <el-tag v-for="item in configItemList" :key="item.idx" size="small" style="margin-right: 10px;">
+              {{ item.text }} : {{ item.value }}
+            </el-tag>
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">收到时间</div>
+          <div class="item-value" :title="deviceConfig.logtime">{{ deviceConfig.logtime }}</div>
+        </div>
+      </div>
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
 
       <template v-if="current === 'device-data'">
         <data-query-list :embedded="true" :dev-code="deviceInfo.devcode" />
       </template>
 
       <template v-if="current === 'device-config'">
-        <device-config-list :devcode="deviceInfo.devcode" />
+        <device-config-list :devcode="deviceInfo.devcode" :device-type="deviceInfo.deviceType" />
       </template>
 
       <!-- <template v-if="current === 'device-cell'">
         <DeviceElectricityList :devcode="deviceInfo.devcode" />
       </template> -->
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index a89a9be..ed365f4 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -12,6 +12,7 @@
 import { getDeviceLatestBizData } from '@/api/data/query'
 import AddDeviceDialog from './addDeviceDialog.vue'
 import batchconfig from './batchconfig.vue'
+import $bus from '@/utils/eventBus'
 import axios from 'axios'
 const route = useRoute()
 const router = useRouter()
@@ -43,16 +44,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '状态', value: 'statusName', align: 'center', width: '80' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
-  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
-  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
-  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
-  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
-  { text: '最新数据', value: 'dataValue', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '170' },
-  { text: '最新上线时间', value: 'logtime', align: 'center', width: '170' },
+  { text: '状态', value: 'statusName', align: 'center', width: '70' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '140' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '170' },
+  { text: '设备型号', value: 'model', align: 'center', width: '170' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '150' },
+  { text: '所属分组', value: 'groupName', align: 'center', width: '150' },
+  { text: 'IMEI', value: 'imei', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center', width: '90' },
+  { text: '最新数据', value: 'dataValue', align: 'center', width: '90' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '165' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '165' },
 ])
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
@@ -110,6 +112,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
@@ -129,6 +132,7 @@
     batchImportDevice(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        $bus.emit('refresh-devicelist')
         loading.close()
         fileRef.value.value = ''
         fetchData(true)
@@ -173,15 +177,15 @@
     calcTableHeight()
     loadingTable.value = false
 
-    dataList.value.forEach((item) => {
-      getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
-        if (res.code === 200) {
-          item.dataValue = res.data.value
-          item.logtime = res.data.logtime
-          item.cell = res.data.cell
-        }
-      })
-    })
+    // dataList.value.forEach((item) => {
+    //   getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
+    //     if (res.code === 200) {
+    //       item.dataValue = res.data.value
+    //       item.logtime = res.data.logtime
+    //       item.cell = res.data.cell
+    //     }
+    //   })
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -308,7 +312,7 @@
 onMounted(async () => {
   await getDict()
   // 点击首页的低电量表格标题跳转过来
-  if(route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
+  if (route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
     cell.value = 1 as any
     searchQuery.value.beginCell = '0'
     searchQuery.value.endCell = '10'
@@ -355,7 +359,7 @@
   <app-container>
     <add-device-dialog ref="refAddDeviceDialog" :needGroup="true" @record-saved="searchList" />
     <!-- 批量下发配置弹窗 -->
-    <batchconfig ref="batchConfigRef" />
+    <batchconfig ref="batchConfigRef" @refresh="searchList" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
diff --git a/src/views/basic/device/listEmbedded.vue b/src/views/basic/device/listEmbedded.vue
index 2ac3773..cb84aef 100644
--- a/src/views/basic/device/listEmbedded.vue
+++ b/src/views/basic/device/listEmbedded.vue
@@ -16,7 +16,7 @@
     required: true,
   },
 })
-
+const emits = defineEmits(['count'])
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
@@ -173,6 +173,7 @@
         }
       })
       total.value = parseInt(response.data.total)
+      emits('count', response.data.total)
     }
     loadingTable.value = false
   }).catch(() => {

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index ec6c441..a1468aa 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -152,14 +152,16 @@
 const loading = ref(true)
 const detailById = (id: string) => {
   loading.value = true
-  detailDevice({ id }).then((res) => {
-    if (res.code === 200) {
-      deviceInfo.value = res.data
-    }
-    loading.value = false
-  }).catch(() => {
-    loading.value = false
-  })
+  // detailDevice({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     deviceInfo.value = res.data
+  //   }
+  deviceInfo.value = JSON.parse(route.query.row as string)
+  console.log(deviceInfo.value, 'deviceInfo.value')
+  loading.value = false
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 
   detailDeviceConfig(id).then((res) => {
     if (res.code === 200) {
@@ -213,86 +215,115 @@
           关闭
         </el-button>
       </template>
-
-      <el-form v-loading="loading" ref="basicFormRef" :model="deviceInfo" label-position="left" label-width="110px"
-        stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="设备编号：">
-              {{ deviceInfo.devcode }}
-            </el-form-item>
-            <el-form-item label="设备IMEI：">
-              {{ deviceInfo.imei }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="所属产品：">
-              {{ deviceInfo.productName }}
-            </el-form-item>
-
-            <el-form-item label="ICCID：">
-              {{ deviceInfo.iccid }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="设备类型：">
-              {{ deviceInfo.deviceTypeName }}
-            </el-form-item>
-
-            <el-form-item label="加密方式：">
-              {{ deviceInfo.encipherTypeName }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="设备型号：">
-              {{ deviceInfo.modelName }}
-            </el-form-item>
-
-            <el-form-item label="创建时间：">
-              {{ deviceInfo.createTime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;">
-          <el-col :span="18">
-            <el-form-item label="当前配置：">
-              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
-                {{ item.text }} : {{ item.value }}
-              </el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="收到时间：">
-              {{ deviceConfig.logtime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">设备编号</div>
+          <div class="item-value" :title="deviceInfo.devcode">{{ deviceInfo.devcode }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备类型</div>
+          <div class="item-value" :title="deviceInfo.deviceTypeName">{{ deviceInfo.deviceTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备型号</div>
+          <div class="item-value" :title="deviceInfo.model">{{ deviceInfo.model }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属产品</div>
+          <div class="item-value" :title="deviceInfo.productName">{{ deviceInfo.productName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属分组</div>
+          <div class="item-value" :title="deviceInfo.groupName">{{ deviceInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备IMEI</div>
+          <div class="item-value" :title="deviceInfo.imei">{{ deviceInfo.imei }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">加密方式</div>
+          <div class="item-value" :title="deviceInfo.encipherTypeName">{{ deviceInfo.encipherTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="deviceInfo.createTime">{{ deviceInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item" style="width: 75%;">
+          <div class="item-label" style="width: 13.32%;">当前配置</div>
+          <div class="item-value" style="width: 86.68%;">
+            <el-tag v-for="item in configItemList" :key="item.idx" size="small" style="margin-right: 10px;">
+              {{ item.text }} : {{ item.value }}
+            </el-tag>
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">收到时间</div>
+          <div class="item-value" :title="deviceConfig.logtime">{{ deviceConfig.logtime }}</div>
+        </div>
+      </div>
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
 
       <template v-if="current === 'device-data'">
         <data-query-list :embedded="true" :dev-code="deviceInfo.devcode" />
       </template>
 
       <template v-if="current === 'device-config'">
-        <device-config-list :devcode="deviceInfo.devcode" />
+        <device-config-list :devcode="deviceInfo.devcode" :device-type="deviceInfo.deviceType" />
       </template>
 
       <!-- <template v-if="current === 'device-cell'">
         <DeviceElectricityList :devcode="deviceInfo.devcode" />
       </template> -->
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index a89a9be..ed365f4 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -12,6 +12,7 @@
 import { getDeviceLatestBizData } from '@/api/data/query'
 import AddDeviceDialog from './addDeviceDialog.vue'
 import batchconfig from './batchconfig.vue'
+import $bus from '@/utils/eventBus'
 import axios from 'axios'
 const route = useRoute()
 const router = useRouter()
@@ -43,16 +44,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '状态', value: 'statusName', align: 'center', width: '80' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
-  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
-  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
-  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
-  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
-  { text: '最新数据', value: 'dataValue', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '170' },
-  { text: '最新上线时间', value: 'logtime', align: 'center', width: '170' },
+  { text: '状态', value: 'statusName', align: 'center', width: '70' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '140' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '170' },
+  { text: '设备型号', value: 'model', align: 'center', width: '170' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '150' },
+  { text: '所属分组', value: 'groupName', align: 'center', width: '150' },
+  { text: 'IMEI', value: 'imei', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center', width: '90' },
+  { text: '最新数据', value: 'dataValue', align: 'center', width: '90' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '165' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '165' },
 ])
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
@@ -110,6 +112,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
@@ -129,6 +132,7 @@
     batchImportDevice(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        $bus.emit('refresh-devicelist')
         loading.close()
         fileRef.value.value = ''
         fetchData(true)
@@ -173,15 +177,15 @@
     calcTableHeight()
     loadingTable.value = false
 
-    dataList.value.forEach((item) => {
-      getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
-        if (res.code === 200) {
-          item.dataValue = res.data.value
-          item.logtime = res.data.logtime
-          item.cell = res.data.cell
-        }
-      })
-    })
+    // dataList.value.forEach((item) => {
+    //   getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
+    //     if (res.code === 200) {
+    //       item.dataValue = res.data.value
+    //       item.logtime = res.data.logtime
+    //       item.cell = res.data.cell
+    //     }
+    //   })
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -308,7 +312,7 @@
 onMounted(async () => {
   await getDict()
   // 点击首页的低电量表格标题跳转过来
-  if(route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
+  if (route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
     cell.value = 1 as any
     searchQuery.value.beginCell = '0'
     searchQuery.value.endCell = '10'
@@ -355,7 +359,7 @@
   <app-container>
     <add-device-dialog ref="refAddDeviceDialog" :needGroup="true" @record-saved="searchList" />
     <!-- 批量下发配置弹窗 -->
-    <batchconfig ref="batchConfigRef" />
+    <batchconfig ref="batchConfigRef" @refresh="searchList" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
diff --git a/src/views/basic/device/listEmbedded.vue b/src/views/basic/device/listEmbedded.vue
index 2ac3773..cb84aef 100644
--- a/src/views/basic/device/listEmbedded.vue
+++ b/src/views/basic/device/listEmbedded.vue
@@ -16,7 +16,7 @@
     required: true,
   },
 })
-
+const emits = defineEmits(['count'])
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
@@ -173,6 +173,7 @@
         }
       })
       total.value = parseInt(response.data.total)
+      emits('count', response.data.total)
     }
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/basic/group/addSubscribeDialog.vue b/src/views/basic/group/addSubscribeDialog.vue
index fe4ab6d..b827af9 100644
--- a/src/views/basic/group/addSubscribeDialog.vue
+++ b/src/views/basic/group/addSubscribeDialog.vue
@@ -145,8 +145,8 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="22">
-          <el-form-item label="订阅开关" prop="">
-            <el-switch v-model="subscribeInfo.value1" />
+          <el-form-item label="订阅开关" prop="enable">
+            <el-switch v-model="subscribeInfo.enable" />
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index ec6c441..a1468aa 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -152,14 +152,16 @@
 const loading = ref(true)
 const detailById = (id: string) => {
   loading.value = true
-  detailDevice({ id }).then((res) => {
-    if (res.code === 200) {
-      deviceInfo.value = res.data
-    }
-    loading.value = false
-  }).catch(() => {
-    loading.value = false
-  })
+  // detailDevice({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     deviceInfo.value = res.data
+  //   }
+  deviceInfo.value = JSON.parse(route.query.row as string)
+  console.log(deviceInfo.value, 'deviceInfo.value')
+  loading.value = false
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 
   detailDeviceConfig(id).then((res) => {
     if (res.code === 200) {
@@ -213,86 +215,115 @@
           关闭
         </el-button>
       </template>
-
-      <el-form v-loading="loading" ref="basicFormRef" :model="deviceInfo" label-position="left" label-width="110px"
-        stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="设备编号：">
-              {{ deviceInfo.devcode }}
-            </el-form-item>
-            <el-form-item label="设备IMEI：">
-              {{ deviceInfo.imei }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="所属产品：">
-              {{ deviceInfo.productName }}
-            </el-form-item>
-
-            <el-form-item label="ICCID：">
-              {{ deviceInfo.iccid }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="设备类型：">
-              {{ deviceInfo.deviceTypeName }}
-            </el-form-item>
-
-            <el-form-item label="加密方式：">
-              {{ deviceInfo.encipherTypeName }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="设备型号：">
-              {{ deviceInfo.modelName }}
-            </el-form-item>
-
-            <el-form-item label="创建时间：">
-              {{ deviceInfo.createTime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;">
-          <el-col :span="18">
-            <el-form-item label="当前配置：">
-              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
-                {{ item.text }} : {{ item.value }}
-              </el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="收到时间：">
-              {{ deviceConfig.logtime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">设备编号</div>
+          <div class="item-value" :title="deviceInfo.devcode">{{ deviceInfo.devcode }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备类型</div>
+          <div class="item-value" :title="deviceInfo.deviceTypeName">{{ deviceInfo.deviceTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备型号</div>
+          <div class="item-value" :title="deviceInfo.model">{{ deviceInfo.model }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属产品</div>
+          <div class="item-value" :title="deviceInfo.productName">{{ deviceInfo.productName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属分组</div>
+          <div class="item-value" :title="deviceInfo.groupName">{{ deviceInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备IMEI</div>
+          <div class="item-value" :title="deviceInfo.imei">{{ deviceInfo.imei }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">加密方式</div>
+          <div class="item-value" :title="deviceInfo.encipherTypeName">{{ deviceInfo.encipherTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="deviceInfo.createTime">{{ deviceInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item" style="width: 75%;">
+          <div class="item-label" style="width: 13.32%;">当前配置</div>
+          <div class="item-value" style="width: 86.68%;">
+            <el-tag v-for="item in configItemList" :key="item.idx" size="small" style="margin-right: 10px;">
+              {{ item.text }} : {{ item.value }}
+            </el-tag>
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">收到时间</div>
+          <div class="item-value" :title="deviceConfig.logtime">{{ deviceConfig.logtime }}</div>
+        </div>
+      </div>
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
 
       <template v-if="current === 'device-data'">
         <data-query-list :embedded="true" :dev-code="deviceInfo.devcode" />
       </template>
 
       <template v-if="current === 'device-config'">
-        <device-config-list :devcode="deviceInfo.devcode" />
+        <device-config-list :devcode="deviceInfo.devcode" :device-type="deviceInfo.deviceType" />
       </template>
 
       <!-- <template v-if="current === 'device-cell'">
         <DeviceElectricityList :devcode="deviceInfo.devcode" />
       </template> -->
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index a89a9be..ed365f4 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -12,6 +12,7 @@
 import { getDeviceLatestBizData } from '@/api/data/query'
 import AddDeviceDialog from './addDeviceDialog.vue'
 import batchconfig from './batchconfig.vue'
+import $bus from '@/utils/eventBus'
 import axios from 'axios'
 const route = useRoute()
 const router = useRouter()
@@ -43,16 +44,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '状态', value: 'statusName', align: 'center', width: '80' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
-  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
-  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
-  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
-  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
-  { text: '最新数据', value: 'dataValue', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '170' },
-  { text: '最新上线时间', value: 'logtime', align: 'center', width: '170' },
+  { text: '状态', value: 'statusName', align: 'center', width: '70' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '140' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '170' },
+  { text: '设备型号', value: 'model', align: 'center', width: '170' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '150' },
+  { text: '所属分组', value: 'groupName', align: 'center', width: '150' },
+  { text: 'IMEI', value: 'imei', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center', width: '90' },
+  { text: '最新数据', value: 'dataValue', align: 'center', width: '90' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '165' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '165' },
 ])
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
@@ -110,6 +112,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
@@ -129,6 +132,7 @@
     batchImportDevice(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        $bus.emit('refresh-devicelist')
         loading.close()
         fileRef.value.value = ''
         fetchData(true)
@@ -173,15 +177,15 @@
     calcTableHeight()
     loadingTable.value = false
 
-    dataList.value.forEach((item) => {
-      getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
-        if (res.code === 200) {
-          item.dataValue = res.data.value
-          item.logtime = res.data.logtime
-          item.cell = res.data.cell
-        }
-      })
-    })
+    // dataList.value.forEach((item) => {
+    //   getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
+    //     if (res.code === 200) {
+    //       item.dataValue = res.data.value
+    //       item.logtime = res.data.logtime
+    //       item.cell = res.data.cell
+    //     }
+    //   })
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -308,7 +312,7 @@
 onMounted(async () => {
   await getDict()
   // 点击首页的低电量表格标题跳转过来
-  if(route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
+  if (route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
     cell.value = 1 as any
     searchQuery.value.beginCell = '0'
     searchQuery.value.endCell = '10'
@@ -355,7 +359,7 @@
   <app-container>
     <add-device-dialog ref="refAddDeviceDialog" :needGroup="true" @record-saved="searchList" />
     <!-- 批量下发配置弹窗 -->
-    <batchconfig ref="batchConfigRef" />
+    <batchconfig ref="batchConfigRef" @refresh="searchList" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
diff --git a/src/views/basic/device/listEmbedded.vue b/src/views/basic/device/listEmbedded.vue
index 2ac3773..cb84aef 100644
--- a/src/views/basic/device/listEmbedded.vue
+++ b/src/views/basic/device/listEmbedded.vue
@@ -16,7 +16,7 @@
     required: true,
   },
 })
-
+const emits = defineEmits(['count'])
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
@@ -173,6 +173,7 @@
         }
       })
       total.value = parseInt(response.data.total)
+      emits('count', response.data.total)
     }
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/basic/group/addSubscribeDialog.vue b/src/views/basic/group/addSubscribeDialog.vue
index fe4ab6d..b827af9 100644
--- a/src/views/basic/group/addSubscribeDialog.vue
+++ b/src/views/basic/group/addSubscribeDialog.vue
@@ -145,8 +145,8 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="22">
-          <el-form-item label="订阅开关" prop="">
-            <el-switch v-model="subscribeInfo.value1" />
+          <el-form-item label="订阅开关" prop="enable">
+            <el-switch v-model="subscribeInfo.enable" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/basic/group/detail.vue b/src/views/basic/group/detail.vue
index 410fe14..4c292bf 100644
--- a/src/views/basic/group/detail.vue
+++ b/src/views/basic/group/detail.vue
@@ -31,6 +31,9 @@
   descn: '',
   createUserId: '',
   createTime: '',
+  deviceCount: '',
+  subscribeCount: '',
+
 })
 
 // 逻辑
@@ -53,12 +56,15 @@
 
 // 查询详情
 const detailById = (id: string) => {
-  detailGroup({ id }).then((res) => {
-    if (res.code === 200) {
-      groupInfo.value = res.data
-      groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
-    }
-  })
+  const data = JSON.parse(route.query.row as string)
+  // console.log(data, 'route')
+  groupInfo.value = data
+  // detailGroup({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     groupInfo.value = res.data
+  //     groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
+  //   }
+  // })
 }
 
 const initDialog = (params: any) => {
@@ -87,6 +93,13 @@
 onMounted(async () => {
   initDialog(route.query)
 })
+
+const countDevice = (number: string) => {
+  groupInfo.value.deviceCount = number
+}
+const countSubscribe = (number: string) => {
+  groupInfo.value.subscribeCount = number
+}
 </script>
 
 <template>
@@ -97,39 +110,64 @@
           关闭
         </el-button>
       </template>
-
-      <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">分组名称</div>
+          <div class="item-value" :title="groupInfo.groupName">{{ groupInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">分组编号</div>
+          <div class="item-value" :title="groupInfo.groupNo">{{ groupInfo.groupNo }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属组织</div>
+          <div class="item-value" :title="groupInfo.deptName">{{ groupInfo.deptName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="groupInfo.createTime">{{ groupInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">设备数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.deviceCount">{{ groupInfo.deviceCount }}
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">订阅数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.subscribeCount">{{
+            groupInfo.subscribeCount }}
+          </div>
+        </div>
+        <div class="descriptions-item" style="width: 50%;">
+          <div class="item-label" style="width: 20%; border-top: none;">分组描述</div>
+          <div class="item-value" style="width: 80%; border-top: none;" :title="groupInfo.descn">{{ groupInfo.descn }}
+          </div>
+        </div>
+      </div>
+      <!-- <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="分组编号：">
               {{ groupInfo.groupNo }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第二列 -->
           <el-col :span="6">
             <el-form-item label="分组名称：">
               {{ groupInfo.groupName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第三列 -->
           <el-col :span="6">
             <el-form-item label="所属组织：">
               {{ groupInfo.deptName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第四列 -->
           <el-col :span="6">
             <el-form-item label="创建时间：">
               {{ groupInfo.createTime }}
             </el-form-item>
           </el-col>
         </el-row>
-
-        <!-- 第四行 -->
         <el-row :gutter="24">
           <el-col :span="20">
             <el-form-item label="分组描述：">
@@ -137,23 +175,67 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-
-      <el-divider style="margin: 10px 0;" />
-
-      <el-radio-group v-model="currentLabel" style="margin-top: 20px; margin-left: 20px;" @change="radioChangeHandler">
+      </el-form> -->
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
       <!-- 设备管理 -->
       <template v-if="current === 'group-device'">
-        <device-list-embedded :is-embedded="true" :group-id="id" />
+        <device-list-embedded :is-embedded="true" :group-id="id" @count="countDevice" />
       </template>
       <!-- 订阅管理 -->
       <template v-if="current === 'group-subscribe'">
         <!-- <detail-block :need-title="false" title=""> -->
-        <subscription-management :group-id="id" />
+        <subscription-management :group-id="id" @count="countSubscribe" />
         <!-- </detail-block> -->
       </template>
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index ec6c441..a1468aa 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -152,14 +152,16 @@
 const loading = ref(true)
 const detailById = (id: string) => {
   loading.value = true
-  detailDevice({ id }).then((res) => {
-    if (res.code === 200) {
-      deviceInfo.value = res.data
-    }
-    loading.value = false
-  }).catch(() => {
-    loading.value = false
-  })
+  // detailDevice({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     deviceInfo.value = res.data
+  //   }
+  deviceInfo.value = JSON.parse(route.query.row as string)
+  console.log(deviceInfo.value, 'deviceInfo.value')
+  loading.value = false
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 
   detailDeviceConfig(id).then((res) => {
     if (res.code === 200) {
@@ -213,86 +215,115 @@
           关闭
         </el-button>
       </template>
-
-      <el-form v-loading="loading" ref="basicFormRef" :model="deviceInfo" label-position="left" label-width="110px"
-        stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="设备编号：">
-              {{ deviceInfo.devcode }}
-            </el-form-item>
-            <el-form-item label="设备IMEI：">
-              {{ deviceInfo.imei }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="所属产品：">
-              {{ deviceInfo.productName }}
-            </el-form-item>
-
-            <el-form-item label="ICCID：">
-              {{ deviceInfo.iccid }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="设备类型：">
-              {{ deviceInfo.deviceTypeName }}
-            </el-form-item>
-
-            <el-form-item label="加密方式：">
-              {{ deviceInfo.encipherTypeName }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="设备型号：">
-              {{ deviceInfo.modelName }}
-            </el-form-item>
-
-            <el-form-item label="创建时间：">
-              {{ deviceInfo.createTime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;">
-          <el-col :span="18">
-            <el-form-item label="当前配置：">
-              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
-                {{ item.text }} : {{ item.value }}
-              </el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="收到时间：">
-              {{ deviceConfig.logtime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">设备编号</div>
+          <div class="item-value" :title="deviceInfo.devcode">{{ deviceInfo.devcode }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备类型</div>
+          <div class="item-value" :title="deviceInfo.deviceTypeName">{{ deviceInfo.deviceTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备型号</div>
+          <div class="item-value" :title="deviceInfo.model">{{ deviceInfo.model }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属产品</div>
+          <div class="item-value" :title="deviceInfo.productName">{{ deviceInfo.productName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属分组</div>
+          <div class="item-value" :title="deviceInfo.groupName">{{ deviceInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备IMEI</div>
+          <div class="item-value" :title="deviceInfo.imei">{{ deviceInfo.imei }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">加密方式</div>
+          <div class="item-value" :title="deviceInfo.encipherTypeName">{{ deviceInfo.encipherTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="deviceInfo.createTime">{{ deviceInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item" style="width: 75%;">
+          <div class="item-label" style="width: 13.32%;">当前配置</div>
+          <div class="item-value" style="width: 86.68%;">
+            <el-tag v-for="item in configItemList" :key="item.idx" size="small" style="margin-right: 10px;">
+              {{ item.text }} : {{ item.value }}
+            </el-tag>
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">收到时间</div>
+          <div class="item-value" :title="deviceConfig.logtime">{{ deviceConfig.logtime }}</div>
+        </div>
+      </div>
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
 
       <template v-if="current === 'device-data'">
         <data-query-list :embedded="true" :dev-code="deviceInfo.devcode" />
       </template>
 
       <template v-if="current === 'device-config'">
-        <device-config-list :devcode="deviceInfo.devcode" />
+        <device-config-list :devcode="deviceInfo.devcode" :device-type="deviceInfo.deviceType" />
       </template>
 
       <!-- <template v-if="current === 'device-cell'">
         <DeviceElectricityList :devcode="deviceInfo.devcode" />
       </template> -->
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index a89a9be..ed365f4 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -12,6 +12,7 @@
 import { getDeviceLatestBizData } from '@/api/data/query'
 import AddDeviceDialog from './addDeviceDialog.vue'
 import batchconfig from './batchconfig.vue'
+import $bus from '@/utils/eventBus'
 import axios from 'axios'
 const route = useRoute()
 const router = useRouter()
@@ -43,16 +44,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '状态', value: 'statusName', align: 'center', width: '80' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
-  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
-  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
-  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
-  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
-  { text: '最新数据', value: 'dataValue', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '170' },
-  { text: '最新上线时间', value: 'logtime', align: 'center', width: '170' },
+  { text: '状态', value: 'statusName', align: 'center', width: '70' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '140' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '170' },
+  { text: '设备型号', value: 'model', align: 'center', width: '170' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '150' },
+  { text: '所属分组', value: 'groupName', align: 'center', width: '150' },
+  { text: 'IMEI', value: 'imei', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center', width: '90' },
+  { text: '最新数据', value: 'dataValue', align: 'center', width: '90' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '165' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '165' },
 ])
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
@@ -110,6 +112,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
@@ -129,6 +132,7 @@
     batchImportDevice(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        $bus.emit('refresh-devicelist')
         loading.close()
         fileRef.value.value = ''
         fetchData(true)
@@ -173,15 +177,15 @@
     calcTableHeight()
     loadingTable.value = false
 
-    dataList.value.forEach((item) => {
-      getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
-        if (res.code === 200) {
-          item.dataValue = res.data.value
-          item.logtime = res.data.logtime
-          item.cell = res.data.cell
-        }
-      })
-    })
+    // dataList.value.forEach((item) => {
+    //   getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
+    //     if (res.code === 200) {
+    //       item.dataValue = res.data.value
+    //       item.logtime = res.data.logtime
+    //       item.cell = res.data.cell
+    //     }
+    //   })
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -308,7 +312,7 @@
 onMounted(async () => {
   await getDict()
   // 点击首页的低电量表格标题跳转过来
-  if(route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
+  if (route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
     cell.value = 1 as any
     searchQuery.value.beginCell = '0'
     searchQuery.value.endCell = '10'
@@ -355,7 +359,7 @@
   <app-container>
     <add-device-dialog ref="refAddDeviceDialog" :needGroup="true" @record-saved="searchList" />
     <!-- 批量下发配置弹窗 -->
-    <batchconfig ref="batchConfigRef" />
+    <batchconfig ref="batchConfigRef" @refresh="searchList" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
diff --git a/src/views/basic/device/listEmbedded.vue b/src/views/basic/device/listEmbedded.vue
index 2ac3773..cb84aef 100644
--- a/src/views/basic/device/listEmbedded.vue
+++ b/src/views/basic/device/listEmbedded.vue
@@ -16,7 +16,7 @@
     required: true,
   },
 })
-
+const emits = defineEmits(['count'])
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
@@ -173,6 +173,7 @@
         }
       })
       total.value = parseInt(response.data.total)
+      emits('count', response.data.total)
     }
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/basic/group/addSubscribeDialog.vue b/src/views/basic/group/addSubscribeDialog.vue
index fe4ab6d..b827af9 100644
--- a/src/views/basic/group/addSubscribeDialog.vue
+++ b/src/views/basic/group/addSubscribeDialog.vue
@@ -145,8 +145,8 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="22">
-          <el-form-item label="订阅开关" prop="">
-            <el-switch v-model="subscribeInfo.value1" />
+          <el-form-item label="订阅开关" prop="enable">
+            <el-switch v-model="subscribeInfo.enable" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/basic/group/detail.vue b/src/views/basic/group/detail.vue
index 410fe14..4c292bf 100644
--- a/src/views/basic/group/detail.vue
+++ b/src/views/basic/group/detail.vue
@@ -31,6 +31,9 @@
   descn: '',
   createUserId: '',
   createTime: '',
+  deviceCount: '',
+  subscribeCount: '',
+
 })
 
 // 逻辑
@@ -53,12 +56,15 @@
 
 // 查询详情
 const detailById = (id: string) => {
-  detailGroup({ id }).then((res) => {
-    if (res.code === 200) {
-      groupInfo.value = res.data
-      groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
-    }
-  })
+  const data = JSON.parse(route.query.row as string)
+  // console.log(data, 'route')
+  groupInfo.value = data
+  // detailGroup({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     groupInfo.value = res.data
+  //     groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
+  //   }
+  // })
 }
 
 const initDialog = (params: any) => {
@@ -87,6 +93,13 @@
 onMounted(async () => {
   initDialog(route.query)
 })
+
+const countDevice = (number: string) => {
+  groupInfo.value.deviceCount = number
+}
+const countSubscribe = (number: string) => {
+  groupInfo.value.subscribeCount = number
+}
 </script>
 
 <template>
@@ -97,39 +110,64 @@
           关闭
         </el-button>
       </template>
-
-      <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">分组名称</div>
+          <div class="item-value" :title="groupInfo.groupName">{{ groupInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">分组编号</div>
+          <div class="item-value" :title="groupInfo.groupNo">{{ groupInfo.groupNo }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属组织</div>
+          <div class="item-value" :title="groupInfo.deptName">{{ groupInfo.deptName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="groupInfo.createTime">{{ groupInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">设备数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.deviceCount">{{ groupInfo.deviceCount }}
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">订阅数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.subscribeCount">{{
+            groupInfo.subscribeCount }}
+          </div>
+        </div>
+        <div class="descriptions-item" style="width: 50%;">
+          <div class="item-label" style="width: 20%; border-top: none;">分组描述</div>
+          <div class="item-value" style="width: 80%; border-top: none;" :title="groupInfo.descn">{{ groupInfo.descn }}
+          </div>
+        </div>
+      </div>
+      <!-- <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="分组编号：">
               {{ groupInfo.groupNo }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第二列 -->
           <el-col :span="6">
             <el-form-item label="分组名称：">
               {{ groupInfo.groupName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第三列 -->
           <el-col :span="6">
             <el-form-item label="所属组织：">
               {{ groupInfo.deptName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第四列 -->
           <el-col :span="6">
             <el-form-item label="创建时间：">
               {{ groupInfo.createTime }}
             </el-form-item>
           </el-col>
         </el-row>
-
-        <!-- 第四行 -->
         <el-row :gutter="24">
           <el-col :span="20">
             <el-form-item label="分组描述：">
@@ -137,23 +175,67 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-
-      <el-divider style="margin: 10px 0;" />
-
-      <el-radio-group v-model="currentLabel" style="margin-top: 20px; margin-left: 20px;" @change="radioChangeHandler">
+      </el-form> -->
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
       <!-- 设备管理 -->
       <template v-if="current === 'group-device'">
-        <device-list-embedded :is-embedded="true" :group-id="id" />
+        <device-list-embedded :is-embedded="true" :group-id="id" @count="countDevice" />
       </template>
       <!-- 订阅管理 -->
       <template v-if="current === 'group-subscribe'">
         <!-- <detail-block :need-title="false" title=""> -->
-        <subscription-management :group-id="id" />
+        <subscription-management :group-id="id" @count="countSubscribe" />
         <!-- </detail-block> -->
       </template>
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/group/group-info.ts b/src/views/basic/group/group-info.ts
index 00bbef6..b190776 100644
--- a/src/views/basic/group/group-info.ts
+++ b/src/views/basic/group/group-info.ts
@@ -20,4 +20,6 @@
   descn: string // 分组描述
   createUserId: string
   createTime?: string
+  subscribeCount?: string
+  deviceCount?: string
 }

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index ec6c441..a1468aa 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -152,14 +152,16 @@
 const loading = ref(true)
 const detailById = (id: string) => {
   loading.value = true
-  detailDevice({ id }).then((res) => {
-    if (res.code === 200) {
-      deviceInfo.value = res.data
-    }
-    loading.value = false
-  }).catch(() => {
-    loading.value = false
-  })
+  // detailDevice({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     deviceInfo.value = res.data
+  //   }
+  deviceInfo.value = JSON.parse(route.query.row as string)
+  console.log(deviceInfo.value, 'deviceInfo.value')
+  loading.value = false
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 
   detailDeviceConfig(id).then((res) => {
     if (res.code === 200) {
@@ -213,86 +215,115 @@
           关闭
         </el-button>
       </template>
-
-      <el-form v-loading="loading" ref="basicFormRef" :model="deviceInfo" label-position="left" label-width="110px"
-        stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="设备编号：">
-              {{ deviceInfo.devcode }}
-            </el-form-item>
-            <el-form-item label="设备IMEI：">
-              {{ deviceInfo.imei }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="所属产品：">
-              {{ deviceInfo.productName }}
-            </el-form-item>
-
-            <el-form-item label="ICCID：">
-              {{ deviceInfo.iccid }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="设备类型：">
-              {{ deviceInfo.deviceTypeName }}
-            </el-form-item>
-
-            <el-form-item label="加密方式：">
-              {{ deviceInfo.encipherTypeName }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="设备型号：">
-              {{ deviceInfo.modelName }}
-            </el-form-item>
-
-            <el-form-item label="创建时间：">
-              {{ deviceInfo.createTime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;">
-          <el-col :span="18">
-            <el-form-item label="当前配置：">
-              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
-                {{ item.text }} : {{ item.value }}
-              </el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="收到时间：">
-              {{ deviceConfig.logtime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">设备编号</div>
+          <div class="item-value" :title="deviceInfo.devcode">{{ deviceInfo.devcode }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备类型</div>
+          <div class="item-value" :title="deviceInfo.deviceTypeName">{{ deviceInfo.deviceTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备型号</div>
+          <div class="item-value" :title="deviceInfo.model">{{ deviceInfo.model }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属产品</div>
+          <div class="item-value" :title="deviceInfo.productName">{{ deviceInfo.productName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属分组</div>
+          <div class="item-value" :title="deviceInfo.groupName">{{ deviceInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备IMEI</div>
+          <div class="item-value" :title="deviceInfo.imei">{{ deviceInfo.imei }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">加密方式</div>
+          <div class="item-value" :title="deviceInfo.encipherTypeName">{{ deviceInfo.encipherTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="deviceInfo.createTime">{{ deviceInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item" style="width: 75%;">
+          <div class="item-label" style="width: 13.32%;">当前配置</div>
+          <div class="item-value" style="width: 86.68%;">
+            <el-tag v-for="item in configItemList" :key="item.idx" size="small" style="margin-right: 10px;">
+              {{ item.text }} : {{ item.value }}
+            </el-tag>
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">收到时间</div>
+          <div class="item-value" :title="deviceConfig.logtime">{{ deviceConfig.logtime }}</div>
+        </div>
+      </div>
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
 
       <template v-if="current === 'device-data'">
         <data-query-list :embedded="true" :dev-code="deviceInfo.devcode" />
       </template>
 
       <template v-if="current === 'device-config'">
-        <device-config-list :devcode="deviceInfo.devcode" />
+        <device-config-list :devcode="deviceInfo.devcode" :device-type="deviceInfo.deviceType" />
       </template>
 
       <!-- <template v-if="current === 'device-cell'">
         <DeviceElectricityList :devcode="deviceInfo.devcode" />
       </template> -->
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index a89a9be..ed365f4 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -12,6 +12,7 @@
 import { getDeviceLatestBizData } from '@/api/data/query'
 import AddDeviceDialog from './addDeviceDialog.vue'
 import batchconfig from './batchconfig.vue'
+import $bus from '@/utils/eventBus'
 import axios from 'axios'
 const route = useRoute()
 const router = useRouter()
@@ -43,16 +44,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '状态', value: 'statusName', align: 'center', width: '80' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
-  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
-  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
-  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
-  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
-  { text: '最新数据', value: 'dataValue', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '170' },
-  { text: '最新上线时间', value: 'logtime', align: 'center', width: '170' },
+  { text: '状态', value: 'statusName', align: 'center', width: '70' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '140' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '170' },
+  { text: '设备型号', value: 'model', align: 'center', width: '170' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '150' },
+  { text: '所属分组', value: 'groupName', align: 'center', width: '150' },
+  { text: 'IMEI', value: 'imei', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center', width: '90' },
+  { text: '最新数据', value: 'dataValue', align: 'center', width: '90' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '165' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '165' },
 ])
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
@@ -110,6 +112,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
@@ -129,6 +132,7 @@
     batchImportDevice(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        $bus.emit('refresh-devicelist')
         loading.close()
         fileRef.value.value = ''
         fetchData(true)
@@ -173,15 +177,15 @@
     calcTableHeight()
     loadingTable.value = false
 
-    dataList.value.forEach((item) => {
-      getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
-        if (res.code === 200) {
-          item.dataValue = res.data.value
-          item.logtime = res.data.logtime
-          item.cell = res.data.cell
-        }
-      })
-    })
+    // dataList.value.forEach((item) => {
+    //   getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
+    //     if (res.code === 200) {
+    //       item.dataValue = res.data.value
+    //       item.logtime = res.data.logtime
+    //       item.cell = res.data.cell
+    //     }
+    //   })
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -308,7 +312,7 @@
 onMounted(async () => {
   await getDict()
   // 点击首页的低电量表格标题跳转过来
-  if(route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
+  if (route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
     cell.value = 1 as any
     searchQuery.value.beginCell = '0'
     searchQuery.value.endCell = '10'
@@ -355,7 +359,7 @@
   <app-container>
     <add-device-dialog ref="refAddDeviceDialog" :needGroup="true" @record-saved="searchList" />
     <!-- 批量下发配置弹窗 -->
-    <batchconfig ref="batchConfigRef" />
+    <batchconfig ref="batchConfigRef" @refresh="searchList" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
diff --git a/src/views/basic/device/listEmbedded.vue b/src/views/basic/device/listEmbedded.vue
index 2ac3773..cb84aef 100644
--- a/src/views/basic/device/listEmbedded.vue
+++ b/src/views/basic/device/listEmbedded.vue
@@ -16,7 +16,7 @@
     required: true,
   },
 })
-
+const emits = defineEmits(['count'])
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
@@ -173,6 +173,7 @@
         }
       })
       total.value = parseInt(response.data.total)
+      emits('count', response.data.total)
     }
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/basic/group/addSubscribeDialog.vue b/src/views/basic/group/addSubscribeDialog.vue
index fe4ab6d..b827af9 100644
--- a/src/views/basic/group/addSubscribeDialog.vue
+++ b/src/views/basic/group/addSubscribeDialog.vue
@@ -145,8 +145,8 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="22">
-          <el-form-item label="订阅开关" prop="">
-            <el-switch v-model="subscribeInfo.value1" />
+          <el-form-item label="订阅开关" prop="enable">
+            <el-switch v-model="subscribeInfo.enable" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/basic/group/detail.vue b/src/views/basic/group/detail.vue
index 410fe14..4c292bf 100644
--- a/src/views/basic/group/detail.vue
+++ b/src/views/basic/group/detail.vue
@@ -31,6 +31,9 @@
   descn: '',
   createUserId: '',
   createTime: '',
+  deviceCount: '',
+  subscribeCount: '',
+
 })
 
 // 逻辑
@@ -53,12 +56,15 @@
 
 // 查询详情
 const detailById = (id: string) => {
-  detailGroup({ id }).then((res) => {
-    if (res.code === 200) {
-      groupInfo.value = res.data
-      groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
-    }
-  })
+  const data = JSON.parse(route.query.row as string)
+  // console.log(data, 'route')
+  groupInfo.value = data
+  // detailGroup({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     groupInfo.value = res.data
+  //     groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
+  //   }
+  // })
 }
 
 const initDialog = (params: any) => {
@@ -87,6 +93,13 @@
 onMounted(async () => {
   initDialog(route.query)
 })
+
+const countDevice = (number: string) => {
+  groupInfo.value.deviceCount = number
+}
+const countSubscribe = (number: string) => {
+  groupInfo.value.subscribeCount = number
+}
 </script>
 
 <template>
@@ -97,39 +110,64 @@
           关闭
         </el-button>
       </template>
-
-      <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">分组名称</div>
+          <div class="item-value" :title="groupInfo.groupName">{{ groupInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">分组编号</div>
+          <div class="item-value" :title="groupInfo.groupNo">{{ groupInfo.groupNo }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属组织</div>
+          <div class="item-value" :title="groupInfo.deptName">{{ groupInfo.deptName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="groupInfo.createTime">{{ groupInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">设备数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.deviceCount">{{ groupInfo.deviceCount }}
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">订阅数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.subscribeCount">{{
+            groupInfo.subscribeCount }}
+          </div>
+        </div>
+        <div class="descriptions-item" style="width: 50%;">
+          <div class="item-label" style="width: 20%; border-top: none;">分组描述</div>
+          <div class="item-value" style="width: 80%; border-top: none;" :title="groupInfo.descn">{{ groupInfo.descn }}
+          </div>
+        </div>
+      </div>
+      <!-- <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="分组编号：">
               {{ groupInfo.groupNo }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第二列 -->
           <el-col :span="6">
             <el-form-item label="分组名称：">
               {{ groupInfo.groupName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第三列 -->
           <el-col :span="6">
             <el-form-item label="所属组织：">
               {{ groupInfo.deptName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第四列 -->
           <el-col :span="6">
             <el-form-item label="创建时间：">
               {{ groupInfo.createTime }}
             </el-form-item>
           </el-col>
         </el-row>
-
-        <!-- 第四行 -->
         <el-row :gutter="24">
           <el-col :span="20">
             <el-form-item label="分组描述：">
@@ -137,23 +175,67 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-
-      <el-divider style="margin: 10px 0;" />
-
-      <el-radio-group v-model="currentLabel" style="margin-top: 20px; margin-left: 20px;" @change="radioChangeHandler">
+      </el-form> -->
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
       <!-- 设备管理 -->
       <template v-if="current === 'group-device'">
-        <device-list-embedded :is-embedded="true" :group-id="id" />
+        <device-list-embedded :is-embedded="true" :group-id="id" @count="countDevice" />
       </template>
       <!-- 订阅管理 -->
       <template v-if="current === 'group-subscribe'">
         <!-- <detail-block :need-title="false" title=""> -->
-        <subscription-management :group-id="id" />
+        <subscription-management :group-id="id" @count="countSubscribe" />
         <!-- </detail-block> -->
       </template>
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/group/group-info.ts b/src/views/basic/group/group-info.ts
index 00bbef6..b190776 100644
--- a/src/views/basic/group/group-info.ts
+++ b/src/views/basic/group/group-info.ts
@@ -20,4 +20,6 @@
   descn: string // 分组描述
   createUserId: string
   createTime?: string
+  subscribeCount?: string
+  deviceCount?: string
 }
diff --git a/src/views/basic/group/list.vue b/src/views/basic/group/list.vue
index 2b8ee96..704e093 100644
--- a/src/views/basic/group/list.vue
+++ b/src/views/basic/group/list.vue
@@ -51,6 +51,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index ec6c441..a1468aa 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -152,14 +152,16 @@
 const loading = ref(true)
 const detailById = (id: string) => {
   loading.value = true
-  detailDevice({ id }).then((res) => {
-    if (res.code === 200) {
-      deviceInfo.value = res.data
-    }
-    loading.value = false
-  }).catch(() => {
-    loading.value = false
-  })
+  // detailDevice({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     deviceInfo.value = res.data
+  //   }
+  deviceInfo.value = JSON.parse(route.query.row as string)
+  console.log(deviceInfo.value, 'deviceInfo.value')
+  loading.value = false
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 
   detailDeviceConfig(id).then((res) => {
     if (res.code === 200) {
@@ -213,86 +215,115 @@
           关闭
         </el-button>
       </template>
-
-      <el-form v-loading="loading" ref="basicFormRef" :model="deviceInfo" label-position="left" label-width="110px"
-        stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="设备编号：">
-              {{ deviceInfo.devcode }}
-            </el-form-item>
-            <el-form-item label="设备IMEI：">
-              {{ deviceInfo.imei }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="所属产品：">
-              {{ deviceInfo.productName }}
-            </el-form-item>
-
-            <el-form-item label="ICCID：">
-              {{ deviceInfo.iccid }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="设备类型：">
-              {{ deviceInfo.deviceTypeName }}
-            </el-form-item>
-
-            <el-form-item label="加密方式：">
-              {{ deviceInfo.encipherTypeName }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="设备型号：">
-              {{ deviceInfo.modelName }}
-            </el-form-item>
-
-            <el-form-item label="创建时间：">
-              {{ deviceInfo.createTime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;">
-          <el-col :span="18">
-            <el-form-item label="当前配置：">
-              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
-                {{ item.text }} : {{ item.value }}
-              </el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="收到时间：">
-              {{ deviceConfig.logtime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">设备编号</div>
+          <div class="item-value" :title="deviceInfo.devcode">{{ deviceInfo.devcode }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备类型</div>
+          <div class="item-value" :title="deviceInfo.deviceTypeName">{{ deviceInfo.deviceTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备型号</div>
+          <div class="item-value" :title="deviceInfo.model">{{ deviceInfo.model }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属产品</div>
+          <div class="item-value" :title="deviceInfo.productName">{{ deviceInfo.productName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属分组</div>
+          <div class="item-value" :title="deviceInfo.groupName">{{ deviceInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备IMEI</div>
+          <div class="item-value" :title="deviceInfo.imei">{{ deviceInfo.imei }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">加密方式</div>
+          <div class="item-value" :title="deviceInfo.encipherTypeName">{{ deviceInfo.encipherTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="deviceInfo.createTime">{{ deviceInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item" style="width: 75%;">
+          <div class="item-label" style="width: 13.32%;">当前配置</div>
+          <div class="item-value" style="width: 86.68%;">
+            <el-tag v-for="item in configItemList" :key="item.idx" size="small" style="margin-right: 10px;">
+              {{ item.text }} : {{ item.value }}
+            </el-tag>
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">收到时间</div>
+          <div class="item-value" :title="deviceConfig.logtime">{{ deviceConfig.logtime }}</div>
+        </div>
+      </div>
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
 
       <template v-if="current === 'device-data'">
         <data-query-list :embedded="true" :dev-code="deviceInfo.devcode" />
       </template>
 
       <template v-if="current === 'device-config'">
-        <device-config-list :devcode="deviceInfo.devcode" />
+        <device-config-list :devcode="deviceInfo.devcode" :device-type="deviceInfo.deviceType" />
       </template>
 
       <!-- <template v-if="current === 'device-cell'">
         <DeviceElectricityList :devcode="deviceInfo.devcode" />
       </template> -->
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index a89a9be..ed365f4 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -12,6 +12,7 @@
 import { getDeviceLatestBizData } from '@/api/data/query'
 import AddDeviceDialog from './addDeviceDialog.vue'
 import batchconfig from './batchconfig.vue'
+import $bus from '@/utils/eventBus'
 import axios from 'axios'
 const route = useRoute()
 const router = useRouter()
@@ -43,16 +44,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '状态', value: 'statusName', align: 'center', width: '80' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
-  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
-  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
-  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
-  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
-  { text: '最新数据', value: 'dataValue', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '170' },
-  { text: '最新上线时间', value: 'logtime', align: 'center', width: '170' },
+  { text: '状态', value: 'statusName', align: 'center', width: '70' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '140' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '170' },
+  { text: '设备型号', value: 'model', align: 'center', width: '170' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '150' },
+  { text: '所属分组', value: 'groupName', align: 'center', width: '150' },
+  { text: 'IMEI', value: 'imei', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center', width: '90' },
+  { text: '最新数据', value: 'dataValue', align: 'center', width: '90' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '165' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '165' },
 ])
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
@@ -110,6 +112,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
@@ -129,6 +132,7 @@
     batchImportDevice(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        $bus.emit('refresh-devicelist')
         loading.close()
         fileRef.value.value = ''
         fetchData(true)
@@ -173,15 +177,15 @@
     calcTableHeight()
     loadingTable.value = false
 
-    dataList.value.forEach((item) => {
-      getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
-        if (res.code === 200) {
-          item.dataValue = res.data.value
-          item.logtime = res.data.logtime
-          item.cell = res.data.cell
-        }
-      })
-    })
+    // dataList.value.forEach((item) => {
+    //   getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
+    //     if (res.code === 200) {
+    //       item.dataValue = res.data.value
+    //       item.logtime = res.data.logtime
+    //       item.cell = res.data.cell
+    //     }
+    //   })
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -308,7 +312,7 @@
 onMounted(async () => {
   await getDict()
   // 点击首页的低电量表格标题跳转过来
-  if(route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
+  if (route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
     cell.value = 1 as any
     searchQuery.value.beginCell = '0'
     searchQuery.value.endCell = '10'
@@ -355,7 +359,7 @@
   <app-container>
     <add-device-dialog ref="refAddDeviceDialog" :needGroup="true" @record-saved="searchList" />
     <!-- 批量下发配置弹窗 -->
-    <batchconfig ref="batchConfigRef" />
+    <batchconfig ref="batchConfigRef" @refresh="searchList" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
diff --git a/src/views/basic/device/listEmbedded.vue b/src/views/basic/device/listEmbedded.vue
index 2ac3773..cb84aef 100644
--- a/src/views/basic/device/listEmbedded.vue
+++ b/src/views/basic/device/listEmbedded.vue
@@ -16,7 +16,7 @@
     required: true,
   },
 })
-
+const emits = defineEmits(['count'])
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
@@ -173,6 +173,7 @@
         }
       })
       total.value = parseInt(response.data.total)
+      emits('count', response.data.total)
     }
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/basic/group/addSubscribeDialog.vue b/src/views/basic/group/addSubscribeDialog.vue
index fe4ab6d..b827af9 100644
--- a/src/views/basic/group/addSubscribeDialog.vue
+++ b/src/views/basic/group/addSubscribeDialog.vue
@@ -145,8 +145,8 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="22">
-          <el-form-item label="订阅开关" prop="">
-            <el-switch v-model="subscribeInfo.value1" />
+          <el-form-item label="订阅开关" prop="enable">
+            <el-switch v-model="subscribeInfo.enable" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/basic/group/detail.vue b/src/views/basic/group/detail.vue
index 410fe14..4c292bf 100644
--- a/src/views/basic/group/detail.vue
+++ b/src/views/basic/group/detail.vue
@@ -31,6 +31,9 @@
   descn: '',
   createUserId: '',
   createTime: '',
+  deviceCount: '',
+  subscribeCount: '',
+
 })
 
 // 逻辑
@@ -53,12 +56,15 @@
 
 // 查询详情
 const detailById = (id: string) => {
-  detailGroup({ id }).then((res) => {
-    if (res.code === 200) {
-      groupInfo.value = res.data
-      groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
-    }
-  })
+  const data = JSON.parse(route.query.row as string)
+  // console.log(data, 'route')
+  groupInfo.value = data
+  // detailGroup({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     groupInfo.value = res.data
+  //     groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
+  //   }
+  // })
 }
 
 const initDialog = (params: any) => {
@@ -87,6 +93,13 @@
 onMounted(async () => {
   initDialog(route.query)
 })
+
+const countDevice = (number: string) => {
+  groupInfo.value.deviceCount = number
+}
+const countSubscribe = (number: string) => {
+  groupInfo.value.subscribeCount = number
+}
 </script>
 
 <template>
@@ -97,39 +110,64 @@
           关闭
         </el-button>
       </template>
-
-      <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">分组名称</div>
+          <div class="item-value" :title="groupInfo.groupName">{{ groupInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">分组编号</div>
+          <div class="item-value" :title="groupInfo.groupNo">{{ groupInfo.groupNo }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属组织</div>
+          <div class="item-value" :title="groupInfo.deptName">{{ groupInfo.deptName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="groupInfo.createTime">{{ groupInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">设备数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.deviceCount">{{ groupInfo.deviceCount }}
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">订阅数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.subscribeCount">{{
+            groupInfo.subscribeCount }}
+          </div>
+        </div>
+        <div class="descriptions-item" style="width: 50%;">
+          <div class="item-label" style="width: 20%; border-top: none;">分组描述</div>
+          <div class="item-value" style="width: 80%; border-top: none;" :title="groupInfo.descn">{{ groupInfo.descn }}
+          </div>
+        </div>
+      </div>
+      <!-- <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="分组编号：">
               {{ groupInfo.groupNo }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第二列 -->
           <el-col :span="6">
             <el-form-item label="分组名称：">
               {{ groupInfo.groupName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第三列 -->
           <el-col :span="6">
             <el-form-item label="所属组织：">
               {{ groupInfo.deptName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第四列 -->
           <el-col :span="6">
             <el-form-item label="创建时间：">
               {{ groupInfo.createTime }}
             </el-form-item>
           </el-col>
         </el-row>
-
-        <!-- 第四行 -->
         <el-row :gutter="24">
           <el-col :span="20">
             <el-form-item label="分组描述：">
@@ -137,23 +175,67 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-
-      <el-divider style="margin: 10px 0;" />
-
-      <el-radio-group v-model="currentLabel" style="margin-top: 20px; margin-left: 20px;" @change="radioChangeHandler">
+      </el-form> -->
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
       <!-- 设备管理 -->
       <template v-if="current === 'group-device'">
-        <device-list-embedded :is-embedded="true" :group-id="id" />
+        <device-list-embedded :is-embedded="true" :group-id="id" @count="countDevice" />
       </template>
       <!-- 订阅管理 -->
       <template v-if="current === 'group-subscribe'">
         <!-- <detail-block :need-title="false" title=""> -->
-        <subscription-management :group-id="id" />
+        <subscription-management :group-id="id" @count="countSubscribe" />
         <!-- </detail-block> -->
       </template>
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/group/group-info.ts b/src/views/basic/group/group-info.ts
index 00bbef6..b190776 100644
--- a/src/views/basic/group/group-info.ts
+++ b/src/views/basic/group/group-info.ts
@@ -20,4 +20,6 @@
   descn: string // 分组描述
   createUserId: string
   createTime?: string
+  subscribeCount?: string
+  deviceCount?: string
 }
diff --git a/src/views/basic/group/list.vue b/src/views/basic/group/list.vue
index 2b8ee96..704e093 100644
--- a/src/views/basic/group/list.vue
+++ b/src/views/basic/group/list.vue
@@ -51,6 +51,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
diff --git a/src/views/basic/group/subscription.vue b/src/views/basic/group/subscription.vue
index 447b94e..becb7d0 100644
--- a/src/views/basic/group/subscription.vue
+++ b/src/views/basic/group/subscription.vue
@@ -15,6 +15,7 @@
     required: true,
   },
 })
+const emits = defineEmits(['count'])
 // 查询条件
 const searchQuery = ref({
   offset: 1,
@@ -53,9 +54,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSubscribeListPage({ ...searchQuery.value, groupId: props.groupId, }).then(res => {
-    console.log(res.data, '订阅管理列表')
+    // console.log(res.data, '订阅管理列表')
     total.value = res.data.total
     dataList.value = res.data.rows
+    emits('count', res.data.total)
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -142,7 +144,8 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="false" @search="fetchData">
       <search-item>
-        <el-select v-model="searchQuery.subscribeType" placeholder="设备类型" clearable style="width: 192px;" :loading="subscribeLoading">
+        <el-select v-model="searchQuery.subscribeType" placeholder="消息类型" clearable style="width: 192px;"
+          :loading="subscribeLoading">
           <el-option v-for="dict in subscribeTypeList" :key="dict.id" :label="dict.name" :value="dict.value" />
         </el-select>
       </search-item>

diff --git a/public/config/config.json b/public/config/config.json
index fbe695a..e13dd58 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,5 +1,41 @@
 {
-  "title":"物联网设备管理平台",
+  "title": "物联网设备管理平台",
   "english": "IoT device management platform",
-  "baseUrl": "http://111.198.10.15:11608"
+  "baseUrl": "http://111.198.10.15:11608",
+  "support": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "retryTimes": [
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "attemptsMax": [
+    "1",
+    "2",
+    "3",
+    "5",
+    "4",
+    "32"
+  ],
+  "collectInterval": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ],
+  "uploadPeriod": [
+    "3",
+    "4",
+    "5",
+    "32"
+  ]
 }
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index de34630..78227cd 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -82,3 +82,11 @@
   })
 }
 
+// 批量下发配置
+export function batchConfig(data: object) {
+  return request({
+    url: '/bus/config/addBatchConfig',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
deleted file mode 100644
index 0d8c350..0000000
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<script lang="ts" setup name="EditArea">
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-const dialogFormVisible = ref(false) // 对话框是否显示
-const dataForm = ref({
-}) // 表单
-
-// 重置表单
-
-const className = ref('')
-const info = ref<any>({})
-const resetForm = () => {
-  info.value = {
-  }
-}
-const initDialog = (row: any) => {
-  dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
-  className.value = grade
-  resetForm()
-  info.value = JSON.parse(JSON.stringify(row))
-  if (!info.value.alarmType.includes('浓度')) {
-    // console.log(info.value.value, 'info.value.value')
-    info.value.value = alarmValue[info.value.value] ? alarmValue[info.value.value] : '其他'
-  }
-  else {
-    info.value.value = `${info.value.value}${info.value.typeName.includes('燃气') || info.value.typeName.includes('哨兵') ? '%LEL' : ''}`
-  }
-  // const row = {
-  //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //   isSound: '1', // 报警音效，1:开，0:关
-  //   isSend: '1', // 报警推送，1:开，0:关
-  //   isText: '1', // 报警短息，1:开，0:关
-  //   alarmType: '浓度超限',
-  //   tagNumber: 'NX5702',
-  //   alarmTime: '2024-09-09',
-  //   value: '20',
-  //   typeName: '燃气智能终端',
-  //   alarmLevel: '一级',
-  // }
-}
-// 关闭
-const close = () => {
-  dialogFormVisible.value = false
-}
-// 关闭声音
-const { proxy } = getCurrentInstance() as any
-const closeSound = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-}
-// 查看
-const $router = useRouter()
-const detail = () => {
-  dialogFormVisible.value = false
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify({ ...info.value, id: info.value.alarmIds, type: 'alarm-dialog' }),
-      type: 'alarm-dialog'
-    },
-  })
-}
-defineExpose({
-  initDialog,
-})
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="600px"
-    :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
-    :close-on-click-modal="false">
-    <div class="title">
-      {{ info.alarmType }}
-    </div>
-    <div class="container-dialog">
-      <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmType">
-          {{ info.alarmType }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          设备类型
-        </el-col>
-        <el-col :span="8" class="value" :title="info.typeName">
-          {{ info.typeName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井位号
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagNumber">
-          {{ info.tagNumber }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          闸井名称
-        </el-col>
-        <el-col :span="8" class="value" :title="info.tagName">
-          {{ info.tagName }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警等级
-        </el-col>
-        <el-col :span="8" class="value" :title="info.alarmLevel">
-          {{ info.alarmLevel }}
-        </el-col>
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          <!-- 报警值 -->
-          {{ info.alarmType.includes('浓度') ? '报警值' : '报警原因' }}
-        </el-col>
-        <el-col :span="8" style="font-size: 20px;font-weight: 700;display: flex;align-items: center;" class="value" :title="info.value" >
-          {{ info.value }}
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="4" style="text-align: justify;text-align-last: justify;display: flex;align-items: center;">
-          报警时间
-        </el-col>
-        <el-col :span="20" class="value" :title="info.alarmTime">
-          {{ info.alarmTime }}
-          <span style="opacity: 0;">占位</span>
-        </el-col>
-      </el-row>
-      <!-- <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            报警类型:
-          </div>
-          <div class="value">
-            {{ info.alarmType }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            设备类型:
-          </div>
-          <div class="value">
-            {{ info.typeName }}
-          </div>
-        </div>
-      </div>
-      <div style="display: flex;justify-content: space-between;">
-        <div class="content">
-          <div class="name">
-            闸井位号:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-        <div class="content">
-          <div class="name">
-            闸井名称:
-          </div>
-          <div class="value">
-            {{ info.tagNumber }}
-          </div>
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警等级:
-        </div>
-        <div class="value">
-          {{ info.alarmLevel }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警值:
-        </div>
-        <div class="value">
-          {{ info.value }}
-          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          报警时间:
-        </div>
-        <div class="value">
-          {{ info.alarmTime }}
-        </div>
-      </div> -->
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
-          查看
-        </div>
-        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
-          关闭声音
-        </div>
-        <div class="btn info" @click="close">
-          关闭
-        </div>
-        <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
-          保存
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button> -->
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<!-- <style lang="scss" scoped></style> -->
-
-<style>
-.warning-dialog {
-  background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_one.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-.grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_two.png");
-}
-
-.grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_three.png");
-}
-
-.grade-other {
-  background-image: url("@/assets/global_images/warningDialog_other.png");
-}
-</style>
-
-<style lang="scss" scoped>
-.value {
-  overflow: hidden;
-
-  /* 确保超出的内容会被裁剪 */
-  white-space: nowrap;
-
-  /* 确保文本在一行内显示 */
-  text-overflow: ellipsis;
-  vertical-align: middle;
-
-  // display: flex;
-  // align-items: center;
-}
-
-.title {
-  position: absolute;
-  font-size: 22px;
-  font-weight: 700;
-  color: #fff;
-  top: 8px;
-  left: 75px;
-}
-
-.container-dialog {
-  width: 90%;
-  margin: 0 auto;
-  margin-top: 10px;
-  // margin: 0 auto;
-  // padding-left: 30px;
-  color: #f1eded;
-  font-size: 16px;
-  font-weight: 600;
-
-  .content {
-    display: flex;
-    margin: 10px 0;
-
-    .value {
-      padding-left: 10px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.dialog-footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-evenly;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  padding: 0 40px;
-
-  .btn {
-    width: 24%;
-    border: 1px solid #f1eded;
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-    color: #faf5f5;
-
-    &:hover {
-      cursor: pointer;
-      color: rgb(115 184 240);
-    }
-  }
-
-  .primary {
-    background-color: #dc0000;
-    border-radius: 6px;
-    border-color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-
-  .normal {
-    background-color: #fff;
-    border-color: #dc0000;
-    border-radius: 6px;
-    color: #dc0000;
-
-    &:hover {
-      cursor: pointer;
-      color: #dc0000;
-    }
-  }
-
-  .info {
-    background-color: #999;
-    border-radius: 6px;
-    border-color: #999;
-    color: #fff;
-
-    &:hover {
-      cursor: pointer;
-      color: #fff;
-    }
-  }
-}
-</style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
deleted file mode 100644
index e1ba9fd..0000000
--- a/src/layouts/components/Tools/alarmList.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<script lang="ts" setup name="AlarmList">
-import alarmDialog from './alarmDialog.vue'
-import useSocket from '@/store/modules/websocket'
-import { getAlarmList } from '@/api/home/dashboard/index'
-import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
-import { fetchCacheDevice, fetchCacheWell, fetchCacheStation, fetchCacheDept, fetchCacheWell95 } from '@/utils/sessionData'
-import indexDB from '@/utils/indexDB'
-import { alarmValue } from '@/views/home/alarm/current/components/dict'
-// 引入音频文件
-import alarmAudio from '@/assets/audio/alarm.mp3'
-import otherAudio from '@/assets/audio/other.mp3'
-import useUserStore from '@/store/modules/user'
-const { proxy } = getCurrentInstance() as any
-const messageList = ref<any[]>([])
-const alarmLevelList = ref<any[]>([])
-const socket = useSocket()
-const loading = ref(true)
-const $emits = defineEmits(['close'])
-// setTimeout(() => {
-//   messageList.value = [
-//     {
-//       id: '1',
-//       title: '燃气浓度超限',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-06-29 12:05:00',
-//       grade: '1',
-//     },
-//     {
-//       id: '2',
-//       title: '桩倾斜报警',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '2',
-//       time: '2024-03-21 13:03:01',
-//       grade: '2',
-//     },
-//     {
-//       id: '3',
-//       title: '设备故障',
-//       device: '燃气智能监测终端',
-//       code: 'N57G215',
-//       alarmValue: '浓度12%vol',
-//       readStatus: '1',
-//       time: '2024-02-29 02:05:40',
-//       grade: '3',
-//     },
-//   ]
-// })
-defineExpose({ messageList })
-const userStore = useUserStore()
-// 查看更多
-const $router = useRouter()
-const moreList = () => {
-  $router.push({
-    name: 'AlarmCurrent',
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-// 查看当前行
-const detailRow = (row: any) => {
-  // console.log(row, 'row')
-  if (!proxy.hasPerm('/alarm/current')) { return }
-  $router.push({
-    name: 'AlarmCurrent',
-    query: {
-      row: JSON.stringify(row),
-      type: 'alarm-pop'
-    },
-  })
-  // 通知关闭popover
-  $emits('close')
-}
-const play = () => {
-  if (!localStorage.getItem('eventAudio')) {
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
-      proxy.playAudio()
-    }
-  }
-  else {
-    proxy.pauseAudio()
-    localStorage.setItem('eventAudio', 'pause')
-  }
-}
-const dialogRef = ref()
-const pause = () => {
-  proxy.pauseAudio()
-  localStorage.setItem('eventAudio', 'pause')
-  // const row = {
-  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
-  //     isSound: '1', // 报警音效，1:开，0:关
-  //     isSend: '1', // 报警推送，1:开，0:关
-  //     isText: '1', // 报警短息，1:开，0:关
-  //     alarmType: '超限',
-  //     tagNumber: 'NX5702',
-  //     alarmTime: '2024-09-09',
-  //     value: '20',
-  //     typeName: '燃气智能终端燃气智能终端',
-  //     alarmLevel: '一级',
-  //   }
-  //   dialogRef.value.initDialog(row)
-}
-
-const fetchData = (isLoading = false) => {
-  loading.value = true
-  if (isLoading) {
-    loading.value = false
-  }
-  if(window.localStorage.getItem('browser-type-bj-well') === 'mobile') {
-    loading.value = false
-    return
-  }
-  getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1' && item.processStatus === '1')) {
-      const audio = document.getElementById('eventAudio') as HTMLAudioElement
-      // if (messageList.value.some((item: any) => item.alarmReason.includes('断线') && item.isSound === '1' && item.processStatus === '1')) {
-      //   audio.setAttribute('src', alarmAudio)
-      // }
-      // else {
-        audio.setAttribute('src', otherAudio)
-      // }
-      proxy.playAudio()
-      localStorage.setItem('eventAudio', '')
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-}
-watch(() => socket.data, (newVal: any) => {
-  if (newVal && newVal.alarmNoteMethod) {
-    // console.log(userStore.dataScope, 'userStore.dataScope')
-    if (newVal.alarmNoteMethod === '1' && (userStore.dataScope || []).includes(newVal.deptid)) {
-
-      dialogRef.value.initDialog(newVal)
-    }
-    // if (newVal.isSound === '1') {
-    //   proxy.playAudio()
-    //   localStorage.setItem('eventAudio', '')
-    // }
-    fetchData(false)
-    if (indexDB.getStatus() && window.localStorage.getItem('browser-type-bj-well') === 'pc') {
-      // 重新拉取缓存
-      fetchCacheDevice()
-      fetchCacheWell()
-      fetchCacheWell95()
-      fetchCacheStation()
-    }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
-const timer = ref()
-const clearTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value)
-    timer.value = null
-  }
-}
-onMounted(() => {
-  getAlarmLevelListPage({ offset: 1, limit: 999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-    fetchData()
-    socket.initWebSocket()
-  })
-  // 启动定时器
-  clearTimer()
-  timer.value = setInterval(() => {
-    getAlarmList({ }).then((res) => {
-    messageList.value = res.data.rows.map((item: any) => ({
-      ...item,
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
-      alarmReason: item.alarmType.includes('浓度') ? `${item.alarmValue}%LEL` : (alarmValue[item.alarmValue] || '其他')
-    }))
-    loading.value = false
-    // 暂停
-    if (messageList.value.length > 0 && messageList.value.every((item: any) => item.processStatus !== '1')) {
-      pause()
-    }
-  }).catch(() => {
-    loading.value = false
-  })
-  }, 1000* 60 * 2);
-})
-// onUnmounted(() => {
-//   socket.destroyWebSocket()
-// })
-onBeforeUnmount(() => {
-  socket.destroyWebSocket()
-  clearTimer()
-})
-// 页面关闭删除token 为的是先登录(页面产生交互)
-// window.onbeforeunload = function (event: any) {
-//   // eslint-disable-next-line no-mixed-operators
-//   if (event.clientX > document.body.clientWidth && event.clientY < 0 || event.altKey) {
-//     // alert("你关闭了浏览器");
-//     console.log('关闭')
-//   }
-//   else {
-//     // alert("你正在刷新页面");
-//     console.log('刷新')
-//     window.localStorage.removeItem('token')
-//   }
-// }
-// const { proxy } = getCurrentInstance() as any
-</script>
-
-<template>
-  <div class="message-container">
-    <alarm-dialog ref="dialogRef" />
-    <div v-show="messageList.length" class="message-title">
-      报警({{ messageList.length }})
-    </div>
-    <el-scrollbar max-height="400px">
-      <div v-if="!messageList.length">
-        <el-empty :image-size="50" description="暂无报警" />
-      </div>
-      <template v-else>
-        <div v-for="message of messageList" :key="message.id" class="message-item">
-          <div class="message-content" @click="detailRow(message)">
-            <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
-              <div class="container">
-                <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
-                  22
-                </div>
-                <div class="mar mar1">
-                  {{ message.alarmType }}
-                </div>
-                <div class="mar">
-                  {{ message.ts }}
-                </div>
-              </div>
-              <div class="tag">
-                <el-tag :type="message.processStatus !== '1' ? 'success' : 'warning'" size="small">
-                  {{ message.processStatus
-                    === '1' ? '未读' : '已读' }}
-                </el-tag>
-                <!-- <el-tag type="info" size="small" style="margin-left: 5px;" @click="detailRow(message)">
-                  查看
-                </el-tag> -->
-              </div>
-            </div>
-            <div class="time">
-              <div>
-                {{ message.ledgerNumber }}
-                <span v-if="message.ledgerNumber">
-                  |
-                </span>
-
-                {{ message.devTypeName }}
-                <span v-if="message.devTypeName">
-                  |
-                </span>
-                {{ message.alarmReason }}
-                <!-- 单位 -->
-                <!-- <span v-if="message.alarmValue">
-                  {{ (message?.alarmContent || '').includes('燃气') ? '%LEL' : '' }}
-                </span> -->
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </el-scrollbar>
-    <div v-if="messageList.length" class="message-footer">
-      <div class="close1" @click="pause">
-        关闭声音
-      </div>
-      <!-- <div class="close" @click="dialog">
-        弹窗
-      </div> -->
-      <div v-if="proxy.hasPerm('/alarm/current')" class="more" @click="moreList">
-        查看更多
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.message-container {
-  width: 100%;
-  padding: 0 5px;
-  overflow-x: hidden;
-
-  .message-title {
-    width: 100%;
-    text-align: center;
-    padding-bottom: 10px;
-    font-size: 14px;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .message-item {
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 8px 5px;
-    cursor: pointer;
-    width: 100%;
-    display: inline-block;
-
-    &:hover {
-      background-color: #f6f6f6;
-    }
-
-    .title {
-      display: flex;
-      font-size: 12px;
-      // display: inline-block;
-      width: 100%;
-      flex-wrap: nowrap;
-
-      // width: 70%;
-      // display: flex;
-      .container {
-        align-items: center;
-        width: 85%;
-        display: flex;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-
-        /* 超出的文本部分显示为省略号 */
-        .circle {
-          // flex: 1;
-          width: 12px !important;
-          height: 12px !important;
-          border-radius: 50%;
-          color: transparent;
-        }
-      }
-
-      .tag {
-        width: 10%;
-        display: flex;
-      }
-
-      .mar {
-        margin: 0 5px;
-      }
-
-      .mar1 {
-        width: 60%;
-        display: inline-block;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-
-    .circle-1 {
-      background-color: #f56c6c;
-    }
-
-    .circle-2 {
-      background-color: #ee9611;
-    }
-
-    .circle-3 {
-      background-color: #ffd700;
-    }
-
-    .circle-other {
-      background-color: #8dc6ea;
-    }
-
-    .icon {
-      width: 26px;
-      height: 26px;
-      margin-right: 10px;
-      border-radius: 40px;
-      color: #fff;
-      background-color: var(--el-color-primary);
-      padding: 4px;
-    }
-
-    .message-content {
-      // flex: 1;
-      font-size: 14px;
-
-      .time {
-        margin-top: 3px;
-        font-size: 12px;
-        color: #888;
-        overflow: hidden;
-
-        /* 确保超出的内容会被裁剪 */
-        white-space: nowrap;
-
-        /* 确保文本在一行内显示 */
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .message-footer {
-    // margin-top: 10px;
-    line-height: 2;
-    text-align: center;
-    cursor: pointer;
-    display: flex;
-    // justify-content: space-around;
-
-    .close1 {
-      border: 1px solid #ddd;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-
-    .more {
-      // border-left: 0.5px solid #ddd;
-      border: 1px solid #ddd;
-      border-top-color: transparent;
-      flex: 1;
-      width: 50%;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/main.ts b/src/main.ts
index eff833e..d1d463c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -31,6 +31,16 @@
   app.config.globalProperties.hasPerm = hasPermission
   app.config.globalProperties.buttonPerm = buttonPerm
   app.config.globalProperties.dayjs = dayjs
+  // 支持下发配置的设备类型
+  app.config.globalProperties.support = result.data.support
+  // 支持配置参数-重传次数的设备类型
+  app.config.globalProperties.retryTimes = result.data.retryTimes
+  // 支持配置参数-最大尝试次数的设备类型
+  app.config.globalProperties.attemptsMax = result.data.attemptsMax
+  // 支持配置参数-采集间隔的设备类型
+  app.config.globalProperties.collectInterval = result.data.collectInterval
+  // 支持配置参数-上传周期的设备类型
+  app.config.globalProperties.uploadPeriod = result.data.uploadPeriod
   // app.use(print)
   app.use(ElementPlus)
   app.use(pinia)
diff --git a/src/views/basic/device/addDeviceDialog.vue b/src/views/basic/device/addDeviceDialog.vue
index efd2bf7..ad121ec 100644
--- a/src/views/basic/device/addDeviceDialog.vue
+++ b/src/views/basic/device/addDeviceDialog.vue
@@ -8,6 +8,7 @@
 import { getProductListPage } from '@/api/basic/product'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDictByCode } from '@/api/system/dict'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['recordSaved'])
 const $props = defineProps({
   needGroup: {
@@ -86,7 +87,7 @@
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
-
+      $bus.emit('refresh-devicelist')
       emit('recordSaved')
       resetForm()
     }
diff --git a/src/views/basic/device/batchconfig.vue b/src/views/basic/device/batchconfig.vue
index e1aa6e1..3d6814f 100644
--- a/src/views/basic/device/batchconfig.vue
+++ b/src/views/basic/device/batchconfig.vue
@@ -6,6 +6,8 @@
 <script name="BatchConfigDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
+import { getDeviceListPage, batchConfig } from '@/api/basic/device'
+import $bus from '@/utils/eventBus'
 const emit = defineEmits(['refresh'])
 const $props = defineProps({
   deviceType: {
@@ -13,9 +15,10 @@
     default: ''
   },
 })
+const { proxy } = getCurrentInstance() as any
 const formRef = ref()
 const showDialog = ref(false)
-const configInfo = ref({
+const configInfo = ref<{ [key: string]: string }>({
   deviceId: '',
   deviceCode: '',
   percent: '', // 报警阈值
@@ -27,6 +30,10 @@
   deviceType: '',
   collectInterval: '', // 采集间隔
   uploadPeriod: '', // 上传周期
+  configType: '', // 配置类型
+  collectTime: '',  // 3/5
+  sleepStartTime: '', // 5
+  threshold: '',   // 5
 })
 const validateCollectInterval = (rule: any, value: any, callback: any) => {
   if (value === '') {
@@ -47,34 +54,84 @@
   percent: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '设备类型不能为空', trigger: ['blur', 'change'] }],
   uploadPeriod: [{ required: true, message: '上传周期不能为空', trigger: ['blur', 'change'] }],
+  configType: [{ required: true, message: '配置类型不能为空', trigger: ['blur', 'change'] }],
+  collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   3/5
+  sleepStartTime: [{ required: true, message: '睡眠时间不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
+  threshold: [{ required: true, message: '报警阈值不能为空', trigger: ['blur', 'change'] }],  // 18:03   5
   collectInterval: [{ required: true, validator: validateCollectInterval, trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-const initDialog = () => {
+const isDisabled = ref(false)
+const initDialog = (config: any) => {
   showDialog.value = true
-
+  if (config.devcode) {
+    isDisabled.value = true
+    setTimeout(() => {
+      formRef.value?.resetFields()
+      configInfo.value.deviceCode = [config.devcode]
+      configInfo.value.deviceType = `${config.deviceType}`
+    }, 100);
+  }
+  else {
+    isDisabled.value = false
+    // 清空表单
+    configInfo.value = {
+      deviceId: '',
+      deviceCode: '',
+      percent: '', // 报警阈值
+      installHeight: '', // 安装高度
+      attemptsMax: '3', // 做大尝试次数
+      retryTimes: '3', // 重传次数
+      ip: '',
+      port: '',
+      deviceType: '',
+      collectInterval: '', // 采集间隔
+      uploadPeriod: '', // 上传周期
+      configType: '', // 配置类型
+      collectTime: '',  // 3/5
+      sleepStartTime: '', // 5
+      threshold: '',   // 5
+    }
+    formRef.value?.resetFields()
+  }
 }
 const close = () => {
   showDialog.value = false
 }
-defineExpose({
-  initDialog,
-})
+
 
 const loadingBtn = ref(false)
+const jsonDict = {
+  '4': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '32': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '1': ['percent', 'installHeight', 'attemptsMax', 'retryTimes', 'ip', 'port'],
+  '2': ['attemptsMax', 'retryTimes', 'ip', 'port'],
+  '3': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime'],
+  '5': ['uploadPeriod', 'collectInterval', 'attemptsMax', 'retryTimes', 'ip', 'port', 'collectTime', 'sleepStartTime', 'threshold'],
+} as { [key: string]: string[] }
 // 保存
 const saveForm = async () => {
   if (!formRef.value) { return }
   formRef.value?.validate((valid: boolean) => {
     if (valid) {
-      // btnLoading.value = true;
-      // (dialogStatus.value === 'create' ? addpackage : editpackage)({...packageInfo.value,groupId: $route.query.id}).then(res => {
-      //   ElMessage.success(`${dialogStatus.value === 'create' ? '添加' : '修改'}成功`)
-      //   dialogVisible.value = false
-      //   $emits('closeRefresh')
-      //   btnLoading.value = false
-      // }).catch(() => {
-      //   btnLoading.value = false
-      // })
+      // 生成json对象
+      let obj = {} as { [key: string]: string }
+      for (const i in jsonDict[configInfo.value.deviceType]) {
+        obj[jsonDict[configInfo.value.deviceType][i]] = configInfo.value[jsonDict[configInfo.value.deviceType][i]]
+      }
+      const data = {
+        configJson: JSON.stringify(obj),
+        configType: configInfo.value.configType, // 配置类型
+        devcodeList: configInfo.value.deviceCode
+      }
+      loadingBtn.value = true
+      batchConfig(data).then(res => {
+        showDialog.value = false
+        loadingBtn.value = false
+        ElMessage.success(`操作成功`)
+        emit('refresh')
+      }).catch(() => {
+        loadingBtn.value = false
+      })
     }
   })
 
@@ -82,70 +139,155 @@
 
 
 const deviceList = ref([])
+const configTypeList = ref([])
+const deviceAllList = ref([])
 const deviceTypeList = ref([])
+
 const fetchDict = () => {
+  // 设备类型列表
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
-      deviceTypeList.value = res.data
-      console.log(deviceTypeList.value, 'deviceTypeList.value')
+      deviceTypeList.value = res.data.filter((item: any) => proxy.support.includes(item.value))
+    }
+  })
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+  // 配置类型
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeList.value = res.data
     }
   })
 }
 fetchDict()
+defineExpose({
+  initDialog,
+  fetchDict
+})
+$bus.on('refresh-devicelist', () => {
+  // 设备列表
+  getDeviceListPage({ offset: 1, limit: 999999 }).then(res => {
+    deviceList.value = JSON.parse(JSON.stringify(res.data.rows))
+    deviceAllList.value = JSON.parse(JSON.stringify(res.data.rows))
+  })
+})
 const computeOptions = (val: any[]) => {
-  return val.map((item: any) => ({ label: `${item.name}-${item.value}`, value: item.value }))
+  return val.map((item: any) => ({ label: `${item.devcode}`, value: item.devcode }))
 }
+
+watch(() => configInfo.value.deviceType, (newValue) => {
+  if (isDisabled.value) {
+    return
+  }
+  configInfo.value.deviceId = ''
+  configInfo.value.deviceCode = ''
+  if (newValue) {
+    deviceList.value = deviceAllList.value.filter((item: any) => item.deviceType === newValue)
+  }
+  else {
+    deviceList.value = deviceAllList.value
+  }
+})
+// 是否展示重传次数
+const showRetryTimes = computed(() => {
+  return (type: string) => {
+    return proxy.retryTimes.includes(type)
+  }
+})
+// 是否展示最大尝试次数
+const showAttemptsMax = computed(() => {
+  return (type: string) => {
+    return proxy.attemptsMax.includes(type)
+  }
+})
+// 是否展示采集间隔
+const showCollectInterva = computed(() => {
+  return (type: string) => {
+    return proxy.collectInterval.includes(type)
+  }
+})
+// 是否展示上传周期
+const showUploadPeriod = computed(() => {
+  return (type: string) => {
+    return proxy.uploadPeriod.includes(type)
+  }
+})
 </script>
 
 <template>
 
   <el-dialog v-model="showDialog" title="批量下发配置" :append-to-body="true" :close-on-click-modal="false" :modal="true">
-    <el-form ref="dataFormRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
+    <el-form ref="formRef" :rules="configInfoRules" :model="configInfo" label-width="110px">
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" style="width: 100%;" clearable filterable>
+            <el-select v-model="configInfo.deviceType" placeholder="选择设备类型" :disabled="isDisabled" style="width: 100%;" clearable filterable>
               <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="设备编号" prop="deviceCode">
-            <el-select-v2 v-model="configInfo.deviceCode" multiple :options="computeOptions(deviceList)"
+            <el-select-v2 v-model="configInfo.deviceCode" :disabled="isDisabled" multiple collapse-tags :options="computeOptions(deviceList)"
               style="width: 100%;" clearable filterable>
             </el-select-v2>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showRetryTimes(configInfo.deviceType)" :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input v-model="configInfo.retryTimes" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.retryTimes" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col v-if="showAttemptsMax(configInfo.deviceType)" :span="12">
           <el-form-item label="最大尝试次数" prop="attemptsMax">
-            <el-input v-model="configInfo.attemptsMax" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.attemptsMax" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'" :span="12">
+        <el-col v-if="showCollectInterva(configInfo.deviceType)" :span="12">
           <el-form-item label="采集间隔(分)" prop="collectInterval">
-            <el-input v-model="configInfo.collectInterval" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.collectInterval" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType !== '液位'"  :span="12">
+        <el-col v-if="showUploadPeriod(configInfo.deviceType)" :span="12">
           <el-form-item label="上传周期(分)" prop="uploadPeriod">
-            <el-input v-model="configInfo.uploadPeriod" type="number" clearable style="width: 100%;" />
+            <el-input v-model="configInfo.uploadPeriod" type="number" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="报警阈值(%)" prop="percent">
             <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col v-if="configInfo.deviceType === '液位'" :span="12">
+        <el-col v-if="configInfo.deviceType === '1'" :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model="configInfo.installHeight" type="number" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <!-- <el-col v-if="configInfo.deviceType === '1'" :span="12">
+          <el-form-item label="报警阈值(%)" prop="percent">
+            <el-input v-model="configInfo.percent" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col> -->
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="报警阈值" prop="threshold">
+            <el-input v-model="configInfo.threshold" type="number" clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5' || configInfo.deviceType === '3'" :span="12">
+          <el-form-item label="采集时间" prop="collectTime">
+            <el-time-picker v-model="configInfo.collectTime" format="HH:mm" value-format="HH:mm" placeholder="选择采集时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="configInfo.deviceType === '5'" :span="12">
+          <el-form-item label="睡眠时间" prop="sleepStartTime">
+            <el-time-picker v-model="configInfo.sleepStartTime" format="HH:mm" value-format="HH:mm" placeholder="选择睡眠时间"
+              clearable style="width: 100%;" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="configInfo.ip" clearable style="width: 100%;" />
@@ -156,6 +298,13 @@
             <el-input v-model="configInfo.port" clearable style="width: 100%;" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="配置类型" prop="configType">
+            <el-select v-model="configInfo.configType" placeholder="选择配置类型" style="width: 100%;" clearable filterable>
+              <el-option v-for="item in configTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
index 4b56077..acc1c05 100644
--- a/src/views/basic/device/configList.vue
+++ b/src/views/basic/device/configList.vue
@@ -9,12 +9,16 @@
 import { exportFile } from '@/utils/exportUtils'
 import { delDevice, exportDevice } from '@/api/basic/device'
 import { getDeviceConfigListPage } from '@/api/basic/config'
-
+import batchconfig from './batchconfig.vue'
 const props = defineProps({
   devcode: {
     type: String,
     default: '',
   },
+  deviceType: {
+    type: String,
+    default: '',
+  },
 })
 
 const router = useRouter()
@@ -115,6 +119,11 @@
 const searchList = () => {
   fetchData(true)
 }
+// 批量下发配置
+const batchConfigRef = ref()
+const bacthConfig = () => {
+  batchConfigRef.value.initDialog({devcode: props.devcode, deviceType: props.deviceType})
+}
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -202,10 +211,13 @@
   await getDict()
   searchList()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
   <app-container>
+    <!-- 批量下发配置弹窗 -->
+    <batchconfig ref="batchConfigRef" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
@@ -223,16 +235,17 @@
       </search-item>
 
       <search-item>
-        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）"
+          end-placeholder="操作时间（结束）" />
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="设备列表">
+    <table-container title="配置列表">
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="exportDevice">
-          批量下发配置
+        <el-button v-if="proxy.support.includes(`${props.deviceType}`)" type="primary" @click="bacthConfig">
+          下发配置
         </el-button>
         <el-button type="primary" @click="exportAllDevice">
           导出列表
@@ -240,11 +253,8 @@
       </template>
 
       <!-- 表格区域 -->
-      <normal-table
-        :data="dataList" :columns="columns" :total="total"
-        :query="searchQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="dataList" :columns="columns" :total="total" :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
index ec6c441..a1468aa 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -152,14 +152,16 @@
 const loading = ref(true)
 const detailById = (id: string) => {
   loading.value = true
-  detailDevice({ id }).then((res) => {
-    if (res.code === 200) {
-      deviceInfo.value = res.data
-    }
-    loading.value = false
-  }).catch(() => {
-    loading.value = false
-  })
+  // detailDevice({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     deviceInfo.value = res.data
+  //   }
+  deviceInfo.value = JSON.parse(route.query.row as string)
+  console.log(deviceInfo.value, 'deviceInfo.value')
+  loading.value = false
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 
   detailDeviceConfig(id).then((res) => {
     if (res.code === 200) {
@@ -213,86 +215,115 @@
           关闭
         </el-button>
       </template>
-
-      <el-form v-loading="loading" ref="basicFormRef" :model="deviceInfo" label-position="left" label-width="110px"
-        stripe>
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="设备编号：">
-              {{ deviceInfo.devcode }}
-            </el-form-item>
-            <el-form-item label="设备IMEI：">
-              {{ deviceInfo.imei }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第二列 -->
-          <el-col :span="6">
-            <el-form-item label="所属产品：">
-              {{ deviceInfo.productName }}
-            </el-form-item>
-
-            <el-form-item label="ICCID：">
-              {{ deviceInfo.iccid }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="设备类型：">
-              {{ deviceInfo.deviceTypeName }}
-            </el-form-item>
-
-            <el-form-item label="加密方式：">
-              {{ deviceInfo.encipherTypeName }}
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="设备型号：">
-              {{ deviceInfo.modelName }}
-            </el-form-item>
-
-            <el-form-item label="创建时间：">
-              {{ deviceInfo.createTime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;">
-          <el-col :span="18">
-            <el-form-item label="当前配置：">
-              <el-tag v-for="item in configItemList" :key="item.idx" size="large" style="margin-right: 10px;">
-                {{ item.text }} : {{ item.value }}
-              </el-tag>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="收到时间：">
-              {{ deviceConfig.logtime }}
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">设备编号</div>
+          <div class="item-value" :title="deviceInfo.devcode">{{ deviceInfo.devcode }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备类型</div>
+          <div class="item-value" :title="deviceInfo.deviceTypeName">{{ deviceInfo.deviceTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备型号</div>
+          <div class="item-value" :title="deviceInfo.model">{{ deviceInfo.model }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属产品</div>
+          <div class="item-value" :title="deviceInfo.productName">{{ deviceInfo.productName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属分组</div>
+          <div class="item-value" :title="deviceInfo.groupName">{{ deviceInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">设备IMEI</div>
+          <div class="item-value" :title="deviceInfo.imei">{{ deviceInfo.imei }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">加密方式</div>
+          <div class="item-value" :title="deviceInfo.encipherTypeName">{{ deviceInfo.encipherTypeName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="deviceInfo.createTime">{{ deviceInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item" style="width: 75%;">
+          <div class="item-label" style="width: 13.32%;">当前配置</div>
+          <div class="item-value" style="width: 86.68%;">
+            <el-tag v-for="item in configItemList" :key="item.idx" size="small" style="margin-right: 10px;">
+              {{ item.text }} : {{ item.value }}
+            </el-tag>
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">收到时间</div>
+          <div class="item-value" :title="deviceConfig.logtime">{{ deviceConfig.logtime }}</div>
+        </div>
+      </div>
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
 
       <template v-if="current === 'device-data'">
         <data-query-list :embedded="true" :dev-code="deviceInfo.devcode" />
       </template>
 
       <template v-if="current === 'device-config'">
-        <device-config-list :devcode="deviceInfo.devcode" />
+        <device-config-list :devcode="deviceInfo.devcode" :device-type="deviceInfo.deviceType" />
       </template>
 
       <!-- <template v-if="current === 'device-cell'">
         <DeviceElectricityList :devcode="deviceInfo.devcode" />
       </template> -->
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
index a89a9be..ed365f4 100644
--- a/src/views/basic/device/list.vue
+++ b/src/views/basic/device/list.vue
@@ -12,6 +12,7 @@
 import { getDeviceLatestBizData } from '@/api/data/query'
 import AddDeviceDialog from './addDeviceDialog.vue'
 import batchconfig from './batchconfig.vue'
+import $bus from '@/utils/eventBus'
 import axios from 'axios'
 const route = useRoute()
 const router = useRouter()
@@ -43,16 +44,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '状态', value: 'statusName', align: 'center', width: '80' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
-  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
-  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
-  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
-  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
-  { text: '最新数据', value: 'dataValue', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '170' },
-  { text: '最新上线时间', value: 'logtime', align: 'center', width: '170' },
+  { text: '状态', value: 'statusName', align: 'center', width: '70' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '140' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '170' },
+  { text: '设备型号', value: 'model', align: 'center', width: '170' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '150' },
+  { text: '所属分组', value: 'groupName', align: 'center', width: '150' },
+  { text: 'IMEI', value: 'imei', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center', width: '90' },
+  { text: '最新数据', value: 'dataValue', align: 'center', width: '90' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '165' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '165' },
 ])
 const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
 
@@ -110,6 +112,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
@@ -129,6 +132,7 @@
     batchImportDevice(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        $bus.emit('refresh-devicelist')
         loading.close()
         fileRef.value.value = ''
         fetchData(true)
@@ -173,15 +177,15 @@
     calcTableHeight()
     loadingTable.value = false
 
-    dataList.value.forEach((item) => {
-      getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
-        if (res.code === 200) {
-          item.dataValue = res.data.value
-          item.logtime = res.data.logtime
-          item.cell = res.data.cell
-        }
-      })
-    })
+    // dataList.value.forEach((item) => {
+    //   getDeviceLatestBizData({ devCode: item.devcode }).then((res) => {
+    //     if (res.code === 200) {
+    //       item.dataValue = res.data.value
+    //       item.logtime = res.data.logtime
+    //       item.cell = res.data.cell
+    //     }
+    //   })
+    // })
   }).catch(() => {
     loadingTable.value = false
   })
@@ -308,7 +312,7 @@
 onMounted(async () => {
   await getDict()
   // 点击首页的低电量表格标题跳转过来
-  if(route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
+  if (route.query.fromPage === 'dashboard' && route.query.queryType === 'lowBattery') {
     cell.value = 1 as any
     searchQuery.value.beginCell = '0'
     searchQuery.value.endCell = '10'
@@ -355,7 +359,7 @@
   <app-container>
     <add-device-dialog ref="refAddDeviceDialog" :needGroup="true" @record-saved="searchList" />
     <!-- 批量下发配置弹窗 -->
-    <batchconfig ref="batchConfigRef" />
+    <batchconfig ref="batchConfigRef" @refresh="searchList" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
diff --git a/src/views/basic/device/listEmbedded.vue b/src/views/basic/device/listEmbedded.vue
index 2ac3773..cb84aef 100644
--- a/src/views/basic/device/listEmbedded.vue
+++ b/src/views/basic/device/listEmbedded.vue
@@ -16,7 +16,7 @@
     required: true,
   },
 })
-
+const emits = defineEmits(['count'])
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
@@ -173,6 +173,7 @@
         }
       })
       total.value = parseInt(response.data.total)
+      emits('count', response.data.total)
     }
     loadingTable.value = false
   }).catch(() => {
diff --git a/src/views/basic/group/addSubscribeDialog.vue b/src/views/basic/group/addSubscribeDialog.vue
index fe4ab6d..b827af9 100644
--- a/src/views/basic/group/addSubscribeDialog.vue
+++ b/src/views/basic/group/addSubscribeDialog.vue
@@ -145,8 +145,8 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="22">
-          <el-form-item label="订阅开关" prop="">
-            <el-switch v-model="subscribeInfo.value1" />
+          <el-form-item label="订阅开关" prop="enable">
+            <el-switch v-model="subscribeInfo.enable" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/basic/group/detail.vue b/src/views/basic/group/detail.vue
index 410fe14..4c292bf 100644
--- a/src/views/basic/group/detail.vue
+++ b/src/views/basic/group/detail.vue
@@ -31,6 +31,9 @@
   descn: '',
   createUserId: '',
   createTime: '',
+  deviceCount: '',
+  subscribeCount: '',
+
 })
 
 // 逻辑
@@ -53,12 +56,15 @@
 
 // 查询详情
 const detailById = (id: string) => {
-  detailGroup({ id }).then((res) => {
-    if (res.code === 200) {
-      groupInfo.value = res.data
-      groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
-    }
-  })
+  const data = JSON.parse(route.query.row as string)
+  // console.log(data, 'route')
+  groupInfo.value = data
+  // detailGroup({ id }).then((res) => {
+  //   if (res.code === 200) {
+  //     groupInfo.value = res.data
+  //     groupInfo.value.createTime = dayjs(groupInfo.value.createTime).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(groupInfo.value.createTime).format('YYYY-MM-DD HH:mm:ss')
+  //   }
+  // })
 }
 
 const initDialog = (params: any) => {
@@ -87,6 +93,13 @@
 onMounted(async () => {
   initDialog(route.query)
 })
+
+const countDevice = (number: string) => {
+  groupInfo.value.deviceCount = number
+}
+const countSubscribe = (number: string) => {
+  groupInfo.value.subscribeCount = number
+}
 </script>
 
 <template>
@@ -97,39 +110,64 @@
           关闭
         </el-button>
       </template>
-
-      <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
+      <!-- 描述列表 -->
+      <div class="descriptions">
+        <div class="descriptions-item">
+          <div class="item-label">分组名称</div>
+          <div class="item-value" :title="groupInfo.groupName">{{ groupInfo.groupName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">分组编号</div>
+          <div class="item-value" :title="groupInfo.groupNo">{{ groupInfo.groupNo }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">所属组织</div>
+          <div class="item-value" :title="groupInfo.deptName">{{ groupInfo.deptName }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label">创建时间</div>
+          <div class="item-value" :title="groupInfo.createTime">{{ groupInfo.createTime }}</div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">设备数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.deviceCount">{{ groupInfo.deviceCount }}
+          </div>
+        </div>
+        <div class="descriptions-item">
+          <div class="item-label" style="border-top: none;">订阅数量</div>
+          <div class="item-value" style="border-top: none;" :title="groupInfo.subscribeCount">{{
+            groupInfo.subscribeCount }}
+          </div>
+        </div>
+        <div class="descriptions-item" style="width: 50%;">
+          <div class="item-label" style="width: 20%; border-top: none;">分组描述</div>
+          <div class="item-value" style="width: 80%; border-top: none;" :title="groupInfo.descn">{{ groupInfo.descn }}
+          </div>
+        </div>
+      </div>
+      <!-- <el-form ref="basicFormRef" :model="groupInfo" label-position="right" label-width="110px" stripe>
         <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="分组编号：">
               {{ groupInfo.groupNo }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第二列 -->
           <el-col :span="6">
             <el-form-item label="分组名称：">
               {{ groupInfo.groupName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第三列 -->
           <el-col :span="6">
             <el-form-item label="所属组织：">
               {{ groupInfo.deptName }}
             </el-form-item>
           </el-col>
-
-          <!-- 第一行 第四列 -->
           <el-col :span="6">
             <el-form-item label="创建时间：">
               {{ groupInfo.createTime }}
             </el-form-item>
           </el-col>
         </el-row>
-
-        <!-- 第四行 -->
         <el-row :gutter="24">
           <el-col :span="20">
             <el-form-item label="分组描述：">
@@ -137,23 +175,67 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-
-      <el-divider style="margin: 10px 0;" />
-
-      <el-radio-group v-model="currentLabel" style="margin-top: 20px; margin-left: 20px;" @change="radioChangeHandler">
+      </el-form> -->
+    </detail-page>
+    <detail-block>
+      <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
         <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" />
       </el-radio-group>
+    </detail-block>
+    <detail-block>
       <!-- 设备管理 -->
       <template v-if="current === 'group-device'">
-        <device-list-embedded :is-embedded="true" :group-id="id" />
+        <device-list-embedded :is-embedded="true" :group-id="id" @count="countDevice" />
       </template>
       <!-- 订阅管理 -->
       <template v-if="current === 'group-subscribe'">
         <!-- <detail-block :need-title="false" title=""> -->
-        <subscription-management :group-id="id" />
+        <subscription-management :group-id="id" @count="countSubscribe" />
         <!-- </detail-block> -->
       </template>
-    </detail-page>
+    </detail-block>
   </app-container>
 </template>
+
+<style scoped lang="scss">
+// .fixed-content {
+//   display: block;
+//   width: 100px; /* 固定宽度 */
+//   overflow: hidden;
+//   text-overflow: ellipsis;
+//   white-space: nowrap;
+// }
+.descriptions {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+  .descriptions-item {
+    width: 25%;
+    display: flex;
+
+    .item-label {
+      width: 40%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      font-weight: bold;
+      color: #606266;
+      font-size: 14px;
+      background-color: #f5f7fa;
+    }
+
+    .item-value {
+      width: 60%;
+      text-align: center;
+      border: 1px solid #ebeef5;
+      padding: 8px 11px;
+      color: #303133;
+      font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/basic/group/group-info.ts b/src/views/basic/group/group-info.ts
index 00bbef6..b190776 100644
--- a/src/views/basic/group/group-info.ts
+++ b/src/views/basic/group/group-info.ts
@@ -20,4 +20,6 @@
   descn: string // 分组描述
   createUserId: string
   createTime?: string
+  subscribeCount?: string
+  deviceCount?: string
 }
diff --git a/src/views/basic/group/list.vue b/src/views/basic/group/list.vue
index 2b8ee96..704e093 100644
--- a/src/views/basic/group/list.vue
+++ b/src/views/basic/group/list.vue
@@ -51,6 +51,7 @@
     query: {
       type: 'detail',
       id: row.id,
+      row: JSON.stringify(row)
     },
     path: 'detail',
   })
diff --git a/src/views/basic/group/subscription.vue b/src/views/basic/group/subscription.vue
index 447b94e..becb7d0 100644
--- a/src/views/basic/group/subscription.vue
+++ b/src/views/basic/group/subscription.vue
@@ -15,6 +15,7 @@
     required: true,
   },
 })
+const emits = defineEmits(['count'])
 // 查询条件
 const searchQuery = ref({
   offset: 1,
@@ -53,9 +54,10 @@
 const fetchData = () => {
   loadingTable.value = true
   getSubscribeListPage({ ...searchQuery.value, groupId: props.groupId, }).then(res => {
-    console.log(res.data, '订阅管理列表')
+    // console.log(res.data, '订阅管理列表')
     total.value = res.data.total
     dataList.value = res.data.rows
+    emits('count', res.data.total)
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -142,7 +144,8 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="false" @search="fetchData">
       <search-item>
-        <el-select v-model="searchQuery.subscribeType" placeholder="设备类型" clearable style="width: 192px;" :loading="subscribeLoading">
+        <el-select v-model="searchQuery.subscribeType" placeholder="消息类型" clearable style="width: 192px;"
+          :loading="subscribeLoading">
           <el-option v-for="dict in subscribeTypeList" :key="dict.id" :label="dict.name" :value="dict.value" />
         </el-select>
       </search-item>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index b0e0fd3..f8d6c25 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,15 +2,20 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, type DateModelType } from 'element-plus'
-import groupPng from '@/assets/images/dashboard/group.png'
-import devicePng from '@/assets/images/dashboard/device.png'
-import productPng from '@/assets/images/dashboard/product.png'
-import dataPng from '@/assets/images/dashboard/data.png'
+// import groupPng from '@/assets/images/dashboard/group.png'
+// import devicePng from '@/assets/images/dashboard/device.png'
+// import productPng from '@/assets/images/dashboard/product.png'
+// import dataPng from '@/assets/images/dashboard/data.png'
 import { getDictByCode } from '@/api/system/dict'
 import { getGroupListPage } from '@/api/basic/group'
 import { getDeviceListPage } from '@/api/basic/device'
 const router = useRouter()
 
+
+const groupPng = new URL('@/assets/images/dashboard/group.png', import.meta.url)
+const devicePng = new URL('@/assets/images/dashboard/device.png', import.meta.url)
+const dataPng = new URL('@/assets/images/dashboard/data.png', import.meta.url)
+const productPng = new URL('@/assets/images/dashboard/product.png', import.meta.url)
 // 每个展示块高度
 const blockHeight = ref(300)
 // 上面概览数据