diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index ba7cc9d..cdff362 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -8,7 +8,7 @@
 import { getAlarmType, getAlarmTypeList } from '@/api/home/alarm/count'
 import { shortcuts } from '@/utils/common'
 const listQuery = ref({
-  timeType: '2',
+  timeType: '1',
   ledgerType: '',
   deptid: '',
   begTime: '',
@@ -101,6 +101,12 @@
     <template #search>
       <div class="search">
         <el-button
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('1')"
+        >
+          今日
+        </el-button>
+        <el-button
           :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index ba7cc9d..cdff362 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -8,7 +8,7 @@
 import { getAlarmType, getAlarmTypeList } from '@/api/home/alarm/count'
 import { shortcuts } from '@/utils/common'
 const listQuery = ref({
-  timeType: '2',
+  timeType: '1',
   ledgerType: '',
   deptid: '',
   begTime: '',
@@ -101,6 +101,12 @@
     <template #search>
       <div class="search">
         <el-button
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('1')"
+        >
+          今日
+        </el-button>
+        <el-button
           :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 0987798..9c992cd 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -181,6 +181,10 @@
 window.addEventListener('resize', () => {
   // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
   tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
+  const ele = document.getElementById('dragItem-width')
+  if (ele) {
+    ele.style.height = `${tableHeight.value}px`
+  }
 })
 // 查看报警
 const mapRef = ref()
@@ -361,9 +365,10 @@
     </search-area>
     <div style="width: 100%;display: flex;">
       <!-- 表头标题 -->
+      <!-- v-drag-width="100" -->
       <div
-        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
-        style="width: 100%;"
+        id="container-table" class="container-table"
+        :style="{ width: `${tableFlag === 'normal' ? '100%' : '75%'}` }"
       >
         <table-container
           :is-config="true" config-title="current-alarm" :columns="columns"
@@ -441,15 +446,15 @@
 
 <style lang="scss" scoped>
 .table {
-  width: 100% !important;
+  width: 100%;
 }
 
 .table-map {
-  width: 75% !important;
+  width: 75%;
 }
 
 .map {
-  width: 25% !important;
+  width: 25%;
   // background-color: antiquewhite;
 }
 

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index ba7cc9d..cdff362 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -8,7 +8,7 @@
 import { getAlarmType, getAlarmTypeList } from '@/api/home/alarm/count'
 import { shortcuts } from '@/utils/common'
 const listQuery = ref({
-  timeType: '2',
+  timeType: '1',
   ledgerType: '',
   deptid: '',
   begTime: '',
@@ -101,6 +101,12 @@
     <template #search>
       <div class="search">
         <el-button
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('1')"
+        >
+          今日
+        </el-button>
+        <el-button
           :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 0987798..9c992cd 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -181,6 +181,10 @@
 window.addEventListener('resize', () => {
   // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
   tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
+  const ele = document.getElementById('dragItem-width')
+  if (ele) {
+    ele.style.height = `${tableHeight.value}px`
+  }
 })
 // 查看报警
 const mapRef = ref()
@@ -361,9 +365,10 @@
     </search-area>
     <div style="width: 100%;display: flex;">
       <!-- 表头标题 -->
+      <!-- v-drag-width="100" -->
       <div
-        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
-        style="width: 100%;"
+        id="container-table" class="container-table"
+        :style="{ width: `${tableFlag === 'normal' ? '100%' : '75%'}` }"
       >
         <table-container
           :is-config="true" config-title="current-alarm" :columns="columns"
@@ -441,15 +446,15 @@
 
 <style lang="scss" scoped>
 .table {
-  width: 100% !important;
+  width: 100%;
 }
 
 .table-map {
-  width: 75% !important;
+  width: 75%;
 }
 
 .map {
-  width: 25% !important;
+  width: 25%;
   // background-color: antiquewhite;
 }
 
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 70a6eee..89db9e9 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -74,16 +74,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
 // DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
@@ -100,8 +100,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -109,8 +109,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const row = JSON.parse($route.query.row as string)
 if (row.deviceTypeName) {

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index ba7cc9d..cdff362 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -8,7 +8,7 @@
 import { getAlarmType, getAlarmTypeList } from '@/api/home/alarm/count'
 import { shortcuts } from '@/utils/common'
 const listQuery = ref({
-  timeType: '2',
+  timeType: '1',
   ledgerType: '',
   deptid: '',
   begTime: '',
@@ -101,6 +101,12 @@
     <template #search>
       <div class="search">
         <el-button
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('1')"
+        >
+          今日
+        </el-button>
+        <el-button
           :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 0987798..9c992cd 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -181,6 +181,10 @@
 window.addEventListener('resize', () => {
   // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
   tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
+  const ele = document.getElementById('dragItem-width')
+  if (ele) {
+    ele.style.height = `${tableHeight.value}px`
+  }
 })
 // 查看报警
 const mapRef = ref()
@@ -361,9 +365,10 @@
     </search-area>
     <div style="width: 100%;display: flex;">
       <!-- 表头标题 -->
+      <!-- v-drag-width="100" -->
       <div
-        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
-        style="width: 100%;"
+        id="container-table" class="container-table"
+        :style="{ width: `${tableFlag === 'normal' ? '100%' : '75%'}` }"
       >
         <table-container
           :is-config="true" config-title="current-alarm" :columns="columns"
@@ -441,15 +446,15 @@
 
 <style lang="scss" scoped>
 .table {
-  width: 100% !important;
+  width: 100%;
 }
 
 .table-map {
-  width: 75% !important;
+  width: 75%;
 }
 
 .map {
-  width: 25% !important;
+  width: 25%;
   // background-color: antiquewhite;
 }
 
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 70a6eee..89db9e9 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -74,16 +74,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
 // DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
@@ -100,8 +100,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -109,8 +109,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const row = JSON.parse($route.query.row as string)
 if (row.deviceTypeName) {
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 92e5f81..5319851 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -21,16 +21,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -43,8 +43,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -52,8 +52,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
   columns.value = columns1.value

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index ba7cc9d..cdff362 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -8,7 +8,7 @@
 import { getAlarmType, getAlarmTypeList } from '@/api/home/alarm/count'
 import { shortcuts } from '@/utils/common'
 const listQuery = ref({
-  timeType: '2',
+  timeType: '1',
   ledgerType: '',
   deptid: '',
   begTime: '',
@@ -101,6 +101,12 @@
     <template #search>
       <div class="search">
         <el-button
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('1')"
+        >
+          今日
+        </el-button>
+        <el-button
           :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 0987798..9c992cd 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -181,6 +181,10 @@
 window.addEventListener('resize', () => {
   // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
   tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
+  const ele = document.getElementById('dragItem-width')
+  if (ele) {
+    ele.style.height = `${tableHeight.value}px`
+  }
 })
 // 查看报警
 const mapRef = ref()
@@ -361,9 +365,10 @@
     </search-area>
     <div style="width: 100%;display: flex;">
       <!-- 表头标题 -->
+      <!-- v-drag-width="100" -->
       <div
-        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
-        style="width: 100%;"
+        id="container-table" class="container-table"
+        :style="{ width: `${tableFlag === 'normal' ? '100%' : '75%'}` }"
       >
         <table-container
           :is-config="true" config-title="current-alarm" :columns="columns"
@@ -441,15 +446,15 @@
 
 <style lang="scss" scoped>
 .table {
-  width: 100% !important;
+  width: 100%;
 }
 
 .table-map {
-  width: 75% !important;
+  width: 75%;
 }
 
 .map {
-  width: 25% !important;
+  width: 25%;
   // background-color: antiquewhite;
 }
 
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 70a6eee..89db9e9 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -74,16 +74,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
 // DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
@@ -100,8 +100,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -109,8 +109,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const row = JSON.parse($route.query.row as string)
 if (row.deviceTypeName) {
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 92e5f81..5319851 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -21,16 +21,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -43,8 +43,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -52,8 +52,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
   columns.value = columns1.value
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 613d789..4449b2e 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -275,16 +275,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
-      :pipe="pipeData"
-    />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" :pipe="pipeData" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -408,9 +407,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index ba7cc9d..cdff362 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -8,7 +8,7 @@
 import { getAlarmType, getAlarmTypeList } from '@/api/home/alarm/count'
 import { shortcuts } from '@/utils/common'
 const listQuery = ref({
-  timeType: '2',
+  timeType: '1',
   ledgerType: '',
   deptid: '',
   begTime: '',
@@ -101,6 +101,12 @@
     <template #search>
       <div class="search">
         <el-button
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('1')"
+        >
+          今日
+        </el-button>
+        <el-button
           :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 0987798..9c992cd 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -181,6 +181,10 @@
 window.addEventListener('resize', () => {
   // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
   tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
+  const ele = document.getElementById('dragItem-width')
+  if (ele) {
+    ele.style.height = `${tableHeight.value}px`
+  }
 })
 // 查看报警
 const mapRef = ref()
@@ -361,9 +365,10 @@
     </search-area>
     <div style="width: 100%;display: flex;">
       <!-- 表头标题 -->
+      <!-- v-drag-width="100" -->
       <div
-        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
-        style="width: 100%;"
+        id="container-table" class="container-table"
+        :style="{ width: `${tableFlag === 'normal' ? '100%' : '75%'}` }"
       >
         <table-container
           :is-config="true" config-title="current-alarm" :columns="columns"
@@ -441,15 +446,15 @@
 
 <style lang="scss" scoped>
 .table {
-  width: 100% !important;
+  width: 100%;
 }
 
 .table-map {
-  width: 75% !important;
+  width: 75%;
 }
 
 .map {
-  width: 25% !important;
+  width: 25%;
   // background-color: antiquewhite;
 }
 
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 70a6eee..89db9e9 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -74,16 +74,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
 // DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
@@ -100,8 +100,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -109,8 +109,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const row = JSON.parse($route.query.row as string)
 if (row.deviceTypeName) {
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 92e5f81..5319851 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -21,16 +21,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -43,8 +43,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -52,8 +52,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
   columns.value = columns1.value
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 613d789..4449b2e 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -275,16 +275,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
-      :pipe="pipeData"
-    />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" :pipe="pipeData" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -408,9 +407,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index a15852d..b2c4a93 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -200,13 +200,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -275,10 +277,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+                @click="editRow('detail', scope.row)"
+              >
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)"
+              >
                 编辑
               </el-button>
             </template>
@@ -300,9 +308,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index ba7cc9d..cdff362 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -8,7 +8,7 @@
 import { getAlarmType, getAlarmTypeList } from '@/api/home/alarm/count'
 import { shortcuts } from '@/utils/common'
 const listQuery = ref({
-  timeType: '2',
+  timeType: '1',
   ledgerType: '',
   deptid: '',
   begTime: '',
@@ -101,6 +101,12 @@
     <template #search>
       <div class="search">
         <el-button
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('1')"
+        >
+          今日
+        </el-button>
+        <el-button
           :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 0987798..9c992cd 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -181,6 +181,10 @@
 window.addEventListener('resize', () => {
   // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
   tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
+  const ele = document.getElementById('dragItem-width')
+  if (ele) {
+    ele.style.height = `${tableHeight.value}px`
+  }
 })
 // 查看报警
 const mapRef = ref()
@@ -361,9 +365,10 @@
     </search-area>
     <div style="width: 100%;display: flex;">
       <!-- 表头标题 -->
+      <!-- v-drag-width="100" -->
       <div
-        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
-        style="width: 100%;"
+        id="container-table" class="container-table"
+        :style="{ width: `${tableFlag === 'normal' ? '100%' : '75%'}` }"
       >
         <table-container
           :is-config="true" config-title="current-alarm" :columns="columns"
@@ -441,15 +446,15 @@
 
 <style lang="scss" scoped>
 .table {
-  width: 100% !important;
+  width: 100%;
 }
 
 .table-map {
-  width: 75% !important;
+  width: 75%;
 }
 
 .map {
-  width: 25% !important;
+  width: 25%;
   // background-color: antiquewhite;
 }
 
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 70a6eee..89db9e9 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -74,16 +74,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
 // DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
@@ -100,8 +100,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -109,8 +109,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const row = JSON.parse($route.query.row as string)
 if (row.deviceTypeName) {
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 92e5f81..5319851 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -21,16 +21,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -43,8 +43,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -52,8 +52,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
   columns.value = columns1.value
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 613d789..4449b2e 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -275,16 +275,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
-      :pipe="pipeData"
-    />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" :pipe="pipeData" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -408,9 +407,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index a15852d..b2c4a93 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -200,13 +200,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -275,10 +277,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+                @click="editRow('detail', scope.row)"
+              >
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)"
+              >
                 编辑
               </el-button>
             </template>
@@ -300,9 +308,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index a9642f8..2c7be14 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -61,8 +61,29 @@
 })
 
 // 查看详情
+const $router = useRouter()
 const detailRow = (row: any) => {
-  console.log(row.id)
+  if (!row.id) {
+    ElMessage.warning('缺少报警信息')
+    return
+  }
+  let path = ''
+  if (row.cancelTime) {
+    // 历史报警
+    path = '/history/detail'
+  }
+  else {
+    // 当前报警
+    path = '/current/detail'
+  }
+  $router.push({
+    path,
+    query: {
+      id: row.id,
+      type: row.cancelTime ? 'history' : '',
+      row: JSON.stringify({ id: row.id, ts: row.alarmTime }),
+    },
+  })
 }
 const { proxy } = getCurrentInstance() as any
 
@@ -96,7 +117,10 @@
       <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
         搜索
       </el-button>
-      <el-button v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')" type="primary" @click="exportList">
+      <el-button
+        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
+        type="primary" @click="exportList"
+      >
         导出
       </el-button>
     </template>
@@ -105,13 +129,13 @@
       :pagination="false"
     >
       <template #columns>
-        <!-- <el-table-column label="操作" align="center" width="80">
+        <el-table-column label="操作" align="center" width="80">
           <template #default="scope">
             <el-button type="primary" link size="small" @click="detailRow(scope.row)">
               查看
             </el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </template>
     </normal-table>
   </table-container>

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index ba7cc9d..cdff362 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -8,7 +8,7 @@
 import { getAlarmType, getAlarmTypeList } from '@/api/home/alarm/count'
 import { shortcuts } from '@/utils/common'
 const listQuery = ref({
-  timeType: '2',
+  timeType: '1',
   ledgerType: '',
   deptid: '',
   begTime: '',
@@ -101,6 +101,12 @@
     <template #search>
       <div class="search">
         <el-button
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('1')"
+        >
+          今日
+        </el-button>
+        <el-button
           :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 0987798..9c992cd 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -181,6 +181,10 @@
 window.addEventListener('resize', () => {
   // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
   tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
+  const ele = document.getElementById('dragItem-width')
+  if (ele) {
+    ele.style.height = `${tableHeight.value}px`
+  }
 })
 // 查看报警
 const mapRef = ref()
@@ -361,9 +365,10 @@
     </search-area>
     <div style="width: 100%;display: flex;">
       <!-- 表头标题 -->
+      <!-- v-drag-width="100" -->
       <div
-        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
-        style="width: 100%;"
+        id="container-table" class="container-table"
+        :style="{ width: `${tableFlag === 'normal' ? '100%' : '75%'}` }"
       >
         <table-container
           :is-config="true" config-title="current-alarm" :columns="columns"
@@ -441,15 +446,15 @@
 
 <style lang="scss" scoped>
 .table {
-  width: 100% !important;
+  width: 100%;
 }
 
 .table-map {
-  width: 75% !important;
+  width: 75%;
 }
 
 .map {
-  width: 25% !important;
+  width: 25%;
   // background-color: antiquewhite;
 }
 
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 70a6eee..89db9e9 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -74,16 +74,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
 // DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
@@ -100,8 +100,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -109,8 +109,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const row = JSON.parse($route.query.row as string)
 if (row.deviceTypeName) {
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 92e5f81..5319851 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -21,16 +21,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -43,8 +43,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -52,8 +52,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
   columns.value = columns1.value
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 613d789..4449b2e 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -275,16 +275,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
-      :pipe="pipeData"
-    />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" :pipe="pipeData" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -408,9 +407,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index a15852d..b2c4a93 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -200,13 +200,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -275,10 +277,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+                @click="editRow('detail', scope.row)"
+              >
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)"
+              >
                 编辑
               </el-button>
             </template>
@@ -300,9 +308,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index a9642f8..2c7be14 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -61,8 +61,29 @@
 })
 
 // 查看详情
+const $router = useRouter()
 const detailRow = (row: any) => {
-  console.log(row.id)
+  if (!row.id) {
+    ElMessage.warning('缺少报警信息')
+    return
+  }
+  let path = ''
+  if (row.cancelTime) {
+    // 历史报警
+    path = '/history/detail'
+  }
+  else {
+    // 当前报警
+    path = '/current/detail'
+  }
+  $router.push({
+    path,
+    query: {
+      id: row.id,
+      type: row.cancelTime ? 'history' : '',
+      row: JSON.stringify({ id: row.id, ts: row.alarmTime }),
+    },
+  })
 }
 const { proxy } = getCurrentInstance() as any
 
@@ -96,7 +117,10 @@
       <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
         搜索
       </el-button>
-      <el-button v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')" type="primary" @click="exportList">
+      <el-button
+        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
+        type="primary" @click="exportList"
+      >
         导出
       </el-button>
     </template>
@@ -105,13 +129,13 @@
       :pagination="false"
     >
       <template #columns>
-        <!-- <el-table-column label="操作" align="center" width="80">
+        <el-table-column label="操作" align="center" width="80">
           <template #default="scope">
             <el-button type="primary" link size="small" @click="detailRow(scope.row)">
               查看
             </el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </template>
     </normal-table>
   </table-container>
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 2112eee..a4d37b5 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -26,23 +26,39 @@
   { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'strength', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
 ])
 const listQuery = ref({
-  begTime: '',
-  endTime: '',
+  logBegTime: '',
+  logEndTime: '',
   wellId: '',
+  upBegTime: '',
+  upEndTime: '',
 })
 // 开始结束时间
 const datetimerange = ref()
+const datetimerange1 = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.begTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value.logBegTime = ''
+  listQuery.value.logEndTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.begTime = `${newVal[0]}`
-      listQuery.value.endTime = `${newVal[1]}`
+      listQuery.value.logBegTime = `${newVal[0]}`
+      listQuery.value.logEndTime = `${newVal[1]}`
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
+watch(() => datetimerange1.value, (newVal) => {
+  listQuery.value.upBegTime = ''
+  listQuery.value.upEndTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.upBegTime = `${newVal[0]}`
+      listQuery.value.upEndTime = `${newVal[1]}`
     }
   }
 }, {
@@ -74,6 +90,7 @@
 }
 onMounted(() => {
   datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange1.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
@@ -97,13 +114,13 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <el-date-picker
-        v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="开始时间"
-        end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
       />
-      <!-- <el-date-picker
-        v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
-        end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
-      /> -->
+      <el-date-picker
+        v-model="datetimerange1" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
+      />
       <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
         搜索
       </el-button>

diff --git a/src/directives/drag-height/index.ts b/src/directives/drag-height/index.ts
new file mode 100644
index 0000000..e281ece
--- /dev/null
+++ b/src/directives/drag-height/index.ts
@@ -0,0 +1,64 @@
+// 拖拽元素 改变高度 自定义指令
+export const dragHeight = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+  // 最小宽度
+  let minHeight = 50
+  // 获取 drag-min-height 的值
+  if (binding.value) {
+    minHeight = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-height'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText
+    = 'height: 6px;width: 100%;cursor: n-resize;position: absolute;right: 0;bottom: 0;background-color: #ddd; display: none;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el距离浏览器顶部的距离
+    const elTop = el.offsetTop
+    isPress = true
+    console.log('鼠标摁下')
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      console.log('鼠标移动')
+      let height = moveEvent.pageY - elTop - (binding.value || 1)
+      if (height < minHeight) {
+        height = minHeight
+      }
+      el.style.height = `${height}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-height', `${height}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      console.log('鼠标抬起')
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts
new file mode 100644
index 0000000..08de84b
--- /dev/null
+++ b/src/directives/drag-width/index.ts
@@ -0,0 +1,62 @@
+// 拖拽元素 改变宽度 自定义指令
+export const dragWidth = (el: any, binding: any) => {
+  el.style.position = 'relative'
+  let isPress = false
+
+  // 最小宽度
+  let minWidth = 50
+  // 获取 drag-min-width 的值
+  if (binding.value) {
+    minWidth = parseInt(binding.value, 10)
+  }
+
+  // 拖拽触发元素
+  const dragItem = document.createElement('div')
+  dragItem.id = 'dragItem-width'
+  // 将元素放置到抽屉的左边边缘
+  dragItem.style.cssText = 'height: 100%;width: 5px;cursor: w-resize;position: absolute;top: 0;right: 0;background-color: #ddd; display: none;z-index:99;'
+  el.append(dragItem)
+
+  // el 鼠标完全进入时，显示dragItem
+  el.addEventListener('mouseenter', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'block'
+  })
+
+  // el 鼠标完全离开时，隐藏dragItem
+  el.addEventListener('mouseleave', () => {
+    if (isPress) { return }
+    dragItem.style.display = 'none'
+  })
+
+  // 鼠标按下时，开始拖拽
+  dragItem.onmousedown = () => {
+    document.body.style.userSelect = 'none'
+    // 获取el左边距离浏览器左侧的距离
+    const elLeft = el.offsetLeft
+    isPress = true
+
+    // 鼠标移动时，计算出拖拽的距离
+    document.onmousemove = (moveEvent) => {
+      let width = moveEvent.pageX - elLeft - (binding.value || 1)
+      if (width < minWidth) {
+        width = minWidth
+      }
+      el.style.width = `${width}px`
+      // 将width赋值到CSS自定义属性
+      el.style.setProperty('--el-width', `${width}px`)
+
+      // 阻止默认行为
+      return false
+    }
+    // 鼠标抬起时，结束拖拽
+    document.onmouseup = () => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.body.style.userSelect = 'auto'
+      isPress = false
+    }
+    // 阻止默认行为
+    return false
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index c0ae2c9..3627be3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@
 import useSettingsStore from './store/modules/settings'
 import request from '@/api/index'
 import '@/utils/getLocation'
+// 自定义指令
+import { dragHeight } from '@/directives/drag-height/index'
+import { dragWidth } from '@/directives/drag-width/index'
 // 引入音频文件
 import alarmAudio from '@/assets/audio/alarm.mp3'
 // 自定义指令
@@ -83,6 +86,13 @@
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
   }
+  // 加载自定义指令
+  app.directive('drag-height', (el, binding) => {
+    dragHeight(el, binding)
+  })
+  app.directive('drag-width', (el, binding) => {
+    dragWidth(el, binding)
+  })
   directive(app)
   app.mount('#app')
 }).catch((error) => {
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index ba7cc9d..cdff362 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -8,7 +8,7 @@
 import { getAlarmType, getAlarmTypeList } from '@/api/home/alarm/count'
 import { shortcuts } from '@/utils/common'
 const listQuery = ref({
-  timeType: '2',
+  timeType: '1',
   ledgerType: '',
   deptid: '',
   begTime: '',
@@ -101,6 +101,12 @@
     <template #search>
       <div class="search">
         <el-button
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+          @click="selectTimeType('1')"
+        >
+          今日
+        </el-button>
+        <el-button
           :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 0987798..9c992cd 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -181,6 +181,10 @@
 window.addEventListener('resize', () => {
   // tableHeight.value = document.getElementById('container-table')?.clientHeight as number
   tableHeight.value = window.innerHeight - 60 - 50 - 98 - 20
+  const ele = document.getElementById('dragItem-width')
+  if (ele) {
+    ele.style.height = `${tableHeight.value}px`
+  }
 })
 // 查看报警
 const mapRef = ref()
@@ -361,9 +365,10 @@
     </search-area>
     <div style="width: 100%;display: flex;">
       <!-- 表头标题 -->
+      <!-- v-drag-width="100" -->
       <div
-        id="container-table" :class="tableFlag === 'normal' ? 'table' : 'table-map'" class="container-table"
-        style="width: 100%;"
+        id="container-table" class="container-table"
+        :style="{ width: `${tableFlag === 'normal' ? '100%' : '75%'}` }"
       >
         <table-container
           :is-config="true" config-title="current-alarm" :columns="columns"
@@ -441,15 +446,15 @@
 
 <style lang="scss" scoped>
 .table {
-  width: 100% !important;
+  width: 100%;
 }
 
 .table-map {
-  width: 75% !important;
+  width: 75%;
 }
 
 .map {
-  width: 25% !important;
+  width: 25%;
   // background-color: antiquewhite;
 }
 
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 70a6eee..89db9e9 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -74,16 +74,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
 // DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
@@ -100,8 +100,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -109,8 +109,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 const row = JSON.parse($route.query.row as string)
 if (row.deviceTypeName) {
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 92e5f81..5319851 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -21,16 +21,16 @@
   { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 管网哨兵
 const columns2 = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 智能警示桩
 const columns3 = ref<any>([
@@ -43,8 +43,8 @@
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '110' },
   { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '110' },
   { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '110' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -52,8 +52,8 @@
   { text: '浓度', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
 ])
 if (!$route.query.typeName || $route.query.typeName === '燃气智能监测终端') {
   columns.value = columns1.value
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 613d789..4449b2e 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -275,16 +275,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com
-      v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList"
-      :pipe="pipeData"
-    />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" :pipe="pipeData" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -408,9 +407,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index a15852d..b2c4a93 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -200,13 +200,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -275,10 +277,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+                @click="editRow('detail', scope.row)"
+              >
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/station/monitor/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)"
+              >
                 编辑
               </el-button>
             </template>
@@ -300,9 +308,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index a9642f8..2c7be14 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -61,8 +61,29 @@
 })
 
 // 查看详情
+const $router = useRouter()
 const detailRow = (row: any) => {
-  console.log(row.id)
+  if (!row.id) {
+    ElMessage.warning('缺少报警信息')
+    return
+  }
+  let path = ''
+  if (row.cancelTime) {
+    // 历史报警
+    path = '/history/detail'
+  }
+  else {
+    // 当前报警
+    path = '/current/detail'
+  }
+  $router.push({
+    path,
+    query: {
+      id: row.id,
+      type: row.cancelTime ? 'history' : '',
+      row: JSON.stringify({ id: row.id, ts: row.alarmTime }),
+    },
+  })
 }
 const { proxy } = getCurrentInstance() as any
 
@@ -96,7 +117,10 @@
       <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
         搜索
       </el-button>
-      <el-button v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')" type="primary" @click="exportList">
+      <el-button
+        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
+        type="primary" @click="exportList"
+      >
         导出
       </el-button>
     </template>
@@ -105,13 +129,13 @@
       :pagination="false"
     >
       <template #columns>
-        <!-- <el-table-column label="操作" align="center" width="80">
+        <el-table-column label="操作" align="center" width="80">
           <template #default="scope">
             <el-button type="primary" link size="small" @click="detailRow(scope.row)">
               查看
             </el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </template>
     </normal-table>
   </table-container>
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 2112eee..a4d37b5 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -26,23 +26,39 @@
   { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
   { text: '信号强度', value: 'strength', align: 'center' },
-  { text: '采集时间', value: 'uptime', align: 'center' },
-  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '采集时间', value: 'logtime', align: 'center' },
+  { text: '上传时间', value: 'uptime', align: 'center' },
 ])
 const listQuery = ref({
-  begTime: '',
-  endTime: '',
+  logBegTime: '',
+  logEndTime: '',
   wellId: '',
+  upBegTime: '',
+  upEndTime: '',
 })
 // 开始结束时间
 const datetimerange = ref()
+const datetimerange1 = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.begTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value.logBegTime = ''
+  listQuery.value.logEndTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.begTime = `${newVal[0]}`
-      listQuery.value.endTime = `${newVal[1]}`
+      listQuery.value.logBegTime = `${newVal[0]}`
+      listQuery.value.logEndTime = `${newVal[1]}`
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
+watch(() => datetimerange1.value, (newVal) => {
+  listQuery.value.upBegTime = ''
+  listQuery.value.upEndTime = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.value.upBegTime = `${newVal[0]}`
+      listQuery.value.upEndTime = `${newVal[1]}`
     }
   }
 }, {
@@ -74,6 +90,7 @@
 }
 onMounted(() => {
   datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange1.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
@@ -97,13 +114,13 @@
     <template #btns-left>
       <!-- 查询条件 -->
       <el-date-picker
-        v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="开始时间"
-        end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
       />
-      <!-- <el-date-picker
-        v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
-        end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
-      /> -->
+      <el-date-picker
+        v-model="datetimerange1" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+        end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
+      />
       <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
         搜索
       </el-button>
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 5a87339..3d0f05c 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -232,13 +232,15 @@
   <!-- 布局 -->
   <app-container class="container">
     <edit-dialog ref="editRef" @refresh="fetchData" />
-    <!-- 地图 -->
-    <map-com v-if="tableFlag === 'map'" ref="mapRef" v-loading="mapLoading" :height="350" :data="mapList" />
-    <!-- 收起地图-图标 -->
-    <div v-if="tableFlag === 'map'" class="icon" @click="switchMode('normal')">
-      <el-icon :size="25">
-        <arrow-up-bold />
-      </el-icon>
+    <div v-if="tableFlag === 'map'" style="position: relative;">
+      <!-- 地图 -->
+      <map-com ref="mapRef" v-drag-height="100" v-loading="mapLoading" :height="350" :data="mapList" />
+      <!-- 收起地图-图标 -->
+      <div class="icon" @click="switchMode('normal')">
+        <el-icon :size="25">
+          <arrow-up-bold />
+        </el-icon>
+      </div>
     </div>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
@@ -329,10 +331,16 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small" @click="editRow('detail', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small"
+                @click="editRow('detail', scope.row)"
+              >
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/well/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button
+                v-if="proxy.hasPerm('/well/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)"
+              >
                 编辑
               </el-button>
             </template>
@@ -354,9 +362,9 @@
 
   .icon {
     position: absolute;
-    top: 345px;
+    bottom: 0;
     left: 50%;
-    transform: translateX(-50%);
+    transform: translate(-50%, 30%);
     z-index: 999;
 
     &:hover {