diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false
diff --git a/src/views/home/device/device/components/statusReport.vue b/src/views/home/device/device/components/statusReport.vue
index 110d749..5aceccb 100644
--- a/src/views/home/device/device/components/statusReport.vue
+++ b/src/views/home/device/device/components/statusReport.vue
@@ -65,16 +65,19 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-      />
-      <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
-        搜索
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
-        导出
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;" />
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;">
+          导出
+        </el-button>
+      </div>
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false
diff --git a/src/views/home/device/device/components/statusReport.vue b/src/views/home/device/device/components/statusReport.vue
index 110d749..5aceccb 100644
--- a/src/views/home/device/device/components/statusReport.vue
+++ b/src/views/home/device/device/components/statusReport.vue
@@ -65,16 +65,19 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-      />
-      <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
-        搜索
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
-        导出
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;" />
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;">
+          导出
+        </el-button>
+      </div>
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index bd04e44..a88f6c7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -4,9 +4,10 @@
   Date: 2024-07-19
  -->
 <script lang="ts" setup name="DeviceManage">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addDialog.vue'
-import { exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
+import { bfDevice, exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
@@ -31,10 +32,10 @@
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
-  // { text: '布防状态', value: '', align: 'center', isRequired: true },
+  { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -57,6 +58,7 @@
   valid: '', // 设备在用情况
   logTime1: '',
   logTime2: '',
+  bfcf: '',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -79,6 +81,8 @@
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
+      bfztName: item.bfzt === '1' ? '布防' : '撤防',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -102,6 +106,7 @@
     valid: '', // 设备在用情况
     logTime1: '',
     logTime2: '',
+    bfcf: '',
   }
   fetchData()
 }
@@ -155,7 +160,7 @@
 // 撤防
 const changeDefense = (row: any) => {
   ElMessageBox.confirm(
-    `确定要撤防${row.devcode}设备吗？`,
+    `确定要${row.bfcf === '1' ? '撤防' : '布防'}${row.devcode}设备吗？`,
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -163,6 +168,13 @@
       type: 'warning',
     },
   ).then(() => {
+    bfDevice({
+      bfcf: row.bfcf === '1' ? '0' : '1',
+      id: row.id,
+    }).then((res) => {
+      ElMessage.success('操作成功')
+      fetchData()
+    })
   })
 }
 // 导出列表
@@ -364,6 +376,15 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select
+          v-model="listQuery.bfcf" placeholder="布防状态" filterable clearable class="select"
+          style="width: 192px;"
+        >
+          <el-option label="布防" value="1" />
+          <el-option label="撤防" value="0" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
@@ -422,9 +443,9 @@
               <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
-                撤防
-              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
+                {{ scope.row.bfzt === '1' ? '撤防' : '布防' }}
+              </el-button>
               <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false
diff --git a/src/views/home/device/device/components/statusReport.vue b/src/views/home/device/device/components/statusReport.vue
index 110d749..5aceccb 100644
--- a/src/views/home/device/device/components/statusReport.vue
+++ b/src/views/home/device/device/components/statusReport.vue
@@ -65,16 +65,19 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-      />
-      <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
-        搜索
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
-        导出
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;" />
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;">
+          导出
+        </el-button>
+      </div>
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index bd04e44..a88f6c7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -4,9 +4,10 @@
   Date: 2024-07-19
  -->
 <script lang="ts" setup name="DeviceManage">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addDialog.vue'
-import { exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
+import { bfDevice, exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
@@ -31,10 +32,10 @@
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
-  // { text: '布防状态', value: '', align: 'center', isRequired: true },
+  { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -57,6 +58,7 @@
   valid: '', // 设备在用情况
   logTime1: '',
   logTime2: '',
+  bfcf: '',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -79,6 +81,8 @@
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
+      bfztName: item.bfzt === '1' ? '布防' : '撤防',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -102,6 +106,7 @@
     valid: '', // 设备在用情况
     logTime1: '',
     logTime2: '',
+    bfcf: '',
   }
   fetchData()
 }
@@ -155,7 +160,7 @@
 // 撤防
 const changeDefense = (row: any) => {
   ElMessageBox.confirm(
-    `确定要撤防${row.devcode}设备吗？`,
+    `确定要${row.bfcf === '1' ? '撤防' : '布防'}${row.devcode}设备吗？`,
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -163,6 +168,13 @@
       type: 'warning',
     },
   ).then(() => {
+    bfDevice({
+      bfcf: row.bfcf === '1' ? '0' : '1',
+      id: row.id,
+    }).then((res) => {
+      ElMessage.success('操作成功')
+      fetchData()
+    })
   })
 }
 // 导出列表
@@ -364,6 +376,15 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select
+          v-model="listQuery.bfcf" placeholder="布防状态" filterable clearable class="select"
+          style="width: 192px;"
+        >
+          <el-option label="布防" value="1" />
+          <el-option label="撤防" value="0" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
@@ -422,9 +443,9 @@
               <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
-                撤防
-              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
+                {{ scope.row.bfzt === '1' ? '撤防' : '布防' }}
+              </el-button>
               <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 65acceb..912c1cc 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -128,7 +128,7 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵') {
+  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
     if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value.push({
       text: '燃气浓度',
@@ -146,7 +146,7 @@
   }).then((res) => {
     loading.value = false
     detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵')) {
+    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
       return
     }
     gasData.value = []
@@ -157,15 +157,15 @@
     }).then((res) => {
       // console.log(res.data, '123321')
       for (const i in res.data) {
-        if (i.includes('管网哨兵') || i.includes('燃气')) {
+        if (i.includes('燃气')) {
           // console.log(i, 'iiiiiiiii')
           gasData.value.push({
             name: i,
             devcode: res.data[i].devcode,
             state: res.data[i].state,
             value: res.data[i].value,
-            text: i.includes('燃气') || i.includes('哨兵') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') || i.includes('哨兵') ? '%LEL' : '',
+            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
+            unit: i.includes('燃气') ? '%LEL' : '',
             stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
           })
         }
@@ -228,13 +228,13 @@
           </div>
 
           <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
-            <div v-for="item in gasData" :key="item.name">
-              {{ item.name }} :
+            <div v-for="item in gasData" v-show="item.text" :key="item.name">
+              {{ item.text }} :
               <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
                 : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气') || item.name.includes('哨兵')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
+              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
               }}</span>
-              <el-button v-if="item.name.includes('燃气') || item.name.includes('哨兵')" size="small" style="margin-left: 10px;" @click="more">
+              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
                 更多
               </el-button>
             </div>
@@ -293,6 +293,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -303,7 +304,7 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false
diff --git a/src/views/home/device/device/components/statusReport.vue b/src/views/home/device/device/components/statusReport.vue
index 110d749..5aceccb 100644
--- a/src/views/home/device/device/components/statusReport.vue
+++ b/src/views/home/device/device/components/statusReport.vue
@@ -65,16 +65,19 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-      />
-      <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
-        搜索
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
-        导出
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;" />
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;">
+          导出
+        </el-button>
+      </div>
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index bd04e44..a88f6c7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -4,9 +4,10 @@
   Date: 2024-07-19
  -->
 <script lang="ts" setup name="DeviceManage">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addDialog.vue'
-import { exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
+import { bfDevice, exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
@@ -31,10 +32,10 @@
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
-  // { text: '布防状态', value: '', align: 'center', isRequired: true },
+  { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -57,6 +58,7 @@
   valid: '', // 设备在用情况
   logTime1: '',
   logTime2: '',
+  bfcf: '',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -79,6 +81,8 @@
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
+      bfztName: item.bfzt === '1' ? '布防' : '撤防',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -102,6 +106,7 @@
     valid: '', // 设备在用情况
     logTime1: '',
     logTime2: '',
+    bfcf: '',
   }
   fetchData()
 }
@@ -155,7 +160,7 @@
 // 撤防
 const changeDefense = (row: any) => {
   ElMessageBox.confirm(
-    `确定要撤防${row.devcode}设备吗？`,
+    `确定要${row.bfcf === '1' ? '撤防' : '布防'}${row.devcode}设备吗？`,
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -163,6 +168,13 @@
       type: 'warning',
     },
   ).then(() => {
+    bfDevice({
+      bfcf: row.bfcf === '1' ? '0' : '1',
+      id: row.id,
+    }).then((res) => {
+      ElMessage.success('操作成功')
+      fetchData()
+    })
   })
 }
 // 导出列表
@@ -364,6 +376,15 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select
+          v-model="listQuery.bfcf" placeholder="布防状态" filterable clearable class="select"
+          style="width: 192px;"
+        >
+          <el-option label="布防" value="1" />
+          <el-option label="撤防" value="0" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
@@ -422,9 +443,9 @@
               <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
-                撤防
-              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
+                {{ scope.row.bfzt === '1' ? '撤防' : '布防' }}
+              </el-button>
               <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 65acceb..912c1cc 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -128,7 +128,7 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵') {
+  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
     if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value.push({
       text: '燃气浓度',
@@ -146,7 +146,7 @@
   }).then((res) => {
     loading.value = false
     detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵')) {
+    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
       return
     }
     gasData.value = []
@@ -157,15 +157,15 @@
     }).then((res) => {
       // console.log(res.data, '123321')
       for (const i in res.data) {
-        if (i.includes('管网哨兵') || i.includes('燃气')) {
+        if (i.includes('燃气')) {
           // console.log(i, 'iiiiiiiii')
           gasData.value.push({
             name: i,
             devcode: res.data[i].devcode,
             state: res.data[i].state,
             value: res.data[i].value,
-            text: i.includes('燃气') || i.includes('哨兵') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') || i.includes('哨兵') ? '%LEL' : '',
+            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
+            unit: i.includes('燃气') ? '%LEL' : '',
             stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
           })
         }
@@ -228,13 +228,13 @@
           </div>
 
           <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
-            <div v-for="item in gasData" :key="item.name">
-              {{ item.name }} :
+            <div v-for="item in gasData" v-show="item.text" :key="item.name">
+              {{ item.text }} :
               <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
                 : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气') || item.name.includes('哨兵')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
+              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
               }}</span>
-              <el-button v-if="item.name.includes('燃气') || item.name.includes('哨兵')" size="small" style="margin-left: 10px;" @click="more">
+              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
                 更多
               </el-button>
             </div>
@@ -293,6 +293,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -303,7 +304,7 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 5319851..6381777 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -156,18 +156,21 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <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"
-      />
-      <el-date-picker
-        v-model="datetimerange2" 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>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <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"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
+        <el-date-picker
+          v-model="datetimerange2" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
+          end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false
diff --git a/src/views/home/device/device/components/statusReport.vue b/src/views/home/device/device/components/statusReport.vue
index 110d749..5aceccb 100644
--- a/src/views/home/device/device/components/statusReport.vue
+++ b/src/views/home/device/device/components/statusReport.vue
@@ -65,16 +65,19 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-      />
-      <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
-        搜索
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
-        导出
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;" />
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;">
+          导出
+        </el-button>
+      </div>
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index bd04e44..a88f6c7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -4,9 +4,10 @@
   Date: 2024-07-19
  -->
 <script lang="ts" setup name="DeviceManage">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addDialog.vue'
-import { exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
+import { bfDevice, exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
@@ -31,10 +32,10 @@
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
-  // { text: '布防状态', value: '', align: 'center', isRequired: true },
+  { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -57,6 +58,7 @@
   valid: '', // 设备在用情况
   logTime1: '',
   logTime2: '',
+  bfcf: '',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -79,6 +81,8 @@
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
+      bfztName: item.bfzt === '1' ? '布防' : '撤防',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -102,6 +106,7 @@
     valid: '', // 设备在用情况
     logTime1: '',
     logTime2: '',
+    bfcf: '',
   }
   fetchData()
 }
@@ -155,7 +160,7 @@
 // 撤防
 const changeDefense = (row: any) => {
   ElMessageBox.confirm(
-    `确定要撤防${row.devcode}设备吗？`,
+    `确定要${row.bfcf === '1' ? '撤防' : '布防'}${row.devcode}设备吗？`,
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -163,6 +168,13 @@
       type: 'warning',
     },
   ).then(() => {
+    bfDevice({
+      bfcf: row.bfcf === '1' ? '0' : '1',
+      id: row.id,
+    }).then((res) => {
+      ElMessage.success('操作成功')
+      fetchData()
+    })
   })
 }
 // 导出列表
@@ -364,6 +376,15 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select
+          v-model="listQuery.bfcf" placeholder="布防状态" filterable clearable class="select"
+          style="width: 192px;"
+        >
+          <el-option label="布防" value="1" />
+          <el-option label="撤防" value="0" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
@@ -422,9 +443,9 @@
               <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
-                撤防
-              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
+                {{ scope.row.bfzt === '1' ? '撤防' : '布防' }}
+              </el-button>
               <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 65acceb..912c1cc 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -128,7 +128,7 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵') {
+  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
     if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value.push({
       text: '燃气浓度',
@@ -146,7 +146,7 @@
   }).then((res) => {
     loading.value = false
     detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵')) {
+    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
       return
     }
     gasData.value = []
@@ -157,15 +157,15 @@
     }).then((res) => {
       // console.log(res.data, '123321')
       for (const i in res.data) {
-        if (i.includes('管网哨兵') || i.includes('燃气')) {
+        if (i.includes('燃气')) {
           // console.log(i, 'iiiiiiiii')
           gasData.value.push({
             name: i,
             devcode: res.data[i].devcode,
             state: res.data[i].state,
             value: res.data[i].value,
-            text: i.includes('燃气') || i.includes('哨兵') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') || i.includes('哨兵') ? '%LEL' : '',
+            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
+            unit: i.includes('燃气') ? '%LEL' : '',
             stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
           })
         }
@@ -228,13 +228,13 @@
           </div>
 
           <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
-            <div v-for="item in gasData" :key="item.name">
-              {{ item.name }} :
+            <div v-for="item in gasData" v-show="item.text" :key="item.name">
+              {{ item.text }} :
               <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
                 : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气') || item.name.includes('哨兵')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
+              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
               }}</span>
-              <el-button v-if="item.name.includes('燃气') || item.name.includes('哨兵')" size="small" style="margin-left: 10px;" @click="more">
+              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
                 更多
               </el-button>
             </div>
@@ -293,6 +293,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -303,7 +304,7 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 5319851..6381777 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -156,18 +156,21 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <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"
-      />
-      <el-date-picker
-        v-model="datetimerange2" 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>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <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"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
+        <el-date-picker
+          v-model="datetimerange2" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
+          end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 07f48b2..2fa2dee 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -324,10 +324,11 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
+      padding-left: 10px;
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
@@ -350,7 +351,7 @@
           width: 68%;
           box-sizing: border-box;
           white-space: nowrap;
-          font-size: 14px;
+          font-size: 15px;
           color: #a39f9f;
 
           /* 确保文本在一行内显示 */

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false
diff --git a/src/views/home/device/device/components/statusReport.vue b/src/views/home/device/device/components/statusReport.vue
index 110d749..5aceccb 100644
--- a/src/views/home/device/device/components/statusReport.vue
+++ b/src/views/home/device/device/components/statusReport.vue
@@ -65,16 +65,19 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-      />
-      <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
-        搜索
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
-        导出
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;" />
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;">
+          导出
+        </el-button>
+      </div>
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index bd04e44..a88f6c7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -4,9 +4,10 @@
   Date: 2024-07-19
  -->
 <script lang="ts" setup name="DeviceManage">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addDialog.vue'
-import { exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
+import { bfDevice, exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
@@ -31,10 +32,10 @@
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
-  // { text: '布防状态', value: '', align: 'center', isRequired: true },
+  { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -57,6 +58,7 @@
   valid: '', // 设备在用情况
   logTime1: '',
   logTime2: '',
+  bfcf: '',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -79,6 +81,8 @@
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
+      bfztName: item.bfzt === '1' ? '布防' : '撤防',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -102,6 +106,7 @@
     valid: '', // 设备在用情况
     logTime1: '',
     logTime2: '',
+    bfcf: '',
   }
   fetchData()
 }
@@ -155,7 +160,7 @@
 // 撤防
 const changeDefense = (row: any) => {
   ElMessageBox.confirm(
-    `确定要撤防${row.devcode}设备吗？`,
+    `确定要${row.bfcf === '1' ? '撤防' : '布防'}${row.devcode}设备吗？`,
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -163,6 +168,13 @@
       type: 'warning',
     },
   ).then(() => {
+    bfDevice({
+      bfcf: row.bfcf === '1' ? '0' : '1',
+      id: row.id,
+    }).then((res) => {
+      ElMessage.success('操作成功')
+      fetchData()
+    })
   })
 }
 // 导出列表
@@ -364,6 +376,15 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select
+          v-model="listQuery.bfcf" placeholder="布防状态" filterable clearable class="select"
+          style="width: 192px;"
+        >
+          <el-option label="布防" value="1" />
+          <el-option label="撤防" value="0" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
@@ -422,9 +443,9 @@
               <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
-                撤防
-              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
+                {{ scope.row.bfzt === '1' ? '撤防' : '布防' }}
+              </el-button>
               <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 65acceb..912c1cc 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -128,7 +128,7 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵') {
+  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
     if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value.push({
       text: '燃气浓度',
@@ -146,7 +146,7 @@
   }).then((res) => {
     loading.value = false
     detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵')) {
+    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
       return
     }
     gasData.value = []
@@ -157,15 +157,15 @@
     }).then((res) => {
       // console.log(res.data, '123321')
       for (const i in res.data) {
-        if (i.includes('管网哨兵') || i.includes('燃气')) {
+        if (i.includes('燃气')) {
           // console.log(i, 'iiiiiiiii')
           gasData.value.push({
             name: i,
             devcode: res.data[i].devcode,
             state: res.data[i].state,
             value: res.data[i].value,
-            text: i.includes('燃气') || i.includes('哨兵') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') || i.includes('哨兵') ? '%LEL' : '',
+            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
+            unit: i.includes('燃气') ? '%LEL' : '',
             stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
           })
         }
@@ -228,13 +228,13 @@
           </div>
 
           <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
-            <div v-for="item in gasData" :key="item.name">
-              {{ item.name }} :
+            <div v-for="item in gasData" v-show="item.text" :key="item.name">
+              {{ item.text }} :
               <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
                 : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气') || item.name.includes('哨兵')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
+              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
               }}</span>
-              <el-button v-if="item.name.includes('燃气') || item.name.includes('哨兵')" size="small" style="margin-left: 10px;" @click="more">
+              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
                 更多
               </el-button>
             </div>
@@ -293,6 +293,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -303,7 +304,7 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 5319851..6381777 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -156,18 +156,21 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <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"
-      />
-      <el-date-picker
-        v-model="datetimerange2" 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>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <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"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
+        <el-date-picker
+          v-model="datetimerange2" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
+          end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 07f48b2..2fa2dee 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -324,10 +324,11 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
+      padding-left: 10px;
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
@@ -350,7 +351,7 @@
           width: 68%;
           box-sizing: border-box;
           white-space: nowrap;
-          font-size: 14px;
+          font-size: 15px;
           color: #a39f9f;
 
           /* 确保文本在一行内显示 */
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 68b3861..3f1bb33 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -32,16 +32,16 @@
     value: 'manageTypeName',
     align: 'center',
   },
-  {
-    text: '产权单位',
-    value: 'propertyOwner',
-    align: 'center',
-  },
-  {
-    text: '产权单位联系人',
-    value: 'propertyOwner',
-    align: 'center',
-  },
+  // {
+  //   text: '产权单位',
+  //   value: 'propertyOwner',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '产权单位联系人',
+  //   value: 'propertyOwner',
+  //   align: 'center',
+  // },
   {
     text: '详细位置',
     value: 'position',
@@ -122,8 +122,9 @@
   getWellDetail(e.info.id).then((res) => {
     baseInfo.value = res.data
     detailInfo.value = res.data
+    descriptionsList.value = descriptionsList.value.filter((item: any) => !item.text.includes('产权单位') && !item.text.includes('联系人'))
     if (baseInfo.value.manageTypeName === '自有' || baseInfo.value.manageTypeName === '') {
-      descriptionsList.value = descriptionsList.value.filter((item: any) => !item.text.includes('产权单位'))
+      console.log(1)
     }
     else {
       descriptionsList.value.splice(2, 0, ...[
@@ -133,7 +134,7 @@
           align: 'center',
         },
         {
-          text: '产权单位联系人',
+          text: '联系人',
           value: 'propertyOwner',
           align: 'center',
         },
@@ -158,7 +159,7 @@
           state: res.data[i].state,
           value: res.data[i].value || '0.00',
           text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-          unit: i.includes('燃气') ? '%LEL' : '',
+          unit: i.includes('燃气') ? '    %LEL' : '',
           stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
         })
       }
@@ -230,7 +231,8 @@
             {{ item.text }}
           </div>
           <div class="value" :title="detailInfo[item.value] || ''">
-            {{ detailInfo[item.value] || '' }}
+            <span v-if="item.text === '监控状态'" :style="{ color: detailInfo[item.value] === '正常' ? '#3cc53c' : detailInfo[item.value] === '离线' ? 'rgb(238, 182, 78)' : detailInfo[item.value] === '异常' ? 'red' : detailInfo[item.value] === '未监控' ? '#a39f9f' : '#a39f9f' }">{{ detailInfo[item.value] || '' }}</span>
+            <span v-else>{{ detailInfo[item.value] || '' }}</span>
           </div>
         </div>
       </div>
@@ -238,7 +240,7 @@
     <!-- 燃气浓度等信息 -->
     <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
     <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
         <div>
           {{ item.text }} :
           <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') ? item.value
@@ -257,8 +259,8 @@
         感知设备运行情况
       </div>
       <div v-for="item in gasData" :key="item.name" class="gas-item">
-        <span class="devoce-code" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
-        <span style="margin-left: 10px;">{{ item.name }}</span>
+        <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
+        <span style="margin-left: 10px;width: 25%;display: inline-block;">{{ item.name }}</span>
         <span
           :class="item.state === '1' ? 'normal' : item.state === '0' ? 'offline' : item.state === '2' ? 'error' : ''"
           style="margin-left: 10px;"
@@ -275,7 +277,7 @@
 .dirver {
   border: 0;
   height: 2px;
-  background-image: linear-gradient(to right, rgb(0 0 0 / 0%), rgb(63 61 61 / 75%), rgb(0 0 0 / 0%));
+  background-image: linear-gradient(to right, rgb(239 236 236 / 27%), rgb(236 236 236 / 90%), rgba(239 236 236 / 27%));
 }
 
 .devoce-code {
@@ -343,6 +345,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -357,17 +360,17 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
 
         .label-no {
-          width: 28% !important;
+          width: 20% !important;
         }
 
         .label {
-          width: 42%;
+          width: 20%;
           box-sizing: border-box;
           padding: 0 1px;
           font-size: 15px;
@@ -380,8 +383,10 @@
           width: 68%;
           box-sizing: border-box;
           white-space: nowrap;
-          font-size: 14px;
+          // font-size: 14px;
+          font-size: 15px;
           color: #a39f9f;
+          // color: #3cc53c;
 
           /* 确保文本在一行内显示 */
           overflow: hidden;
@@ -421,6 +426,7 @@
     margin: 0 auto;
     margin-top: 5px;
     padding-top: 10px;
+    padding-left: 10px;
 
     .gas-item {
       padding: 3px 5px;

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false
diff --git a/src/views/home/device/device/components/statusReport.vue b/src/views/home/device/device/components/statusReport.vue
index 110d749..5aceccb 100644
--- a/src/views/home/device/device/components/statusReport.vue
+++ b/src/views/home/device/device/components/statusReport.vue
@@ -65,16 +65,19 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-      />
-      <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
-        搜索
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
-        导出
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;" />
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;">
+          导出
+        </el-button>
+      </div>
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index bd04e44..a88f6c7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -4,9 +4,10 @@
   Date: 2024-07-19
  -->
 <script lang="ts" setup name="DeviceManage">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addDialog.vue'
-import { exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
+import { bfDevice, exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
@@ -31,10 +32,10 @@
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
-  // { text: '布防状态', value: '', align: 'center', isRequired: true },
+  { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -57,6 +58,7 @@
   valid: '', // 设备在用情况
   logTime1: '',
   logTime2: '',
+  bfcf: '',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -79,6 +81,8 @@
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
+      bfztName: item.bfzt === '1' ? '布防' : '撤防',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -102,6 +106,7 @@
     valid: '', // 设备在用情况
     logTime1: '',
     logTime2: '',
+    bfcf: '',
   }
   fetchData()
 }
@@ -155,7 +160,7 @@
 // 撤防
 const changeDefense = (row: any) => {
   ElMessageBox.confirm(
-    `确定要撤防${row.devcode}设备吗？`,
+    `确定要${row.bfcf === '1' ? '撤防' : '布防'}${row.devcode}设备吗？`,
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -163,6 +168,13 @@
       type: 'warning',
     },
   ).then(() => {
+    bfDevice({
+      bfcf: row.bfcf === '1' ? '0' : '1',
+      id: row.id,
+    }).then((res) => {
+      ElMessage.success('操作成功')
+      fetchData()
+    })
   })
 }
 // 导出列表
@@ -364,6 +376,15 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select
+          v-model="listQuery.bfcf" placeholder="布防状态" filterable clearable class="select"
+          style="width: 192px;"
+        >
+          <el-option label="布防" value="1" />
+          <el-option label="撤防" value="0" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
@@ -422,9 +443,9 @@
               <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
-                撤防
-              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
+                {{ scope.row.bfzt === '1' ? '撤防' : '布防' }}
+              </el-button>
               <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 65acceb..912c1cc 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -128,7 +128,7 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵') {
+  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
     if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value.push({
       text: '燃气浓度',
@@ -146,7 +146,7 @@
   }).then((res) => {
     loading.value = false
     detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵')) {
+    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
       return
     }
     gasData.value = []
@@ -157,15 +157,15 @@
     }).then((res) => {
       // console.log(res.data, '123321')
       for (const i in res.data) {
-        if (i.includes('管网哨兵') || i.includes('燃气')) {
+        if (i.includes('燃气')) {
           // console.log(i, 'iiiiiiiii')
           gasData.value.push({
             name: i,
             devcode: res.data[i].devcode,
             state: res.data[i].state,
             value: res.data[i].value,
-            text: i.includes('燃气') || i.includes('哨兵') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') || i.includes('哨兵') ? '%LEL' : '',
+            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
+            unit: i.includes('燃气') ? '%LEL' : '',
             stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
           })
         }
@@ -228,13 +228,13 @@
           </div>
 
           <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
-            <div v-for="item in gasData" :key="item.name">
-              {{ item.name }} :
+            <div v-for="item in gasData" v-show="item.text" :key="item.name">
+              {{ item.text }} :
               <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
                 : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气') || item.name.includes('哨兵')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
+              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
               }}</span>
-              <el-button v-if="item.name.includes('燃气') || item.name.includes('哨兵')" size="small" style="margin-left: 10px;" @click="more">
+              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
                 更多
               </el-button>
             </div>
@@ -293,6 +293,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -303,7 +304,7 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 5319851..6381777 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -156,18 +156,21 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <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"
-      />
-      <el-date-picker
-        v-model="datetimerange2" 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>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <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"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
+        <el-date-picker
+          v-model="datetimerange2" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
+          end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 07f48b2..2fa2dee 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -324,10 +324,11 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
+      padding-left: 10px;
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
@@ -350,7 +351,7 @@
           width: 68%;
           box-sizing: border-box;
           white-space: nowrap;
-          font-size: 14px;
+          font-size: 15px;
           color: #a39f9f;
 
           /* 确保文本在一行内显示 */
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 68b3861..3f1bb33 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -32,16 +32,16 @@
     value: 'manageTypeName',
     align: 'center',
   },
-  {
-    text: '产权单位',
-    value: 'propertyOwner',
-    align: 'center',
-  },
-  {
-    text: '产权单位联系人',
-    value: 'propertyOwner',
-    align: 'center',
-  },
+  // {
+  //   text: '产权单位',
+  //   value: 'propertyOwner',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '产权单位联系人',
+  //   value: 'propertyOwner',
+  //   align: 'center',
+  // },
   {
     text: '详细位置',
     value: 'position',
@@ -122,8 +122,9 @@
   getWellDetail(e.info.id).then((res) => {
     baseInfo.value = res.data
     detailInfo.value = res.data
+    descriptionsList.value = descriptionsList.value.filter((item: any) => !item.text.includes('产权单位') && !item.text.includes('联系人'))
     if (baseInfo.value.manageTypeName === '自有' || baseInfo.value.manageTypeName === '') {
-      descriptionsList.value = descriptionsList.value.filter((item: any) => !item.text.includes('产权单位'))
+      console.log(1)
     }
     else {
       descriptionsList.value.splice(2, 0, ...[
@@ -133,7 +134,7 @@
           align: 'center',
         },
         {
-          text: '产权单位联系人',
+          text: '联系人',
           value: 'propertyOwner',
           align: 'center',
         },
@@ -158,7 +159,7 @@
           state: res.data[i].state,
           value: res.data[i].value || '0.00',
           text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-          unit: i.includes('燃气') ? '%LEL' : '',
+          unit: i.includes('燃气') ? '    %LEL' : '',
           stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
         })
       }
@@ -230,7 +231,8 @@
             {{ item.text }}
           </div>
           <div class="value" :title="detailInfo[item.value] || ''">
-            {{ detailInfo[item.value] || '' }}
+            <span v-if="item.text === '监控状态'" :style="{ color: detailInfo[item.value] === '正常' ? '#3cc53c' : detailInfo[item.value] === '离线' ? 'rgb(238, 182, 78)' : detailInfo[item.value] === '异常' ? 'red' : detailInfo[item.value] === '未监控' ? '#a39f9f' : '#a39f9f' }">{{ detailInfo[item.value] || '' }}</span>
+            <span v-else>{{ detailInfo[item.value] || '' }}</span>
           </div>
         </div>
       </div>
@@ -238,7 +240,7 @@
     <!-- 燃气浓度等信息 -->
     <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
     <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
         <div>
           {{ item.text }} :
           <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') ? item.value
@@ -257,8 +259,8 @@
         感知设备运行情况
       </div>
       <div v-for="item in gasData" :key="item.name" class="gas-item">
-        <span class="devoce-code" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
-        <span style="margin-left: 10px;">{{ item.name }}</span>
+        <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
+        <span style="margin-left: 10px;width: 25%;display: inline-block;">{{ item.name }}</span>
         <span
           :class="item.state === '1' ? 'normal' : item.state === '0' ? 'offline' : item.state === '2' ? 'error' : ''"
           style="margin-left: 10px;"
@@ -275,7 +277,7 @@
 .dirver {
   border: 0;
   height: 2px;
-  background-image: linear-gradient(to right, rgb(0 0 0 / 0%), rgb(63 61 61 / 75%), rgb(0 0 0 / 0%));
+  background-image: linear-gradient(to right, rgb(239 236 236 / 27%), rgb(236 236 236 / 90%), rgba(239 236 236 / 27%));
 }
 
 .devoce-code {
@@ -343,6 +345,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -357,17 +360,17 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
 
         .label-no {
-          width: 28% !important;
+          width: 20% !important;
         }
 
         .label {
-          width: 42%;
+          width: 20%;
           box-sizing: border-box;
           padding: 0 1px;
           font-size: 15px;
@@ -380,8 +383,10 @@
           width: 68%;
           box-sizing: border-box;
           white-space: nowrap;
-          font-size: 14px;
+          // font-size: 14px;
+          font-size: 15px;
           color: #a39f9f;
+          // color: #3cc53c;
 
           /* 确保文本在一行内显示 */
           overflow: hidden;
@@ -421,6 +426,7 @@
     margin: 0 auto;
     margin-top: 5px;
     padding-top: 10px;
+    padding-left: 10px;
 
     .gas-item {
       padding: 3px 5px;
diff --git a/src/views/home/well/components/gasDialog.vue b/src/views/home/well/components/gasDialog.vue
index d165832..9dc34f1 100644
--- a/src/views/home/well/components/gasDialog.vue
+++ b/src/views/home/well/components/gasDialog.vue
@@ -22,7 +22,9 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" title="燃气浓度" append-to-body width="60%">
-    <monitor-data-gas-list v-if="dialogFormVisible" :id="wellId" ref="gasRef" />
+    <div class="body">
+      <monitor-data-gas-list :id="wellId" ref="gasRef" v-model="dialogFormVisible" class="body" />
+    </div>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="cancel">
@@ -34,6 +36,18 @@
 </template>
 
 <style lang="scss" scoped>
+.body {
+  width: 100%;
+
+  ::v-deep(.table-container) {
+    .button-area {
+      .custom {
+        width: 100%;
+      }
+    }
+  }
+}
+
 .el-dialog {
   width: 700px;
 }
@@ -41,4 +55,15 @@
 .el-select {
   width: 100%;
 }
+
+// .body {
+//   ::v-deep(.button-left) {
+//     width: 100%;
+//   }
+// }
+::v-deep(.table-container) {
+  .button-left {
+    width: 100%;
+  }
+}
 </style>

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false
diff --git a/src/views/home/device/device/components/statusReport.vue b/src/views/home/device/device/components/statusReport.vue
index 110d749..5aceccb 100644
--- a/src/views/home/device/device/components/statusReport.vue
+++ b/src/views/home/device/device/components/statusReport.vue
@@ -65,16 +65,19 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-      />
-      <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
-        搜索
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
-        导出
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;" />
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;">
+          导出
+        </el-button>
+      </div>
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index bd04e44..a88f6c7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -4,9 +4,10 @@
   Date: 2024-07-19
  -->
 <script lang="ts" setup name="DeviceManage">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addDialog.vue'
-import { exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
+import { bfDevice, exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
@@ -31,10 +32,10 @@
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
-  // { text: '布防状态', value: '', align: 'center', isRequired: true },
+  { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -57,6 +58,7 @@
   valid: '', // 设备在用情况
   logTime1: '',
   logTime2: '',
+  bfcf: '',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -79,6 +81,8 @@
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
+      bfztName: item.bfzt === '1' ? '布防' : '撤防',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -102,6 +106,7 @@
     valid: '', // 设备在用情况
     logTime1: '',
     logTime2: '',
+    bfcf: '',
   }
   fetchData()
 }
@@ -155,7 +160,7 @@
 // 撤防
 const changeDefense = (row: any) => {
   ElMessageBox.confirm(
-    `确定要撤防${row.devcode}设备吗？`,
+    `确定要${row.bfcf === '1' ? '撤防' : '布防'}${row.devcode}设备吗？`,
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -163,6 +168,13 @@
       type: 'warning',
     },
   ).then(() => {
+    bfDevice({
+      bfcf: row.bfcf === '1' ? '0' : '1',
+      id: row.id,
+    }).then((res) => {
+      ElMessage.success('操作成功')
+      fetchData()
+    })
   })
 }
 // 导出列表
@@ -364,6 +376,15 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select
+          v-model="listQuery.bfcf" placeholder="布防状态" filterable clearable class="select"
+          style="width: 192px;"
+        >
+          <el-option label="布防" value="1" />
+          <el-option label="撤防" value="0" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
@@ -422,9 +443,9 @@
               <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
-                撤防
-              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
+                {{ scope.row.bfzt === '1' ? '撤防' : '布防' }}
+              </el-button>
               <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 65acceb..912c1cc 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -128,7 +128,7 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵') {
+  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
     if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value.push({
       text: '燃气浓度',
@@ -146,7 +146,7 @@
   }).then((res) => {
     loading.value = false
     detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵')) {
+    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
       return
     }
     gasData.value = []
@@ -157,15 +157,15 @@
     }).then((res) => {
       // console.log(res.data, '123321')
       for (const i in res.data) {
-        if (i.includes('管网哨兵') || i.includes('燃气')) {
+        if (i.includes('燃气')) {
           // console.log(i, 'iiiiiiiii')
           gasData.value.push({
             name: i,
             devcode: res.data[i].devcode,
             state: res.data[i].state,
             value: res.data[i].value,
-            text: i.includes('燃气') || i.includes('哨兵') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') || i.includes('哨兵') ? '%LEL' : '',
+            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
+            unit: i.includes('燃气') ? '%LEL' : '',
             stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
           })
         }
@@ -228,13 +228,13 @@
           </div>
 
           <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
-            <div v-for="item in gasData" :key="item.name">
-              {{ item.name }} :
+            <div v-for="item in gasData" v-show="item.text" :key="item.name">
+              {{ item.text }} :
               <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
                 : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气') || item.name.includes('哨兵')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
+              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
               }}</span>
-              <el-button v-if="item.name.includes('燃气') || item.name.includes('哨兵')" size="small" style="margin-left: 10px;" @click="more">
+              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
                 更多
               </el-button>
             </div>
@@ -293,6 +293,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -303,7 +304,7 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 5319851..6381777 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -156,18 +156,21 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <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"
-      />
-      <el-date-picker
-        v-model="datetimerange2" 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>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <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"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
+        <el-date-picker
+          v-model="datetimerange2" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
+          end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 07f48b2..2fa2dee 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -324,10 +324,11 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
+      padding-left: 10px;
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
@@ -350,7 +351,7 @@
           width: 68%;
           box-sizing: border-box;
           white-space: nowrap;
-          font-size: 14px;
+          font-size: 15px;
           color: #a39f9f;
 
           /* 确保文本在一行内显示 */
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 68b3861..3f1bb33 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -32,16 +32,16 @@
     value: 'manageTypeName',
     align: 'center',
   },
-  {
-    text: '产权单位',
-    value: 'propertyOwner',
-    align: 'center',
-  },
-  {
-    text: '产权单位联系人',
-    value: 'propertyOwner',
-    align: 'center',
-  },
+  // {
+  //   text: '产权单位',
+  //   value: 'propertyOwner',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '产权单位联系人',
+  //   value: 'propertyOwner',
+  //   align: 'center',
+  // },
   {
     text: '详细位置',
     value: 'position',
@@ -122,8 +122,9 @@
   getWellDetail(e.info.id).then((res) => {
     baseInfo.value = res.data
     detailInfo.value = res.data
+    descriptionsList.value = descriptionsList.value.filter((item: any) => !item.text.includes('产权单位') && !item.text.includes('联系人'))
     if (baseInfo.value.manageTypeName === '自有' || baseInfo.value.manageTypeName === '') {
-      descriptionsList.value = descriptionsList.value.filter((item: any) => !item.text.includes('产权单位'))
+      console.log(1)
     }
     else {
       descriptionsList.value.splice(2, 0, ...[
@@ -133,7 +134,7 @@
           align: 'center',
         },
         {
-          text: '产权单位联系人',
+          text: '联系人',
           value: 'propertyOwner',
           align: 'center',
         },
@@ -158,7 +159,7 @@
           state: res.data[i].state,
           value: res.data[i].value || '0.00',
           text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-          unit: i.includes('燃气') ? '%LEL' : '',
+          unit: i.includes('燃气') ? '    %LEL' : '',
           stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
         })
       }
@@ -230,7 +231,8 @@
             {{ item.text }}
           </div>
           <div class="value" :title="detailInfo[item.value] || ''">
-            {{ detailInfo[item.value] || '' }}
+            <span v-if="item.text === '监控状态'" :style="{ color: detailInfo[item.value] === '正常' ? '#3cc53c' : detailInfo[item.value] === '离线' ? 'rgb(238, 182, 78)' : detailInfo[item.value] === '异常' ? 'red' : detailInfo[item.value] === '未监控' ? '#a39f9f' : '#a39f9f' }">{{ detailInfo[item.value] || '' }}</span>
+            <span v-else>{{ detailInfo[item.value] || '' }}</span>
           </div>
         </div>
       </div>
@@ -238,7 +240,7 @@
     <!-- 燃气浓度等信息 -->
     <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
     <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
         <div>
           {{ item.text }} :
           <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') ? item.value
@@ -257,8 +259,8 @@
         感知设备运行情况
       </div>
       <div v-for="item in gasData" :key="item.name" class="gas-item">
-        <span class="devoce-code" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
-        <span style="margin-left: 10px;">{{ item.name }}</span>
+        <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
+        <span style="margin-left: 10px;width: 25%;display: inline-block;">{{ item.name }}</span>
         <span
           :class="item.state === '1' ? 'normal' : item.state === '0' ? 'offline' : item.state === '2' ? 'error' : ''"
           style="margin-left: 10px;"
@@ -275,7 +277,7 @@
 .dirver {
   border: 0;
   height: 2px;
-  background-image: linear-gradient(to right, rgb(0 0 0 / 0%), rgb(63 61 61 / 75%), rgb(0 0 0 / 0%));
+  background-image: linear-gradient(to right, rgb(239 236 236 / 27%), rgb(236 236 236 / 90%), rgba(239 236 236 / 27%));
 }
 
 .devoce-code {
@@ -343,6 +345,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -357,17 +360,17 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
 
         .label-no {
-          width: 28% !important;
+          width: 20% !important;
         }
 
         .label {
-          width: 42%;
+          width: 20%;
           box-sizing: border-box;
           padding: 0 1px;
           font-size: 15px;
@@ -380,8 +383,10 @@
           width: 68%;
           box-sizing: border-box;
           white-space: nowrap;
-          font-size: 14px;
+          // font-size: 14px;
+          font-size: 15px;
           color: #a39f9f;
+          // color: #3cc53c;
 
           /* 确保文本在一行内显示 */
           overflow: hidden;
@@ -421,6 +426,7 @@
     margin: 0 auto;
     margin-top: 5px;
     padding-top: 10px;
+    padding-left: 10px;
 
     .gas-item {
       padding: 3px 5px;
diff --git a/src/views/home/well/components/gasDialog.vue b/src/views/home/well/components/gasDialog.vue
index d165832..9dc34f1 100644
--- a/src/views/home/well/components/gasDialog.vue
+++ b/src/views/home/well/components/gasDialog.vue
@@ -22,7 +22,9 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" title="燃气浓度" append-to-body width="60%">
-    <monitor-data-gas-list v-if="dialogFormVisible" :id="wellId" ref="gasRef" />
+    <div class="body">
+      <monitor-data-gas-list :id="wellId" ref="gasRef" v-model="dialogFormVisible" class="body" />
+    </div>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="cancel">
@@ -34,6 +36,18 @@
 </template>
 
 <style lang="scss" scoped>
+.body {
+  width: 100%;
+
+  ::v-deep(.table-container) {
+    .button-area {
+      .custom {
+        width: 100%;
+      }
+    }
+  }
+}
+
 .el-dialog {
   width: 700px;
 }
@@ -41,4 +55,15 @@
 .el-select {
   width: 100%;
 }
+
+// .body {
+//   ::v-deep(.button-left) {
+//     width: 100%;
+//   }
+// }
+::v-deep(.table-container) {
+  .button-left {
+    width: 100%;
+  }
+}
 </style>
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index 2c7be14..3f1815a 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -110,6 +110,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
+      <span style="margin-right: 5px;white-space: nowrap;">报警时间:</span>
       <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"

diff --git a/public/config/config.json b/public/config/config.json
index bbd1e3a..310124c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,7 +3,7 @@
   "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
-  "xuntengMap": "http://localhost:8080/_allLayer/tile",
+  "xuntengMap": "http://111.198.10.15:11643/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
   "version": "1.0.1",
   "node": "16.18.1"
 }
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index ba63678..fbfcf2d 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -128,3 +128,11 @@
     responseType: 'blob',
   })
 }
+// 撤防/布防
+export function bfDevice(data: any) {
+  return request({
+    url: '/system/busDevice/bfcf',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index ff678cb..6e6af6a 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -73,7 +73,7 @@
   <config-dialog ref="configRef" @confirm="confirmColumns" />
   <div class="table-container">
     <div class="button-area">
-      <div style="display: flex;align-items: center;">
+      <div class="custom" style="display: flex;align-items: center;">
         <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
           <el-icon v-if="isConfig" :size="21" class="icon-menu" @click="config">
             <menu />
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2ac23a5..70a8abe 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -125,8 +125,8 @@
               visible: true,
               zIndex: 0,
               opacity: 1,
-              zooms: [1, 19],
-              dataZooms: [1, 19],
+              zooms: [10, 19],
+              dataZooms: [10, 19],
               getTileUrl: (a: any, b: any, c: any) => {
                 // 经纬度转换成本地瓦片所在路径
                 const flag = '00000000'
@@ -203,8 +203,8 @@
     visible: true,
     zIndex: 0,
     opacity: 1,
-    zooms: [1, 19],
-    dataZooms: [1, 19],
+    zooms: [10, 19],
+    dataZooms: [10, 19],
     getTileUrl: (a: any, b: any, c: any) => {
       // 经纬度转换成本地瓦片所在路径
       const flag = '00000000'
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index b2b375a..b199b80 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -103,20 +103,23 @@
     <table-container title="">
       <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"
-        />
-        <!-- <el-date-picker
+        <div style="display: flex;align-items: center;white-space: nowrap;">
+          <span style="margin-right: 5px;">采集时间: </span>
+          <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"
+          />
+          <!-- <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-button type="primary" style="margin-left: 10px;" @click="fetchData">
-          搜索
-        </el-button>
-        <el-button @click="switchView">
-          切换视图
-        </el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+            搜索
+          </el-button>
+          <el-button @click="switchView">
+            切换视图
+          </el-button>
+        </div>
       </template>
       <normal-table
         v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -124,8 +127,8 @@
       />
       <div v-show="!isShowTable" style="width: 100%;height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-          unit="%LEL"
+          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+          :gradient="false" :smooth="false" unit="%LEL"
           :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
           :grid="{
             top: 50,
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 7e60256..047984c 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -161,7 +161,7 @@
 <template>
   <el-dialog v-model="dialogFormVisible" title="流程图" append-to-body>
     <div v-loading="loading" class="process-container">
-      <el-steps style="width: 100%;" :active="active">
+      <el-steps style="width: 100%;" :active="active" align-center>
         <el-step v-for="item in processData" :key="item.name" @click="processDetail(item)">
           <template #icon>
             <el-tooltip
@@ -195,6 +195,20 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep(.el-step__line) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__line-inner) {
+  height: 1px !important;
+}
+
+::v-deep(.el-step__title) {
+  padding-top: 15px;
+  text-align: center;
+  // margin-left: -10px;
+}
+
 .el-dialog {
   width: 700px;
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index d851391..aecda22 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -164,7 +164,7 @@
     })
     return
   }
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  // datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
   setTimeout(() => {
     fetchData()
   })
diff --git a/src/views/home/dashboard/components/detailInfoDialog.vue b/src/views/home/dashboard/components/detailInfoDialog.vue
index f94ad76..45b8551 100644
--- a/src/views/home/dashboard/components/detailInfoDialog.vue
+++ b/src/views/home/dashboard/components/detailInfoDialog.vue
@@ -45,7 +45,7 @@
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" @mouseleave="() => { }">
+  <div v-show="dialogFormVisible" class="container" :class="flag === 'well' ? 'well' : ''" :style="{ padding: flag === 'well' ? '0' : '0 10px' }" @mouseleave="() => { }">
     <div class="header">
       <span @click="close">x</span>
     </div>
@@ -66,6 +66,7 @@
     border: none;
     border-radius: 0;
     width: 100%;
+    padding-left: 0 !important;
 
     .header {
       // padding-top: 10px;
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 89db9e9..53448ea 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -240,24 +240,30 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForCollect" 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="timerangForReport" 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>
-      <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;" @click="exportList">
-        导出
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
-        切换视图
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <el-date-picker
+          v-model="timerangForCollect" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上报时间:</span>
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button
+          v-if="proxy.hasPerm('/device/manage/export')" type="primary" style="margin-left: 10px;"
+          @click="exportList"
+        >
+          导出
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;" @click="changeView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index 04f2b91..e9ff690 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -4,6 +4,7 @@
   Date: 2023-09-03
  -->
 <script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
 import { ElMessage } from 'element-plus'
 import detailData from './detailData.vue'
 import showPosition from './showPosition.vue'
@@ -76,6 +77,8 @@
     try {
       const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
       detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
       detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
       detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
       loading.value = false
diff --git a/src/views/home/device/device/components/statusReport.vue b/src/views/home/device/device/components/statusReport.vue
index 110d749..5aceccb 100644
--- a/src/views/home/device/device/components/statusReport.vue
+++ b/src/views/home/device/device/components/statusReport.vue
@@ -65,16 +65,19 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <el-date-picker
-        v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
-        end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-      />
-      <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
-        搜索
-      </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
-        导出
-      </el-button>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;" />
+        <el-date-picker
+          v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="上报开始时间"
+          end-placeholder="上报结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button type="primary" style="margin-left: 10px;">
+          导出
+        </el-button>
+      </div>
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index bd04e44..a88f6c7 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -4,9 +4,10 @@
   Date: 2024-07-19
  -->
 <script lang="ts" setup name="DeviceManage">
+import dayjs from 'dayjs'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addDialog.vue'
-import { exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
+import { bfDevice, exportDevice, getDeviceListPage, importDevice, removeDevice, templateDevice } from '@/api/home/device/device'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
@@ -31,10 +32,10 @@
   { text: '详细位置', value: 'position', align: 'center', isRequired: true },
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
-  // { text: '布防状态', value: '', align: 'center', isRequired: true },
+  { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
-  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '180' },
+  { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -57,6 +58,7 @@
   valid: '', // 设备在用情况
   logTime1: '',
   logTime2: '',
+  bfcf: '',
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -79,6 +81,8 @@
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
+      installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
+      bfztName: item.bfzt === '1' ? '布防' : '撤防',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -102,6 +106,7 @@
     valid: '', // 设备在用情况
     logTime1: '',
     logTime2: '',
+    bfcf: '',
   }
   fetchData()
 }
@@ -155,7 +160,7 @@
 // 撤防
 const changeDefense = (row: any) => {
   ElMessageBox.confirm(
-    `确定要撤防${row.devcode}设备吗？`,
+    `确定要${row.bfcf === '1' ? '撤防' : '布防'}${row.devcode}设备吗？`,
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -163,6 +168,13 @@
       type: 'warning',
     },
   ).then(() => {
+    bfDevice({
+      bfcf: row.bfcf === '1' ? '0' : '1',
+      id: row.id,
+    }).then((res) => {
+      ElMessage.success('操作成功')
+      fetchData()
+    })
   })
 }
 // 导出列表
@@ -364,6 +376,15 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select
+          v-model="listQuery.bfcf" placeholder="布防状态" filterable clearable class="select"
+          style="width: 192px;"
+        >
+          <el-option label="布防" value="1" />
+          <el-option label="撤防" value="0" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
@@ -422,9 +443,9 @@
               <el-button v-if="proxy.hasPerm('/device/manage/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <!-- <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
-                撤防
-              </el-button> -->
+              <el-button v-if="proxy.hasPerm('/device/manage/add')" type="danger" link size="small" @click="changeDefense(scope.row)">
+                {{ scope.row.bfzt === '1' ? '撤防' : '布防' }}
+              </el-button>
               <el-button v-if="proxy.hasPerm('/device/manage/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
                 删除
               </el-button>
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 65acceb..912c1cc 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -128,7 +128,7 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵') {
+  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
     if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value.push({
       text: '燃气浓度',
@@ -146,7 +146,7 @@
   }).then((res) => {
     loading.value = false
     detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName === '燃气智能监测终端' || rowData.value.deviceTypeName === '管网哨兵')) {
+    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
       return
     }
     gasData.value = []
@@ -157,15 +157,15 @@
     }).then((res) => {
       // console.log(res.data, '123321')
       for (const i in res.data) {
-        if (i.includes('管网哨兵') || i.includes('燃气')) {
+        if (i.includes('燃气')) {
           // console.log(i, 'iiiiiiiii')
           gasData.value.push({
             name: i,
             devcode: res.data[i].devcode,
             state: res.data[i].state,
             value: res.data[i].value,
-            text: i.includes('燃气') || i.includes('哨兵') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') || i.includes('哨兵') ? '%LEL' : '',
+            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
+            unit: i.includes('燃气') ? '%LEL' : '',
             stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
           })
         }
@@ -228,13 +228,13 @@
           </div>
 
           <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
-            <div v-for="item in gasData" :key="item.name">
-              {{ item.name }} :
+            <div v-for="item in gasData" v-show="item.text" :key="item.name">
+              {{ item.text }} :
               <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
                 : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气') || item.name.includes('哨兵')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
+              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
               }}</span>
-              <el-button v-if="item.name.includes('燃气') || item.name.includes('哨兵')" size="small" style="margin-left: 10px;" @click="more">
+              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
                 更多
               </el-button>
             </div>
@@ -293,6 +293,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -303,7 +304,7 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 5319851..6381777 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -156,18 +156,21 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
-      <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"
-      />
-      <el-date-picker
-        v-model="datetimerange2" 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>
+      <div style="display: flex;align-items: center;">
+        <span style="margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <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"
+        />
+        <span style="margin-right: 5px;margin-left: 10px;white-space: nowrap;">上传时间:</span>
+        <el-date-picker
+          v-model="datetimerange2" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
+          end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 07f48b2..2fa2dee 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -324,10 +324,11 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
+      padding-left: 10px;
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
@@ -350,7 +351,7 @@
           width: 68%;
           box-sizing: border-box;
           white-space: nowrap;
-          font-size: 14px;
+          font-size: 15px;
           color: #a39f9f;
 
           /* 确保文本在一行内显示 */
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 68b3861..3f1bb33 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -32,16 +32,16 @@
     value: 'manageTypeName',
     align: 'center',
   },
-  {
-    text: '产权单位',
-    value: 'propertyOwner',
-    align: 'center',
-  },
-  {
-    text: '产权单位联系人',
-    value: 'propertyOwner',
-    align: 'center',
-  },
+  // {
+  //   text: '产权单位',
+  //   value: 'propertyOwner',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '产权单位联系人',
+  //   value: 'propertyOwner',
+  //   align: 'center',
+  // },
   {
     text: '详细位置',
     value: 'position',
@@ -122,8 +122,9 @@
   getWellDetail(e.info.id).then((res) => {
     baseInfo.value = res.data
     detailInfo.value = res.data
+    descriptionsList.value = descriptionsList.value.filter((item: any) => !item.text.includes('产权单位') && !item.text.includes('联系人'))
     if (baseInfo.value.manageTypeName === '自有' || baseInfo.value.manageTypeName === '') {
-      descriptionsList.value = descriptionsList.value.filter((item: any) => !item.text.includes('产权单位'))
+      console.log(1)
     }
     else {
       descriptionsList.value.splice(2, 0, ...[
@@ -133,7 +134,7 @@
           align: 'center',
         },
         {
-          text: '产权单位联系人',
+          text: '联系人',
           value: 'propertyOwner',
           align: 'center',
         },
@@ -158,7 +159,7 @@
           state: res.data[i].state,
           value: res.data[i].value || '0.00',
           text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-          unit: i.includes('燃气') ? '%LEL' : '',
+          unit: i.includes('燃气') ? '    %LEL' : '',
           stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
         })
       }
@@ -230,7 +231,8 @@
             {{ item.text }}
           </div>
           <div class="value" :title="detailInfo[item.value] || ''">
-            {{ detailInfo[item.value] || '' }}
+            <span v-if="item.text === '监控状态'" :style="{ color: detailInfo[item.value] === '正常' ? '#3cc53c' : detailInfo[item.value] === '离线' ? 'rgb(238, 182, 78)' : detailInfo[item.value] === '异常' ? 'red' : detailInfo[item.value] === '未监控' ? '#a39f9f' : '#a39f9f' }">{{ detailInfo[item.value] || '' }}</span>
+            <span v-else>{{ detailInfo[item.value] || '' }}</span>
           </div>
         </div>
       </div>
@@ -238,7 +240,7 @@
     <!-- 燃气浓度等信息 -->
     <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
     <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
         <div>
           {{ item.text }} :
           <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') ? item.value
@@ -257,8 +259,8 @@
         感知设备运行情况
       </div>
       <div v-for="item in gasData" :key="item.name" class="gas-item">
-        <span class="devoce-code" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
-        <span style="margin-left: 10px;">{{ item.name }}</span>
+        <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
+        <span style="margin-left: 10px;width: 25%;display: inline-block;">{{ item.name }}</span>
         <span
           :class="item.state === '1' ? 'normal' : item.state === '0' ? 'offline' : item.state === '2' ? 'error' : ''"
           style="margin-left: 10px;"
@@ -275,7 +277,7 @@
 .dirver {
   border: 0;
   height: 2px;
-  background-image: linear-gradient(to right, rgb(0 0 0 / 0%), rgb(63 61 61 / 75%), rgb(0 0 0 / 0%));
+  background-image: linear-gradient(to right, rgb(239 236 236 / 27%), rgb(236 236 236 / 90%), rgba(239 236 236 / 27%));
 }
 
 .devoce-code {
@@ -343,6 +345,7 @@
 
   .body {
     width: 100%;
+    padding-left: 10px;
 
     .descriptions {
       width: 100%;
@@ -357,17 +360,17 @@
 
       .descriptions-item {
         width: 48%;
-        margin: 1.5px 5px;
+        margin: 4px 5px;
         box-sizing: border-box;
         display: flex;
         padding: 0 3px;
 
         .label-no {
-          width: 28% !important;
+          width: 20% !important;
         }
 
         .label {
-          width: 42%;
+          width: 20%;
           box-sizing: border-box;
           padding: 0 1px;
           font-size: 15px;
@@ -380,8 +383,10 @@
           width: 68%;
           box-sizing: border-box;
           white-space: nowrap;
-          font-size: 14px;
+          // font-size: 14px;
+          font-size: 15px;
           color: #a39f9f;
+          // color: #3cc53c;
 
           /* 确保文本在一行内显示 */
           overflow: hidden;
@@ -421,6 +426,7 @@
     margin: 0 auto;
     margin-top: 5px;
     padding-top: 10px;
+    padding-left: 10px;
 
     .gas-item {
       padding: 3px 5px;
diff --git a/src/views/home/well/components/gasDialog.vue b/src/views/home/well/components/gasDialog.vue
index d165832..9dc34f1 100644
--- a/src/views/home/well/components/gasDialog.vue
+++ b/src/views/home/well/components/gasDialog.vue
@@ -22,7 +22,9 @@
 
 <template>
   <el-dialog v-model="dialogFormVisible" title="燃气浓度" append-to-body width="60%">
-    <monitor-data-gas-list v-if="dialogFormVisible" :id="wellId" ref="gasRef" />
+    <div class="body">
+      <monitor-data-gas-list :id="wellId" ref="gasRef" v-model="dialogFormVisible" class="body" />
+    </div>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="cancel">
@@ -34,6 +36,18 @@
 </template>
 
 <style lang="scss" scoped>
+.body {
+  width: 100%;
+
+  ::v-deep(.table-container) {
+    .button-area {
+      .custom {
+        width: 100%;
+      }
+    }
+  }
+}
+
 .el-dialog {
   width: 700px;
 }
@@ -41,4 +55,15 @@
 .el-select {
   width: 100%;
 }
+
+// .body {
+//   ::v-deep(.button-left) {
+//     width: 100%;
+//   }
+// }
+::v-deep(.table-container) {
+  .button-left {
+    width: 100%;
+  }
+}
 </style>
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index 2c7be14..3f1815a 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -110,6 +110,7 @@
   <table-container title="">
     <template #btns-left>
       <!-- 查询条件 -->
+      <span style="margin-right: 5px;white-space: nowrap;">报警时间:</span>
       <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"
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index d756fa4..a85c8f7 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -110,23 +110,27 @@
 </script>
 
 <template>
-  <table-container title="">
+  <table-container class="body" title="">
     <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"
-      />
-      <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>
-      <el-button @click="switchView">
-        切换视图
-      </el-button>
+      <div style="width: 100%; display: flex;align-items: center;">
+        <!-- 查询条件 -->
+        <span style="margin-right: 5px;white-space: nowrap;">上报时间:</span>
+        <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"
+        />
+        <span style="margin-left: 10px;margin-right: 5px;white-space: nowrap;">采集时间:</span>
+        <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"
+        />
+        <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          搜索
+        </el-button>
+        <el-button @click="switchView">
+          切换视图
+        </el-button>
+      </div>
     </template>
     <normal-table
       v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
@@ -134,9 +138,8 @@
     />
     <div v-show="!isShowTable" style="width: 100%;height: 240px;">
       <line-chart
-        v-if="xAxisData.length"
-        :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
-        unit="%LEL"
+        v-if="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false" :smooth="false" unit="%LEL"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
         :grid="{
           top: 50,
@@ -150,3 +153,24 @@
     </div>
   </table-container>
 </template>
+
+<style lang="scss" scoped>
+// .el-dialog {
+//   width: 700px;
+// }
+
+// .el-select {
+//   width: 100%;
+// }
+
+// // .body {
+// //   ::v-deep(.button-left) {
+// //     width: 100%;
+// //   }
+// // }
+::v-deep(.table-container) {
+  .button-left {
+    width: 100%;
+  }
+}
+</style>