diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{
diff --git a/src/views/overview/components/infoWindowXl.vue b/src/views/overview/components/infoWindowXl.vue
index 623ba97..056b828 100644
--- a/src/views/overview/components/infoWindowXl.vue
+++ b/src/views/overview/components/infoWindowXl.vue
@@ -9,10 +9,11 @@
       {{ xlInfo.length>0?xlInfo[0].valveCode: '' }}
     </div>
     <div class="alarm-body">
-      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>
-      <div>位置： {{ xlInfo.map(item => item.blockName).join() }}</div>
+<!--      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>-->
+      <div>影响区域： {{ xlInfo.map(item => item.blockName).join() }}</div>
+      <div>闸井位置： {{ xlInfo.map(item => item.place).join() }}</div>
     </div>
-    <el-button type="primary" @click="showPosition">查看关阀影响区域</el-button>
+    <el-button type="primary" @click="showPosition" style="margin-left: 60px">查看关阀影响区域</el-button>
   </div>
 </template>
 

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{
diff --git a/src/views/overview/components/infoWindowXl.vue b/src/views/overview/components/infoWindowXl.vue
index 623ba97..056b828 100644
--- a/src/views/overview/components/infoWindowXl.vue
+++ b/src/views/overview/components/infoWindowXl.vue
@@ -9,10 +9,11 @@
       {{ xlInfo.length>0?xlInfo[0].valveCode: '' }}
     </div>
     <div class="alarm-body">
-      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>
-      <div>位置： {{ xlInfo.map(item => item.blockName).join() }}</div>
+<!--      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>-->
+      <div>影响区域： {{ xlInfo.map(item => item.blockName).join() }}</div>
+      <div>闸井位置： {{ xlInfo.map(item => item.place).join() }}</div>
     </div>
-    <el-button type="primary" @click="showPosition">查看关阀影响区域</el-button>
+    <el-button type="primary" @click="showPosition" style="margin-left: 60px">查看关阀影响区域</el-button>
   </div>
 </template>
 
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index b34a006..a133acf 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -4,6 +4,7 @@
  * @Date: 2022-05-18
  -->
 <template>
+  <div>
   <div class="map-search-div">
     <!--搜索条件-->
     <div>
@@ -14,29 +15,32 @@
       </el-input>
     </div>
     <!--搜索结果弹出框-->
-    <el-popover
-      v-show="list.length>0"
-      v-model="resultShow"
-      placement="bottom-end"
-      width="311"
-      trigger="manual"
-    >
-      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </div>
-      <div class="list-div">
-        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <el-pagination
-        :total="list.length"
-        :current-page="pageNum"
-        :page-size="pageSize"
-        :hide-on-single-page="true"
-        small
-        layout="prev, pager, next"
-        @current-change="changePage"
-      />
-    </el-popover>
+  </div>
+  <div
+    class="result-pop"
+    v-show="list.length>0"
+    v-model="resultShow"
+    placement="bottom-end"
+    width="311"
+    trigger="manual"
+  >
+    <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+      共找到 {{ list.length }} 个符合条件的{{ name }}
+    </div>
+    <div class="list-div">
+      <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+    </div>
+    <el-pagination
+      style="width: 100%;text-align: center;background-color: white"
+      :total="list.length"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :hide-on-single-page="true"
+      small
+      layout="prev, pager, next"
+      @current-change="changePage"
+    />
+  </div>
   </div>
 </template>
 
@@ -119,25 +123,42 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.result-pop {
+  position: absolute;
+  top: 50px;
+  left: 20px;
+  transform-origin: center top;
+  color: #606266;
+  line-height: 1.4;
+  text-align: justify;
+  font-size: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  word-break: break-all;
+  z-index: 999999999999;
+  width: 320px;
+}
+.select-answer{
+  margin: 5px 0;
+  font-size:14px;
+  padding: 10px 20px;
+  width: 100%;
+  height: 40px;
+  color: #606266;
+  background-color: #FFFFFF;
+  border: 1px solid #EBEEF5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
 .map-search-div{
   position: absolute;
   z-index: 100;
   left: 30px;
   top: 5px;
-  .select-answer{
-    position: relative;
-    margin-top: 5px;
-    font-size:14px;
-    padding: 10px 20px;
-    width: 311px;
-    color: #606266;
-    background-color: #FFFFFF;
-    border: 1px solid #EBEEF5;
-    border-radius: 4px;
-    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
-  }
   .list-div{
     background-color: #FFFFFF;
+    margin-top: 5px;
+    border-radius: 10px;
+    z-index: 999999999999;
   }
 }
 

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{
diff --git a/src/views/overview/components/infoWindowXl.vue b/src/views/overview/components/infoWindowXl.vue
index 623ba97..056b828 100644
--- a/src/views/overview/components/infoWindowXl.vue
+++ b/src/views/overview/components/infoWindowXl.vue
@@ -9,10 +9,11 @@
       {{ xlInfo.length>0?xlInfo[0].valveCode: '' }}
     </div>
     <div class="alarm-body">
-      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>
-      <div>位置： {{ xlInfo.map(item => item.blockName).join() }}</div>
+<!--      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>-->
+      <div>影响区域： {{ xlInfo.map(item => item.blockName).join() }}</div>
+      <div>闸井位置： {{ xlInfo.map(item => item.place).join() }}</div>
     </div>
-    <el-button type="primary" @click="showPosition">查看关阀影响区域</el-button>
+    <el-button type="primary" @click="showPosition" style="margin-left: 60px">查看关阀影响区域</el-button>
   </div>
 </template>
 
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index b34a006..a133acf 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -4,6 +4,7 @@
  * @Date: 2022-05-18
  -->
 <template>
+  <div>
   <div class="map-search-div">
     <!--搜索条件-->
     <div>
@@ -14,29 +15,32 @@
       </el-input>
     </div>
     <!--搜索结果弹出框-->
-    <el-popover
-      v-show="list.length>0"
-      v-model="resultShow"
-      placement="bottom-end"
-      width="311"
-      trigger="manual"
-    >
-      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </div>
-      <div class="list-div">
-        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <el-pagination
-        :total="list.length"
-        :current-page="pageNum"
-        :page-size="pageSize"
-        :hide-on-single-page="true"
-        small
-        layout="prev, pager, next"
-        @current-change="changePage"
-      />
-    </el-popover>
+  </div>
+  <div
+    class="result-pop"
+    v-show="list.length>0"
+    v-model="resultShow"
+    placement="bottom-end"
+    width="311"
+    trigger="manual"
+  >
+    <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+      共找到 {{ list.length }} 个符合条件的{{ name }}
+    </div>
+    <div class="list-div">
+      <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+    </div>
+    <el-pagination
+      style="width: 100%;text-align: center;background-color: white"
+      :total="list.length"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :hide-on-single-page="true"
+      small
+      layout="prev, pager, next"
+      @current-change="changePage"
+    />
+  </div>
   </div>
 </template>
 
@@ -119,25 +123,42 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.result-pop {
+  position: absolute;
+  top: 50px;
+  left: 20px;
+  transform-origin: center top;
+  color: #606266;
+  line-height: 1.4;
+  text-align: justify;
+  font-size: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  word-break: break-all;
+  z-index: 999999999999;
+  width: 320px;
+}
+.select-answer{
+  margin: 5px 0;
+  font-size:14px;
+  padding: 10px 20px;
+  width: 100%;
+  height: 40px;
+  color: #606266;
+  background-color: #FFFFFF;
+  border: 1px solid #EBEEF5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
 .map-search-div{
   position: absolute;
   z-index: 100;
   left: 30px;
   top: 5px;
-  .select-answer{
-    position: relative;
-    margin-top: 5px;
-    font-size:14px;
-    padding: 10px 20px;
-    width: 311px;
-    color: #606266;
-    background-color: #FFFFFF;
-    border: 1px solid #EBEEF5;
-    border-radius: 4px;
-    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
-  }
   .list-div{
     background-color: #FFFFFF;
+    margin-top: 5px;
+    border-radius: 10px;
+    z-index: 999999999999;
   }
 }
 
diff --git a/src/views/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
index 454e64d..d5fd811 100644
--- a/src/views/overview/components/mapSearchItem.vue
+++ b/src/views/overview/components/mapSearchItem.vue
@@ -60,6 +60,7 @@
   padding:5px 10px;
   overflow: auto;
   display: flex;
+  background-color: white;
   .card-left{
     .index{
       display: inline-block;

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{
diff --git a/src/views/overview/components/infoWindowXl.vue b/src/views/overview/components/infoWindowXl.vue
index 623ba97..056b828 100644
--- a/src/views/overview/components/infoWindowXl.vue
+++ b/src/views/overview/components/infoWindowXl.vue
@@ -9,10 +9,11 @@
       {{ xlInfo.length>0?xlInfo[0].valveCode: '' }}
     </div>
     <div class="alarm-body">
-      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>
-      <div>位置： {{ xlInfo.map(item => item.blockName).join() }}</div>
+<!--      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>-->
+      <div>影响区域： {{ xlInfo.map(item => item.blockName).join() }}</div>
+      <div>闸井位置： {{ xlInfo.map(item => item.place).join() }}</div>
     </div>
-    <el-button type="primary" @click="showPosition">查看关阀影响区域</el-button>
+    <el-button type="primary" @click="showPosition" style="margin-left: 60px">查看关阀影响区域</el-button>
   </div>
 </template>
 
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index b34a006..a133acf 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -4,6 +4,7 @@
  * @Date: 2022-05-18
  -->
 <template>
+  <div>
   <div class="map-search-div">
     <!--搜索条件-->
     <div>
@@ -14,29 +15,32 @@
       </el-input>
     </div>
     <!--搜索结果弹出框-->
-    <el-popover
-      v-show="list.length>0"
-      v-model="resultShow"
-      placement="bottom-end"
-      width="311"
-      trigger="manual"
-    >
-      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </div>
-      <div class="list-div">
-        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <el-pagination
-        :total="list.length"
-        :current-page="pageNum"
-        :page-size="pageSize"
-        :hide-on-single-page="true"
-        small
-        layout="prev, pager, next"
-        @current-change="changePage"
-      />
-    </el-popover>
+  </div>
+  <div
+    class="result-pop"
+    v-show="list.length>0"
+    v-model="resultShow"
+    placement="bottom-end"
+    width="311"
+    trigger="manual"
+  >
+    <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+      共找到 {{ list.length }} 个符合条件的{{ name }}
+    </div>
+    <div class="list-div">
+      <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+    </div>
+    <el-pagination
+      style="width: 100%;text-align: center;background-color: white"
+      :total="list.length"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :hide-on-single-page="true"
+      small
+      layout="prev, pager, next"
+      @current-change="changePage"
+    />
+  </div>
   </div>
 </template>
 
@@ -119,25 +123,42 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.result-pop {
+  position: absolute;
+  top: 50px;
+  left: 20px;
+  transform-origin: center top;
+  color: #606266;
+  line-height: 1.4;
+  text-align: justify;
+  font-size: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  word-break: break-all;
+  z-index: 999999999999;
+  width: 320px;
+}
+.select-answer{
+  margin: 5px 0;
+  font-size:14px;
+  padding: 10px 20px;
+  width: 100%;
+  height: 40px;
+  color: #606266;
+  background-color: #FFFFFF;
+  border: 1px solid #EBEEF5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
 .map-search-div{
   position: absolute;
   z-index: 100;
   left: 30px;
   top: 5px;
-  .select-answer{
-    position: relative;
-    margin-top: 5px;
-    font-size:14px;
-    padding: 10px 20px;
-    width: 311px;
-    color: #606266;
-    background-color: #FFFFFF;
-    border: 1px solid #EBEEF5;
-    border-radius: 4px;
-    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
-  }
   .list-div{
     background-color: #FFFFFF;
+    margin-top: 5px;
+    border-radius: 10px;
+    z-index: 999999999999;
   }
 }
 
diff --git a/src/views/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
index 454e64d..d5fd811 100644
--- a/src/views/overview/components/mapSearchItem.vue
+++ b/src/views/overview/components/mapSearchItem.vue
@@ -60,6 +60,7 @@
   padding:5px 10px;
   overflow: auto;
   display: flex;
+  background-color: white;
   .card-left{
     .index{
       display: inline-block;
diff --git a/src/views/overview/mnxlfx.vue b/src/views/overview/mnxlfx.vue
index 310a73c..9543d23 100644
--- a/src/views/overview/mnxlfx.vue
+++ b/src/views/overview/mnxlfx.vue
@@ -13,10 +13,15 @@
       <div class="info-box" v-show="isShowTable">
         <i class="el-icon-error" style="cursor: pointer;position: absolute;right: 10px;font-size: 20px;color: #3f9dfe" @click="isShowTable=false"></i>
         <div style="font-weight: bold;margin: 10px 0px">关阀分析</div>
-        <div style="margin-left: 10px">共找到上游阀门 <span style="font-weight: bold">{{total}}</span> 个</div>
-        <el-table :data="list" border size="small" height="220px" class="table" style="width: 280px">
+        <div style="margin-left: 10px">共找到上游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '上游').length}}</span> 个，下游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '下游').length}}</span> 个，其他
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '其他').length}}</span> 个
+        </div>
+        <el-table :data="list" border size="small" height="220px" class="table" style="width: 380px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="valveCode" align="center" label="阀 门"/>
+          <el-table-column prop="valveType" align="center" width="80" label="阀门类型"/>
           <el-table-column fixed="right" align="center" width="80" label="操作">
             <template slot-scope="scope">
               <el-button @click="flyTo(scope.row)" type="text" size="small">定位</el-button>
@@ -82,9 +87,10 @@
       })
       appList().then(response => {
         if (response.code === 200) {
-          response.data.forEach(item => {
+          response.data.forEach((item,index) => {
             var polyline = new AMap.Polyline({
-              path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              // path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              path: [[item.startLongitudeGd, item.startLatitudeGd], [item.endLongitudeGd, item.endLatitudeGd]],
               // borderWeight: 1, // 线条宽度，默认为 1
               strokeWeight: 4,
               strokeColor: '#ff4bde', // 线条颜色
@@ -109,6 +115,7 @@
                           position: new AMap.LngLat( point.longitude, point.latitude ),
                           extData: point,
                           icon: icon, // 添加 Icon 实例
+                          offset: new AMap.Pixel(-15, -15),
                         })
                         door.on('click', function (door_e) {
                           getAreasByValve(door_e.target._opts.extData.valveCode).then(re => {
@@ -142,7 +149,7 @@
                             const xlWindow = new XlWindow().$mount()
                             const infoWindow = new window.AMap.InfoWindow({
                               content: xlWindow .$el, // 显示内容
-                              offset: [15, -10], // 偏移
+                              offset: [0, -16], // 偏移
                               autoMove: true // 是否自动调整窗体到视野内
                             })
                             infoWindow.open(window.map, new toLngLat([door_e.target._opts.extData.longitude, door_e.target._opts.extData.latitude]))
@@ -285,7 +292,7 @@
   left: 10px;
   top: 10px;
   border-radius: 10px;
-  width: 300px;
+  width: 400px;
   height: 300px;
   overflow: hidden;
   background: rgba(255, 255, 255, 0.9);

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{
diff --git a/src/views/overview/components/infoWindowXl.vue b/src/views/overview/components/infoWindowXl.vue
index 623ba97..056b828 100644
--- a/src/views/overview/components/infoWindowXl.vue
+++ b/src/views/overview/components/infoWindowXl.vue
@@ -9,10 +9,11 @@
       {{ xlInfo.length>0?xlInfo[0].valveCode: '' }}
     </div>
     <div class="alarm-body">
-      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>
-      <div>位置： {{ xlInfo.map(item => item.blockName).join() }}</div>
+<!--      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>-->
+      <div>影响区域： {{ xlInfo.map(item => item.blockName).join() }}</div>
+      <div>闸井位置： {{ xlInfo.map(item => item.place).join() }}</div>
     </div>
-    <el-button type="primary" @click="showPosition">查看关阀影响区域</el-button>
+    <el-button type="primary" @click="showPosition" style="margin-left: 60px">查看关阀影响区域</el-button>
   </div>
 </template>
 
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index b34a006..a133acf 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -4,6 +4,7 @@
  * @Date: 2022-05-18
  -->
 <template>
+  <div>
   <div class="map-search-div">
     <!--搜索条件-->
     <div>
@@ -14,29 +15,32 @@
       </el-input>
     </div>
     <!--搜索结果弹出框-->
-    <el-popover
-      v-show="list.length>0"
-      v-model="resultShow"
-      placement="bottom-end"
-      width="311"
-      trigger="manual"
-    >
-      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </div>
-      <div class="list-div">
-        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <el-pagination
-        :total="list.length"
-        :current-page="pageNum"
-        :page-size="pageSize"
-        :hide-on-single-page="true"
-        small
-        layout="prev, pager, next"
-        @current-change="changePage"
-      />
-    </el-popover>
+  </div>
+  <div
+    class="result-pop"
+    v-show="list.length>0"
+    v-model="resultShow"
+    placement="bottom-end"
+    width="311"
+    trigger="manual"
+  >
+    <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+      共找到 {{ list.length }} 个符合条件的{{ name }}
+    </div>
+    <div class="list-div">
+      <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+    </div>
+    <el-pagination
+      style="width: 100%;text-align: center;background-color: white"
+      :total="list.length"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :hide-on-single-page="true"
+      small
+      layout="prev, pager, next"
+      @current-change="changePage"
+    />
+  </div>
   </div>
 </template>
 
@@ -119,25 +123,42 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.result-pop {
+  position: absolute;
+  top: 50px;
+  left: 20px;
+  transform-origin: center top;
+  color: #606266;
+  line-height: 1.4;
+  text-align: justify;
+  font-size: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  word-break: break-all;
+  z-index: 999999999999;
+  width: 320px;
+}
+.select-answer{
+  margin: 5px 0;
+  font-size:14px;
+  padding: 10px 20px;
+  width: 100%;
+  height: 40px;
+  color: #606266;
+  background-color: #FFFFFF;
+  border: 1px solid #EBEEF5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
 .map-search-div{
   position: absolute;
   z-index: 100;
   left: 30px;
   top: 5px;
-  .select-answer{
-    position: relative;
-    margin-top: 5px;
-    font-size:14px;
-    padding: 10px 20px;
-    width: 311px;
-    color: #606266;
-    background-color: #FFFFFF;
-    border: 1px solid #EBEEF5;
-    border-radius: 4px;
-    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
-  }
   .list-div{
     background-color: #FFFFFF;
+    margin-top: 5px;
+    border-radius: 10px;
+    z-index: 999999999999;
   }
 }
 
diff --git a/src/views/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
index 454e64d..d5fd811 100644
--- a/src/views/overview/components/mapSearchItem.vue
+++ b/src/views/overview/components/mapSearchItem.vue
@@ -60,6 +60,7 @@
   padding:5px 10px;
   overflow: auto;
   display: flex;
+  background-color: white;
   .card-left{
     .index{
       display: inline-block;
diff --git a/src/views/overview/mnxlfx.vue b/src/views/overview/mnxlfx.vue
index 310a73c..9543d23 100644
--- a/src/views/overview/mnxlfx.vue
+++ b/src/views/overview/mnxlfx.vue
@@ -13,10 +13,15 @@
       <div class="info-box" v-show="isShowTable">
         <i class="el-icon-error" style="cursor: pointer;position: absolute;right: 10px;font-size: 20px;color: #3f9dfe" @click="isShowTable=false"></i>
         <div style="font-weight: bold;margin: 10px 0px">关阀分析</div>
-        <div style="margin-left: 10px">共找到上游阀门 <span style="font-weight: bold">{{total}}</span> 个</div>
-        <el-table :data="list" border size="small" height="220px" class="table" style="width: 280px">
+        <div style="margin-left: 10px">共找到上游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '上游').length}}</span> 个，下游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '下游').length}}</span> 个，其他
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '其他').length}}</span> 个
+        </div>
+        <el-table :data="list" border size="small" height="220px" class="table" style="width: 380px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="valveCode" align="center" label="阀 门"/>
+          <el-table-column prop="valveType" align="center" width="80" label="阀门类型"/>
           <el-table-column fixed="right" align="center" width="80" label="操作">
             <template slot-scope="scope">
               <el-button @click="flyTo(scope.row)" type="text" size="small">定位</el-button>
@@ -82,9 +87,10 @@
       })
       appList().then(response => {
         if (response.code === 200) {
-          response.data.forEach(item => {
+          response.data.forEach((item,index) => {
             var polyline = new AMap.Polyline({
-              path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              // path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              path: [[item.startLongitudeGd, item.startLatitudeGd], [item.endLongitudeGd, item.endLatitudeGd]],
               // borderWeight: 1, // 线条宽度，默认为 1
               strokeWeight: 4,
               strokeColor: '#ff4bde', // 线条颜色
@@ -109,6 +115,7 @@
                           position: new AMap.LngLat( point.longitude, point.latitude ),
                           extData: point,
                           icon: icon, // 添加 Icon 实例
+                          offset: new AMap.Pixel(-15, -15),
                         })
                         door.on('click', function (door_e) {
                           getAreasByValve(door_e.target._opts.extData.valveCode).then(re => {
@@ -142,7 +149,7 @@
                             const xlWindow = new XlWindow().$mount()
                             const infoWindow = new window.AMap.InfoWindow({
                               content: xlWindow .$el, // 显示内容
-                              offset: [15, -10], // 偏移
+                              offset: [0, -16], // 偏移
                               autoMove: true // 是否自动调整窗体到视野内
                             })
                             infoWindow.open(window.map, new toLngLat([door_e.target._opts.extData.longitude, door_e.target._opts.extData.latitude]))
@@ -285,7 +292,7 @@
   left: 10px;
   top: 10px;
   border-radius: 10px;
-  width: 300px;
+  width: 400px;
   height: 300px;
   overflow: hidden;
   background: rgba(255, 255, 255, 0.9);
diff --git a/src/views/support/support.vue b/src/views/support/support.vue
index 8013299..a6ec5bb 100644
--- a/src/views/support/support.vue
+++ b/src/views/support/support.vue
@@ -182,7 +182,18 @@
         }
         this.devType = this.deviceTypeList[0].value
         this.devType1 = this.deviceTypeList[0].value
-        this.devType2 = this.deviceTypeList[0].value
+        const arr = this.deviceTypeList.map(item => item.value)
+        const in1 = arr.indexOf('1')
+        const in4 = arr.indexOf('4')
+        if( in1 < in4 && in1 !== -1) {
+          this.devType2 = '1'
+        }
+        else if( in4 < in1 && in4 !== -1) {
+          this.devType2 = '4'
+        }
+        else if( in1 === -1 && in4 === -1) {
+          this.devType2 = ''
+        }
       })
     },
   }

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{
diff --git a/src/views/overview/components/infoWindowXl.vue b/src/views/overview/components/infoWindowXl.vue
index 623ba97..056b828 100644
--- a/src/views/overview/components/infoWindowXl.vue
+++ b/src/views/overview/components/infoWindowXl.vue
@@ -9,10 +9,11 @@
       {{ xlInfo.length>0?xlInfo[0].valveCode: '' }}
     </div>
     <div class="alarm-body">
-      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>
-      <div>位置： {{ xlInfo.map(item => item.blockName).join() }}</div>
+<!--      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>-->
+      <div>影响区域： {{ xlInfo.map(item => item.blockName).join() }}</div>
+      <div>闸井位置： {{ xlInfo.map(item => item.place).join() }}</div>
     </div>
-    <el-button type="primary" @click="showPosition">查看关阀影响区域</el-button>
+    <el-button type="primary" @click="showPosition" style="margin-left: 60px">查看关阀影响区域</el-button>
   </div>
 </template>
 
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index b34a006..a133acf 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -4,6 +4,7 @@
  * @Date: 2022-05-18
  -->
 <template>
+  <div>
   <div class="map-search-div">
     <!--搜索条件-->
     <div>
@@ -14,29 +15,32 @@
       </el-input>
     </div>
     <!--搜索结果弹出框-->
-    <el-popover
-      v-show="list.length>0"
-      v-model="resultShow"
-      placement="bottom-end"
-      width="311"
-      trigger="manual"
-    >
-      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </div>
-      <div class="list-div">
-        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <el-pagination
-        :total="list.length"
-        :current-page="pageNum"
-        :page-size="pageSize"
-        :hide-on-single-page="true"
-        small
-        layout="prev, pager, next"
-        @current-change="changePage"
-      />
-    </el-popover>
+  </div>
+  <div
+    class="result-pop"
+    v-show="list.length>0"
+    v-model="resultShow"
+    placement="bottom-end"
+    width="311"
+    trigger="manual"
+  >
+    <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+      共找到 {{ list.length }} 个符合条件的{{ name }}
+    </div>
+    <div class="list-div">
+      <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+    </div>
+    <el-pagination
+      style="width: 100%;text-align: center;background-color: white"
+      :total="list.length"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :hide-on-single-page="true"
+      small
+      layout="prev, pager, next"
+      @current-change="changePage"
+    />
+  </div>
   </div>
 </template>
 
@@ -119,25 +123,42 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.result-pop {
+  position: absolute;
+  top: 50px;
+  left: 20px;
+  transform-origin: center top;
+  color: #606266;
+  line-height: 1.4;
+  text-align: justify;
+  font-size: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  word-break: break-all;
+  z-index: 999999999999;
+  width: 320px;
+}
+.select-answer{
+  margin: 5px 0;
+  font-size:14px;
+  padding: 10px 20px;
+  width: 100%;
+  height: 40px;
+  color: #606266;
+  background-color: #FFFFFF;
+  border: 1px solid #EBEEF5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
 .map-search-div{
   position: absolute;
   z-index: 100;
   left: 30px;
   top: 5px;
-  .select-answer{
-    position: relative;
-    margin-top: 5px;
-    font-size:14px;
-    padding: 10px 20px;
-    width: 311px;
-    color: #606266;
-    background-color: #FFFFFF;
-    border: 1px solid #EBEEF5;
-    border-radius: 4px;
-    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
-  }
   .list-div{
     background-color: #FFFFFF;
+    margin-top: 5px;
+    border-radius: 10px;
+    z-index: 999999999999;
   }
 }
 
diff --git a/src/views/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
index 454e64d..d5fd811 100644
--- a/src/views/overview/components/mapSearchItem.vue
+++ b/src/views/overview/components/mapSearchItem.vue
@@ -60,6 +60,7 @@
   padding:5px 10px;
   overflow: auto;
   display: flex;
+  background-color: white;
   .card-left{
     .index{
       display: inline-block;
diff --git a/src/views/overview/mnxlfx.vue b/src/views/overview/mnxlfx.vue
index 310a73c..9543d23 100644
--- a/src/views/overview/mnxlfx.vue
+++ b/src/views/overview/mnxlfx.vue
@@ -13,10 +13,15 @@
       <div class="info-box" v-show="isShowTable">
         <i class="el-icon-error" style="cursor: pointer;position: absolute;right: 10px;font-size: 20px;color: #3f9dfe" @click="isShowTable=false"></i>
         <div style="font-weight: bold;margin: 10px 0px">关阀分析</div>
-        <div style="margin-left: 10px">共找到上游阀门 <span style="font-weight: bold">{{total}}</span> 个</div>
-        <el-table :data="list" border size="small" height="220px" class="table" style="width: 280px">
+        <div style="margin-left: 10px">共找到上游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '上游').length}}</span> 个，下游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '下游').length}}</span> 个，其他
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '其他').length}}</span> 个
+        </div>
+        <el-table :data="list" border size="small" height="220px" class="table" style="width: 380px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="valveCode" align="center" label="阀 门"/>
+          <el-table-column prop="valveType" align="center" width="80" label="阀门类型"/>
           <el-table-column fixed="right" align="center" width="80" label="操作">
             <template slot-scope="scope">
               <el-button @click="flyTo(scope.row)" type="text" size="small">定位</el-button>
@@ -82,9 +87,10 @@
       })
       appList().then(response => {
         if (response.code === 200) {
-          response.data.forEach(item => {
+          response.data.forEach((item,index) => {
             var polyline = new AMap.Polyline({
-              path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              // path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              path: [[item.startLongitudeGd, item.startLatitudeGd], [item.endLongitudeGd, item.endLatitudeGd]],
               // borderWeight: 1, // 线条宽度，默认为 1
               strokeWeight: 4,
               strokeColor: '#ff4bde', // 线条颜色
@@ -109,6 +115,7 @@
                           position: new AMap.LngLat( point.longitude, point.latitude ),
                           extData: point,
                           icon: icon, // 添加 Icon 实例
+                          offset: new AMap.Pixel(-15, -15),
                         })
                         door.on('click', function (door_e) {
                           getAreasByValve(door_e.target._opts.extData.valveCode).then(re => {
@@ -142,7 +149,7 @@
                             const xlWindow = new XlWindow().$mount()
                             const infoWindow = new window.AMap.InfoWindow({
                               content: xlWindow .$el, // 显示内容
-                              offset: [15, -10], // 偏移
+                              offset: [0, -16], // 偏移
                               autoMove: true // 是否自动调整窗体到视野内
                             })
                             infoWindow.open(window.map, new toLngLat([door_e.target._opts.extData.longitude, door_e.target._opts.extData.latitude]))
@@ -285,7 +292,7 @@
   left: 10px;
   top: 10px;
   border-radius: 10px;
-  width: 300px;
+  width: 400px;
   height: 300px;
   overflow: hidden;
   background: rgba(255, 255, 255, 0.9);
diff --git a/src/views/support/support.vue b/src/views/support/support.vue
index 8013299..a6ec5bb 100644
--- a/src/views/support/support.vue
+++ b/src/views/support/support.vue
@@ -182,7 +182,18 @@
         }
         this.devType = this.deviceTypeList[0].value
         this.devType1 = this.deviceTypeList[0].value
-        this.devType2 = this.deviceTypeList[0].value
+        const arr = this.deviceTypeList.map(item => item.value)
+        const in1 = arr.indexOf('1')
+        const in4 = arr.indexOf('4')
+        if( in1 < in4 && in1 !== -1) {
+          this.devType2 = '1'
+        }
+        else if( in4 < in1 && in4 !== -1) {
+          this.devType2 = '4'
+        }
+        else if( in1 === -1 && in4 === -1) {
+          this.devType2 = ''
+        }
       })
     },
   }
diff --git a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
index a5352b3..4a5ceb9 100644
--- a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
@@ -143,6 +143,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, tenantId, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
       this.fetchData(tenantId, row.name, row.deviceType)
       if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.disableEdit = false

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{
diff --git a/src/views/overview/components/infoWindowXl.vue b/src/views/overview/components/infoWindowXl.vue
index 623ba97..056b828 100644
--- a/src/views/overview/components/infoWindowXl.vue
+++ b/src/views/overview/components/infoWindowXl.vue
@@ -9,10 +9,11 @@
       {{ xlInfo.length>0?xlInfo[0].valveCode: '' }}
     </div>
     <div class="alarm-body">
-      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>
-      <div>位置： {{ xlInfo.map(item => item.blockName).join() }}</div>
+<!--      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>-->
+      <div>影响区域： {{ xlInfo.map(item => item.blockName).join() }}</div>
+      <div>闸井位置： {{ xlInfo.map(item => item.place).join() }}</div>
     </div>
-    <el-button type="primary" @click="showPosition">查看关阀影响区域</el-button>
+    <el-button type="primary" @click="showPosition" style="margin-left: 60px">查看关阀影响区域</el-button>
   </div>
 </template>
 
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index b34a006..a133acf 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -4,6 +4,7 @@
  * @Date: 2022-05-18
  -->
 <template>
+  <div>
   <div class="map-search-div">
     <!--搜索条件-->
     <div>
@@ -14,29 +15,32 @@
       </el-input>
     </div>
     <!--搜索结果弹出框-->
-    <el-popover
-      v-show="list.length>0"
-      v-model="resultShow"
-      placement="bottom-end"
-      width="311"
-      trigger="manual"
-    >
-      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </div>
-      <div class="list-div">
-        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <el-pagination
-        :total="list.length"
-        :current-page="pageNum"
-        :page-size="pageSize"
-        :hide-on-single-page="true"
-        small
-        layout="prev, pager, next"
-        @current-change="changePage"
-      />
-    </el-popover>
+  </div>
+  <div
+    class="result-pop"
+    v-show="list.length>0"
+    v-model="resultShow"
+    placement="bottom-end"
+    width="311"
+    trigger="manual"
+  >
+    <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+      共找到 {{ list.length }} 个符合条件的{{ name }}
+    </div>
+    <div class="list-div">
+      <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+    </div>
+    <el-pagination
+      style="width: 100%;text-align: center;background-color: white"
+      :total="list.length"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :hide-on-single-page="true"
+      small
+      layout="prev, pager, next"
+      @current-change="changePage"
+    />
+  </div>
   </div>
 </template>
 
@@ -119,25 +123,42 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.result-pop {
+  position: absolute;
+  top: 50px;
+  left: 20px;
+  transform-origin: center top;
+  color: #606266;
+  line-height: 1.4;
+  text-align: justify;
+  font-size: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  word-break: break-all;
+  z-index: 999999999999;
+  width: 320px;
+}
+.select-answer{
+  margin: 5px 0;
+  font-size:14px;
+  padding: 10px 20px;
+  width: 100%;
+  height: 40px;
+  color: #606266;
+  background-color: #FFFFFF;
+  border: 1px solid #EBEEF5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
 .map-search-div{
   position: absolute;
   z-index: 100;
   left: 30px;
   top: 5px;
-  .select-answer{
-    position: relative;
-    margin-top: 5px;
-    font-size:14px;
-    padding: 10px 20px;
-    width: 311px;
-    color: #606266;
-    background-color: #FFFFFF;
-    border: 1px solid #EBEEF5;
-    border-radius: 4px;
-    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
-  }
   .list-div{
     background-color: #FFFFFF;
+    margin-top: 5px;
+    border-radius: 10px;
+    z-index: 999999999999;
   }
 }
 
diff --git a/src/views/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
index 454e64d..d5fd811 100644
--- a/src/views/overview/components/mapSearchItem.vue
+++ b/src/views/overview/components/mapSearchItem.vue
@@ -60,6 +60,7 @@
   padding:5px 10px;
   overflow: auto;
   display: flex;
+  background-color: white;
   .card-left{
     .index{
       display: inline-block;
diff --git a/src/views/overview/mnxlfx.vue b/src/views/overview/mnxlfx.vue
index 310a73c..9543d23 100644
--- a/src/views/overview/mnxlfx.vue
+++ b/src/views/overview/mnxlfx.vue
@@ -13,10 +13,15 @@
       <div class="info-box" v-show="isShowTable">
         <i class="el-icon-error" style="cursor: pointer;position: absolute;right: 10px;font-size: 20px;color: #3f9dfe" @click="isShowTable=false"></i>
         <div style="font-weight: bold;margin: 10px 0px">关阀分析</div>
-        <div style="margin-left: 10px">共找到上游阀门 <span style="font-weight: bold">{{total}}</span> 个</div>
-        <el-table :data="list" border size="small" height="220px" class="table" style="width: 280px">
+        <div style="margin-left: 10px">共找到上游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '上游').length}}</span> 个，下游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '下游').length}}</span> 个，其他
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '其他').length}}</span> 个
+        </div>
+        <el-table :data="list" border size="small" height="220px" class="table" style="width: 380px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="valveCode" align="center" label="阀 门"/>
+          <el-table-column prop="valveType" align="center" width="80" label="阀门类型"/>
           <el-table-column fixed="right" align="center" width="80" label="操作">
             <template slot-scope="scope">
               <el-button @click="flyTo(scope.row)" type="text" size="small">定位</el-button>
@@ -82,9 +87,10 @@
       })
       appList().then(response => {
         if (response.code === 200) {
-          response.data.forEach(item => {
+          response.data.forEach((item,index) => {
             var polyline = new AMap.Polyline({
-              path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              // path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              path: [[item.startLongitudeGd, item.startLatitudeGd], [item.endLongitudeGd, item.endLatitudeGd]],
               // borderWeight: 1, // 线条宽度，默认为 1
               strokeWeight: 4,
               strokeColor: '#ff4bde', // 线条颜色
@@ -109,6 +115,7 @@
                           position: new AMap.LngLat( point.longitude, point.latitude ),
                           extData: point,
                           icon: icon, // 添加 Icon 实例
+                          offset: new AMap.Pixel(-15, -15),
                         })
                         door.on('click', function (door_e) {
                           getAreasByValve(door_e.target._opts.extData.valveCode).then(re => {
@@ -142,7 +149,7 @@
                             const xlWindow = new XlWindow().$mount()
                             const infoWindow = new window.AMap.InfoWindow({
                               content: xlWindow .$el, // 显示内容
-                              offset: [15, -10], // 偏移
+                              offset: [0, -16], // 偏移
                               autoMove: true // 是否自动调整窗体到视野内
                             })
                             infoWindow.open(window.map, new toLngLat([door_e.target._opts.extData.longitude, door_e.target._opts.extData.latitude]))
@@ -285,7 +292,7 @@
   left: 10px;
   top: 10px;
   border-radius: 10px;
-  width: 300px;
+  width: 400px;
   height: 300px;
   overflow: hidden;
   background: rgba(255, 255, 255, 0.9);
diff --git a/src/views/support/support.vue b/src/views/support/support.vue
index 8013299..a6ec5bb 100644
--- a/src/views/support/support.vue
+++ b/src/views/support/support.vue
@@ -182,7 +182,18 @@
         }
         this.devType = this.deviceTypeList[0].value
         this.devType1 = this.deviceTypeList[0].value
-        this.devType2 = this.deviceTypeList[0].value
+        const arr = this.deviceTypeList.map(item => item.value)
+        const in1 = arr.indexOf('1')
+        const in4 = arr.indexOf('4')
+        if( in1 < in4 && in1 !== -1) {
+          this.devType2 = '1'
+        }
+        else if( in4 < in1 && in4 !== -1) {
+          this.devType2 = '4'
+        }
+        else if( in1 === -1 && in4 === -1) {
+          this.devType2 = ''
+        }
       })
     },
   }
diff --git a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
index a5352b3..4a5ceb9 100644
--- a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
@@ -143,6 +143,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, tenantId, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
       this.fetchData(tenantId, row.name, row.deviceType)
       if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.disableEdit = false
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index bddd56a..fe1f518 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -77,7 +77,7 @@
         { type: 'text', label: '点位维护单位', value: 'responsibleDeptName', placeholder: '未知' },
         { type: 'text', label: '井深(m)', value: 'deep', placeholder: '--' },
         { type: 'text', label: '布防状态', value: 'bfztName', placeholder: '未知' },
-        { type: 'text', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
+        { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
@@ -101,7 +101,7 @@
         photos: '', // 照片路径
         notes: '', // 备注,
         qu: '',
-        quName: '', // 区名称
+        quName: '',
         area: '', // 街道
         areaName: '',
         road: '',
@@ -156,8 +156,8 @@
         areaName: row.areaName // 所在区域
       }
       if (row.deptid && row.deptid !== '') {
-        // this.fetchArea1()
-        // this.fetchArea2()
+        this.fetchArea1()
+        this.fetchArea2()
       }
       // 处理图片
       const urls = row.photos.split(';')
@@ -232,53 +232,53 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-  .editDialog{
-    .el-dialog {
-      width: 900px;
-      margin-top: 10vh !important;
-      .el-scrollbar {
-        height: 410px;
-        width: 100%;
-      }
-      .el-scrollbar__wrap {
-        /*overflow: scroll;*/
-        overflow-x: auto;
-        overflow-y: auto;
-      }
-      .el-scrollbar__view{
-        width: 98%;
-      }
+.hide .el-upload--picture-card {
+  display: none;
+}
+.editDialog{
+  .el-dialog {
+    width: 900px;
+    margin-top: 10vh !important;
+    .el-scrollbar {
+      height: 410px;
+      width: 100%;
+    }
+    .el-scrollbar__wrap {
+      /*overflow: scroll;*/
+      overflow-x: auto;
+      overflow-y: auto;
+    }
+    .el-scrollbar__view{
+      width: 98%;
     }
   }
-  .el-select{
-    width: 100%;
-  }
-  .line{
-    width: 50px;
-    margin-left: 5px;
-  }
-  .hide .el-upload-–picture-card{
-    display: none;
-  }
-  .imgBox{
-    width: 100%;
-    text-align: center;
-  }
-  .watch-div {
-    margin-top: 15px;
-    .table-title {
-      margin-top: 10px;
-      .title-header {
-        height: 40px;
-        padding: 10px;
-        border-radius: 4px;
-        border: solid 1px #F3F3F3;
-        background-color: #fafafa;
-        color: #606266;
-      }
+}
+.el-select{
+  width: 100%;
+}
+.line{
+  width: 50px;
+  margin-left: 5px;
+}
+.hide .el-upload-–picture-card{
+  display: none;
+}
+.imgBox{
+  width: 100%;
+  text-align: center;
+}
+.watch-div {
+  margin-top: 15px;
+  .table-title {
+    margin-top: 10px;
+    .title-header {
+      height: 40px;
+      padding: 10px;
+      border-radius: 4px;
+      border: solid 1px #F3F3F3;
+      background-color: #fafafa;
+      color: #606266;
     }
   }
+}
 </style>

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{
diff --git a/src/views/overview/components/infoWindowXl.vue b/src/views/overview/components/infoWindowXl.vue
index 623ba97..056b828 100644
--- a/src/views/overview/components/infoWindowXl.vue
+++ b/src/views/overview/components/infoWindowXl.vue
@@ -9,10 +9,11 @@
       {{ xlInfo.length>0?xlInfo[0].valveCode: '' }}
     </div>
     <div class="alarm-body">
-      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>
-      <div>位置： {{ xlInfo.map(item => item.blockName).join() }}</div>
+<!--      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>-->
+      <div>影响区域： {{ xlInfo.map(item => item.blockName).join() }}</div>
+      <div>闸井位置： {{ xlInfo.map(item => item.place).join() }}</div>
     </div>
-    <el-button type="primary" @click="showPosition">查看关阀影响区域</el-button>
+    <el-button type="primary" @click="showPosition" style="margin-left: 60px">查看关阀影响区域</el-button>
   </div>
 </template>
 
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index b34a006..a133acf 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -4,6 +4,7 @@
  * @Date: 2022-05-18
  -->
 <template>
+  <div>
   <div class="map-search-div">
     <!--搜索条件-->
     <div>
@@ -14,29 +15,32 @@
       </el-input>
     </div>
     <!--搜索结果弹出框-->
-    <el-popover
-      v-show="list.length>0"
-      v-model="resultShow"
-      placement="bottom-end"
-      width="311"
-      trigger="manual"
-    >
-      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </div>
-      <div class="list-div">
-        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <el-pagination
-        :total="list.length"
-        :current-page="pageNum"
-        :page-size="pageSize"
-        :hide-on-single-page="true"
-        small
-        layout="prev, pager, next"
-        @current-change="changePage"
-      />
-    </el-popover>
+  </div>
+  <div
+    class="result-pop"
+    v-show="list.length>0"
+    v-model="resultShow"
+    placement="bottom-end"
+    width="311"
+    trigger="manual"
+  >
+    <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+      共找到 {{ list.length }} 个符合条件的{{ name }}
+    </div>
+    <div class="list-div">
+      <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+    </div>
+    <el-pagination
+      style="width: 100%;text-align: center;background-color: white"
+      :total="list.length"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :hide-on-single-page="true"
+      small
+      layout="prev, pager, next"
+      @current-change="changePage"
+    />
+  </div>
   </div>
 </template>
 
@@ -119,25 +123,42 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.result-pop {
+  position: absolute;
+  top: 50px;
+  left: 20px;
+  transform-origin: center top;
+  color: #606266;
+  line-height: 1.4;
+  text-align: justify;
+  font-size: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  word-break: break-all;
+  z-index: 999999999999;
+  width: 320px;
+}
+.select-answer{
+  margin: 5px 0;
+  font-size:14px;
+  padding: 10px 20px;
+  width: 100%;
+  height: 40px;
+  color: #606266;
+  background-color: #FFFFFF;
+  border: 1px solid #EBEEF5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
 .map-search-div{
   position: absolute;
   z-index: 100;
   left: 30px;
   top: 5px;
-  .select-answer{
-    position: relative;
-    margin-top: 5px;
-    font-size:14px;
-    padding: 10px 20px;
-    width: 311px;
-    color: #606266;
-    background-color: #FFFFFF;
-    border: 1px solid #EBEEF5;
-    border-radius: 4px;
-    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
-  }
   .list-div{
     background-color: #FFFFFF;
+    margin-top: 5px;
+    border-radius: 10px;
+    z-index: 999999999999;
   }
 }
 
diff --git a/src/views/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
index 454e64d..d5fd811 100644
--- a/src/views/overview/components/mapSearchItem.vue
+++ b/src/views/overview/components/mapSearchItem.vue
@@ -60,6 +60,7 @@
   padding:5px 10px;
   overflow: auto;
   display: flex;
+  background-color: white;
   .card-left{
     .index{
       display: inline-block;
diff --git a/src/views/overview/mnxlfx.vue b/src/views/overview/mnxlfx.vue
index 310a73c..9543d23 100644
--- a/src/views/overview/mnxlfx.vue
+++ b/src/views/overview/mnxlfx.vue
@@ -13,10 +13,15 @@
       <div class="info-box" v-show="isShowTable">
         <i class="el-icon-error" style="cursor: pointer;position: absolute;right: 10px;font-size: 20px;color: #3f9dfe" @click="isShowTable=false"></i>
         <div style="font-weight: bold;margin: 10px 0px">关阀分析</div>
-        <div style="margin-left: 10px">共找到上游阀门 <span style="font-weight: bold">{{total}}</span> 个</div>
-        <el-table :data="list" border size="small" height="220px" class="table" style="width: 280px">
+        <div style="margin-left: 10px">共找到上游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '上游').length}}</span> 个，下游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '下游').length}}</span> 个，其他
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '其他').length}}</span> 个
+        </div>
+        <el-table :data="list" border size="small" height="220px" class="table" style="width: 380px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="valveCode" align="center" label="阀 门"/>
+          <el-table-column prop="valveType" align="center" width="80" label="阀门类型"/>
           <el-table-column fixed="right" align="center" width="80" label="操作">
             <template slot-scope="scope">
               <el-button @click="flyTo(scope.row)" type="text" size="small">定位</el-button>
@@ -82,9 +87,10 @@
       })
       appList().then(response => {
         if (response.code === 200) {
-          response.data.forEach(item => {
+          response.data.forEach((item,index) => {
             var polyline = new AMap.Polyline({
-              path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              // path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              path: [[item.startLongitudeGd, item.startLatitudeGd], [item.endLongitudeGd, item.endLatitudeGd]],
               // borderWeight: 1, // 线条宽度，默认为 1
               strokeWeight: 4,
               strokeColor: '#ff4bde', // 线条颜色
@@ -109,6 +115,7 @@
                           position: new AMap.LngLat( point.longitude, point.latitude ),
                           extData: point,
                           icon: icon, // 添加 Icon 实例
+                          offset: new AMap.Pixel(-15, -15),
                         })
                         door.on('click', function (door_e) {
                           getAreasByValve(door_e.target._opts.extData.valveCode).then(re => {
@@ -142,7 +149,7 @@
                             const xlWindow = new XlWindow().$mount()
                             const infoWindow = new window.AMap.InfoWindow({
                               content: xlWindow .$el, // 显示内容
-                              offset: [15, -10], // 偏移
+                              offset: [0, -16], // 偏移
                               autoMove: true // 是否自动调整窗体到视野内
                             })
                             infoWindow.open(window.map, new toLngLat([door_e.target._opts.extData.longitude, door_e.target._opts.extData.latitude]))
@@ -285,7 +292,7 @@
   left: 10px;
   top: 10px;
   border-radius: 10px;
-  width: 300px;
+  width: 400px;
   height: 300px;
   overflow: hidden;
   background: rgba(255, 255, 255, 0.9);
diff --git a/src/views/support/support.vue b/src/views/support/support.vue
index 8013299..a6ec5bb 100644
--- a/src/views/support/support.vue
+++ b/src/views/support/support.vue
@@ -182,7 +182,18 @@
         }
         this.devType = this.deviceTypeList[0].value
         this.devType1 = this.deviceTypeList[0].value
-        this.devType2 = this.deviceTypeList[0].value
+        const arr = this.deviceTypeList.map(item => item.value)
+        const in1 = arr.indexOf('1')
+        const in4 = arr.indexOf('4')
+        if( in1 < in4 && in1 !== -1) {
+          this.devType2 = '1'
+        }
+        else if( in4 < in1 && in4 !== -1) {
+          this.devType2 = '4'
+        }
+        else if( in1 === -1 && in4 === -1) {
+          this.devType2 = ''
+        }
       })
     },
   }
diff --git a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
index a5352b3..4a5ceb9 100644
--- a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
@@ -143,6 +143,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, tenantId, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
       this.fetchData(tenantId, row.name, row.deviceType)
       if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.disableEdit = false
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index bddd56a..fe1f518 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -77,7 +77,7 @@
         { type: 'text', label: '点位维护单位', value: 'responsibleDeptName', placeholder: '未知' },
         { type: 'text', label: '井深(m)', value: 'deep', placeholder: '--' },
         { type: 'text', label: '布防状态', value: 'bfztName', placeholder: '未知' },
-        { type: 'text', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
+        { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
@@ -101,7 +101,7 @@
         photos: '', // 照片路径
         notes: '', // 备注,
         qu: '',
-        quName: '', // 区名称
+        quName: '',
         area: '', // 街道
         areaName: '',
         road: '',
@@ -156,8 +156,8 @@
         areaName: row.areaName // 所在区域
       }
       if (row.deptid && row.deptid !== '') {
-        // this.fetchArea1()
-        // this.fetchArea2()
+        this.fetchArea1()
+        this.fetchArea2()
       }
       // 处理图片
       const urls = row.photos.split(';')
@@ -232,53 +232,53 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-  .editDialog{
-    .el-dialog {
-      width: 900px;
-      margin-top: 10vh !important;
-      .el-scrollbar {
-        height: 410px;
-        width: 100%;
-      }
-      .el-scrollbar__wrap {
-        /*overflow: scroll;*/
-        overflow-x: auto;
-        overflow-y: auto;
-      }
-      .el-scrollbar__view{
-        width: 98%;
-      }
+.hide .el-upload--picture-card {
+  display: none;
+}
+.editDialog{
+  .el-dialog {
+    width: 900px;
+    margin-top: 10vh !important;
+    .el-scrollbar {
+      height: 410px;
+      width: 100%;
+    }
+    .el-scrollbar__wrap {
+      /*overflow: scroll;*/
+      overflow-x: auto;
+      overflow-y: auto;
+    }
+    .el-scrollbar__view{
+      width: 98%;
     }
   }
-  .el-select{
-    width: 100%;
-  }
-  .line{
-    width: 50px;
-    margin-left: 5px;
-  }
-  .hide .el-upload-–picture-card{
-    display: none;
-  }
-  .imgBox{
-    width: 100%;
-    text-align: center;
-  }
-  .watch-div {
-    margin-top: 15px;
-    .table-title {
-      margin-top: 10px;
-      .title-header {
-        height: 40px;
-        padding: 10px;
-        border-radius: 4px;
-        border: solid 1px #F3F3F3;
-        background-color: #fafafa;
-        color: #606266;
-      }
+}
+.el-select{
+  width: 100%;
+}
+.line{
+  width: 50px;
+  margin-left: 5px;
+}
+.hide .el-upload-–picture-card{
+  display: none;
+}
+.imgBox{
+  width: 100%;
+  text-align: center;
+}
+.watch-div {
+  margin-top: 15px;
+  .table-title {
+    margin-top: 10px;
+    .title-header {
+      height: 40px;
+      padding: 10px;
+      border-radius: 4px;
+      border: solid 1px #F3F3F3;
+      background-color: #fafafa;
+      color: #606266;
     }
   }
+}
 </style>
diff --git a/src/views/wellManage/editLine.vue b/src/views/wellManage/editLine.vue
index b5d4acc..33bcae4 100644
--- a/src/views/wellManage/editLine.vue
+++ b/src/views/wellManage/editLine.vue
@@ -26,7 +26,12 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="材质" prop="material">
-            <el-input v-model.trim="form.material" :disabled="isEditMode" type="text" placeholder="必填" />
+            <el-select v-model.trim="form.material" :disabled="isEditMode" type="text" placeholder="必填">
+              <el-option label="PE" value="PE"/>
+              <el-option label="钢管" value="钢管"/>
+              <el-option label="无缝钢管" value="无缝钢管"/>
+            </el-select>
+<!--            <el-input v-model.trim="form.material" :disabled="isEditMode" type="text" placeholder="必填" />-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -198,7 +203,7 @@
       }, // 表头显示标题
       btnLoading: false, // 保存按钮的加载中状态
       rules: {
-        pipelineCode: [{ required: true, message: '管线编号为空', trigger: ['blur', 'change'] }],
+        pipelineCode: [{ required: true, message: '管线编号不能为空', trigger: ['blur', 'change'] }],
         pipeDiameter: [{ required: true, validator: validateNum, trigger: ['blur', 'change'] }],
         startLongitude: [{ required: true, validator: validateNum, trigger: ['blur', 'change'] }],
         startLatitude: [{ required: true, validator: validateNum, trigger: ['blur', 'change'] }],

diff --git a/package.json b/package.json
index b420901..c141bef 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.8.3",
+    "dayjs": "^1.11.10",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.7",
     "js-cookie": "^3.0.0",
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index bac1905..092b5a4 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -15,7 +15,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
-import { getDeptTreeList } from '@/api/system/dept'
+import {getDeptTreeList, getDeptUnLogin} from '@/api/system/dept'
 import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
@@ -48,6 +48,10 @@
       type: Boolean,
       default: false
     }, // 是否强制显示部门下拉列表
+    unlogin: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: 'small'
@@ -88,23 +92,43 @@
       // 如果未指定部门类型
       if (!this.deptType) {
         if (this.$store.getters.allDeptList.length === 0) {
-          getDeptTreeList().then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin().then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.allDeptList)
         }
       } else {
         if (this.$store.getters.companyList.length === 0) {
-          getDeptTreeList({ deptType: this.deptType }).then(response => {
-            const list = response.data
-            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
-              this.refreshList(list)
+          if(!this.unlogin) {
+            getDeptTreeList({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
             })
-          })
+          }
+          else {
+            getDeptUnLogin({deptType: this.deptType}).then(response => {
+              const list = response.data
+              this.$store.dispatch('dict/changeDict', {key: 'companyList', value: list}).then(() => {
+                this.refreshList(list)
+              })
+            })
+          }
         } else {
           this.refreshList(this.$store.getters.companyList)
         }
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 92cf007..1a8c4d6 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -107,16 +107,15 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .search-div{
-    padding:12px;
-    padding-bottom: 2px; /* 本身输入框有10px下边距*/
-    padding-left:0px;
-    padding-top: 2px;
+    /* 本身输入框有10px下边距*/
+    padding: 2px 12px 2px 0px;
     background-color: #fff;
     display: -webkit-flex; /* Safari */
     display: flex;
     justify-content:space-between;
     .search-btn{
-      margin-bottom:10px;
+      margin-bottom: 10px;
+      margin-left: 0px;
     }
   }
   .dialog-footer{
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 9e1ab1d..ee36377 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -83,7 +83,7 @@
         path: '/listJob',
         name: 'ListJob',
         component: () => import('@/views/jobManage/listJobs'),
-        meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
+        meta: { title: '告警工单', icon: 'icon-config', keepAlive: false, permission: ['/job/list'] }
       },
       {
         path: '/detailJob/:id(\\d+)',
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9f5a0b6..136dd3e 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,6 +4,9 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -129,6 +132,7 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
         status: '1',
         offset: 1,
         limit: 20,
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index b5d233c..8501e9d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,6 +9,9 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
@@ -41,14 +44,24 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.status" size="small" placeholder="告警状态" clearable>
+          <el-option
+            v-for="item in alarmStatusList"
+            :key="'type_'+item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="timeRange"
           size="small"
           type="datetimerange"
           range-separator="至"
           value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
+          start-placeholder="告警开始时间"
+          end-placeholder="告警结束时间"
         />
       </search-item>
     </search-area>
@@ -109,6 +122,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import {getDictByCode} from "@/api/system/dict";
 
 export default {
   name: 'ListAlarmRecords',
@@ -133,6 +147,8 @@
         alarmContentType: '',
         beginTime: '',
         endTime: '',
+        devCode: '',
+        status: '',
         offset: 1,
         limit: 20,
         sort: '',
@@ -162,6 +178,11 @@
           align: 'center'
         },
         {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
           text: '告警等级',
           value: 'alarmLevel',
           align: 'center',
@@ -189,14 +210,20 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警结束时间',
+          value: 'handleJobTime',
+          width: 170,
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       alarmTypeList: [], // 告警类型列表
       alarmContentTypeList: [], // 告警内容类型列表
+      alarmStatusList: [],
       showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
@@ -233,6 +260,9 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
+      getDictByCode('alarmStatus').then(res => {
+      this.alarmStatusList = res.data
+    })
     if (isOperation() === false) {
       this.listQuery.alarmType = '1'
     }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index acf1598..27fc3d4 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -28,6 +28,7 @@
 import { alarmWellRank } from '@/api/data/dataStatics'
 import { getAlarmContentType } from '@/api/alarm/alarm'
 import TimeButtons from '@/components/BigData/TimeButtons'
+import {getSearchLastWeekTime} from "@/utils/dateutils";
 export default {
   name: 'AlarmWellRank',
   components: { TimeButtons, PanelCard },
@@ -47,6 +48,7 @@
   },
   created() {
     this.fetchAlarmContentType()
+    this.timeRange = getSearchLastWeekTime()
     this.fetchData()
   },
   mounted() {
diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
index 7356226..ca37ba8 100644
--- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
+++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue
@@ -161,6 +161,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue
index 927a804..be80708 100644
--- a/src/views/deviceConfig/components/ListPressConfig.vue
+++ b/src/views/deviceConfig/components/ListPressConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listDigConfig.vue b/src/views/deviceConfig/components/listDigConfig.vue
index 4d136cb..7cefd83 100644
--- a/src/views/deviceConfig/components/listDigConfig.vue
+++ b/src/views/deviceConfig/components/listDigConfig.vue
@@ -157,6 +157,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listGasConfig.vue b/src/views/deviceConfig/components/listGasConfig.vue
index 6a7d332..1eb625f 100644
--- a/src/views/deviceConfig/components/listGasConfig.vue
+++ b/src/views/deviceConfig/components/listGasConfig.vue
@@ -146,6 +146,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listH2sConfig.vue b/src/views/deviceConfig/components/listH2sConfig.vue
index 7bacc1d..c7b6568 100644
--- a/src/views/deviceConfig/components/listH2sConfig.vue
+++ b/src/views/deviceConfig/components/listH2sConfig.vue
@@ -144,6 +144,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listHarmfulConfig.vue b/src/views/deviceConfig/components/listHarmfulConfig.vue
index 29c3517..e331425 100644
--- a/src/views/deviceConfig/components/listHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/listHarmfulConfig.vue
@@ -132,6 +132,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index ed4faab..8fac8df 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -160,6 +160,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listLiquidGasConfig.vue b/src/views/deviceConfig/components/listLiquidGasConfig.vue
index 4683d8d..b628c16 100644
--- a/src/views/deviceConfig/components/listLiquidGasConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidGasConfig.vue
@@ -142,6 +142,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index 3bd5e7e..afda220 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -145,6 +145,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTempConfig.vue b/src/views/deviceConfig/components/listTempConfig.vue
index 86dda14..ad8e791 100644
--- a/src/views/deviceConfig/components/listTempConfig.vue
+++ b/src/views/deviceConfig/components/listTempConfig.vue
@@ -147,6 +147,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listTubeConfig.vue b/src/views/deviceConfig/components/listTubeConfig.vue
index 6cbb34f..37e736d 100644
--- a/src/views/deviceConfig/components/listTubeConfig.vue
+++ b/src/views/deviceConfig/components/listTubeConfig.vue
@@ -140,6 +140,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellCoverConfig.vue b/src/views/deviceConfig/components/listWellCoverConfig.vue
index ceea86a..f29ee36 100644
--- a/src/views/deviceConfig/components/listWellCoverConfig.vue
+++ b/src/views/deviceConfig/components/listWellCoverConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceConfig/components/listWellLiquidConfig.vue b/src/views/deviceConfig/components/listWellLiquidConfig.vue
index 34fcf41..02cf86c 100644
--- a/src/views/deviceConfig/components/listWellLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listWellLiquidConfig.vue
@@ -125,6 +125,11 @@
           value: 'statusName',
           width: 80,
           align: 'center'
+        },
+        {
+          text: '配置时间',
+          value: 'writeTime',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index ea0fae2..31ad268 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -13,6 +13,8 @@
               type="text"
               placeholder="请输入设备类型编号"
               clearable
+              :step="1"
+              :precision="0"
               :max="100"
               :min="0"
               :disabled="dialogStatus === 'create' ? false : true"
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index bf42b18..0ec6811 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -10,8 +10,14 @@
       @toggleSearchMore="toggleSearchMore"
     >
       <search-item>
+        <el-input v-model.trim="listQuery.jobCode" size="small" placeholder="工单编号" clearable />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.devCode" size="small" placeholder="设备编号" clearable />
+      </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
@@ -23,7 +29,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
+        <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警原因" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
             :key="'content_'+item.value"
@@ -44,7 +50,10 @@
       </search-item>
       <search-item v-if="showOtherSearch">
         <el-date-picker
+          popper-class="no-clear"
+          :append-to-body="false"
           v-model="timeRange"
+          :clearable="false"
           size="small"
           type="datetimerange"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -114,6 +123,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/alarm/job'
 import { isOperation } from '@/utils/permission'
+import { getSearchLastMonthTime } from "@/utils/dateutils";
 
 let isFromDetail = false
 export default {
@@ -150,6 +160,8 @@
         alarmType: '',
         alarmContentType: '',
         jobStatus: '',
+        jobCode: '',
+        devCode: '',
         beginTime: '',
         endTime: '',
         offset: 1,
@@ -276,6 +288,7 @@
     }
   },
   created() {
+    this.timeRange = getSearchLastMonthTime()
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
@@ -287,7 +300,7 @@
       this.listQuery.alarmContentType = ''
       this.listQuery.beginTime = ''
       this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getSearchLastMonthTime()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
@@ -429,6 +442,14 @@
 }
 </script>
 
+<style lang="scss" scoped>
+::v-deep .no-clear {
+  .el-picker-panel__footer .el-picker-panel__link-btn.el-button--text {
+    display: none !important;
+  }
+}
+</style>
+
 <style rel="stylesheet/scss" lang="scss" scoped>
   $tableTitleHeight:46px;
   .textRight{
diff --git a/src/views/overview/components/infoWindowXl.vue b/src/views/overview/components/infoWindowXl.vue
index 623ba97..056b828 100644
--- a/src/views/overview/components/infoWindowXl.vue
+++ b/src/views/overview/components/infoWindowXl.vue
@@ -9,10 +9,11 @@
       {{ xlInfo.length>0?xlInfo[0].valveCode: '' }}
     </div>
     <div class="alarm-body">
-      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>
-      <div>位置： {{ xlInfo.map(item => item.blockName).join() }}</div>
+<!--      <div >编号： {{ xlInfo.map(item => item.blockCode).join() }}</div>-->
+      <div>影响区域： {{ xlInfo.map(item => item.blockName).join() }}</div>
+      <div>闸井位置： {{ xlInfo.map(item => item.place).join() }}</div>
     </div>
-    <el-button type="primary" @click="showPosition">查看关阀影响区域</el-button>
+    <el-button type="primary" @click="showPosition" style="margin-left: 60px">查看关阀影响区域</el-button>
   </div>
 </template>
 
diff --git a/src/views/overview/components/mapSearchComp.vue b/src/views/overview/components/mapSearchComp.vue
index b34a006..a133acf 100644
--- a/src/views/overview/components/mapSearchComp.vue
+++ b/src/views/overview/components/mapSearchComp.vue
@@ -4,6 +4,7 @@
  * @Date: 2022-05-18
  -->
 <template>
+  <div>
   <div class="map-search-div">
     <!--搜索条件-->
     <div>
@@ -14,29 +15,32 @@
       </el-input>
     </div>
     <!--搜索结果弹出框-->
-    <el-popover
-      v-show="list.length>0"
-      v-model="resultShow"
-      placement="bottom-end"
-      width="311"
-      trigger="manual"
-    >
-      <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
-        共找到 {{ list.length }} 个符合条件的{{ name }}
-      </div>
-      <div class="list-div">
-        <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
-      </div>
-      <el-pagination
-        :total="list.length"
-        :current-page="pageNum"
-        :page-size="pageSize"
-        :hide-on-single-page="true"
-        small
-        layout="prev, pager, next"
-        @current-change="changePage"
-      />
-    </el-popover>
+  </div>
+  <div
+    class="result-pop"
+    v-show="list.length>0"
+    v-model="resultShow"
+    placement="bottom-end"
+    width="311"
+    trigger="manual"
+  >
+    <div slot="reference" class="select-answer" @click="resultShow = !resultShow">
+      共找到 {{ list.length }} 个符合条件的{{ name }}
+    </div>
+    <div class="list-div">
+      <map-search-item v-for="(data,index) in currentPageList" :key="'search-item-'+index" :data="data" :index="index" @click="clickItem" />
+    </div>
+    <el-pagination
+      style="width: 100%;text-align: center;background-color: white"
+      :total="list.length"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :hide-on-single-page="true"
+      small
+      layout="prev, pager, next"
+      @current-change="changePage"
+    />
+  </div>
   </div>
 </template>
 
@@ -119,25 +123,42 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.result-pop {
+  position: absolute;
+  top: 50px;
+  left: 20px;
+  transform-origin: center top;
+  color: #606266;
+  line-height: 1.4;
+  text-align: justify;
+  font-size: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  word-break: break-all;
+  z-index: 999999999999;
+  width: 320px;
+}
+.select-answer{
+  margin: 5px 0;
+  font-size:14px;
+  padding: 10px 20px;
+  width: 100%;
+  height: 40px;
+  color: #606266;
+  background-color: #FFFFFF;
+  border: 1px solid #EBEEF5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
 .map-search-div{
   position: absolute;
   z-index: 100;
   left: 30px;
   top: 5px;
-  .select-answer{
-    position: relative;
-    margin-top: 5px;
-    font-size:14px;
-    padding: 10px 20px;
-    width: 311px;
-    color: #606266;
-    background-color: #FFFFFF;
-    border: 1px solid #EBEEF5;
-    border-radius: 4px;
-    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
-  }
   .list-div{
     background-color: #FFFFFF;
+    margin-top: 5px;
+    border-radius: 10px;
+    z-index: 999999999999;
   }
 }
 
diff --git a/src/views/overview/components/mapSearchItem.vue b/src/views/overview/components/mapSearchItem.vue
index 454e64d..d5fd811 100644
--- a/src/views/overview/components/mapSearchItem.vue
+++ b/src/views/overview/components/mapSearchItem.vue
@@ -60,6 +60,7 @@
   padding:5px 10px;
   overflow: auto;
   display: flex;
+  background-color: white;
   .card-left{
     .index{
       display: inline-block;
diff --git a/src/views/overview/mnxlfx.vue b/src/views/overview/mnxlfx.vue
index 310a73c..9543d23 100644
--- a/src/views/overview/mnxlfx.vue
+++ b/src/views/overview/mnxlfx.vue
@@ -13,10 +13,15 @@
       <div class="info-box" v-show="isShowTable">
         <i class="el-icon-error" style="cursor: pointer;position: absolute;right: 10px;font-size: 20px;color: #3f9dfe" @click="isShowTable=false"></i>
         <div style="font-weight: bold;margin: 10px 0px">关阀分析</div>
-        <div style="margin-left: 10px">共找到上游阀门 <span style="font-weight: bold">{{total}}</span> 个</div>
-        <el-table :data="list" border size="small" height="220px" class="table" style="width: 280px">
+        <div style="margin-left: 10px">共找到上游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '上游').length}}</span> 个，下游阀门
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '下游').length}}</span> 个，其他
+          <span style="font-weight: bold">{{list.filter(item => item.valveType === '其他').length}}</span> 个
+        </div>
+        <el-table :data="list" border size="small" height="220px" class="table" style="width: 380px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="valveCode" align="center" label="阀 门"/>
+          <el-table-column prop="valveType" align="center" width="80" label="阀门类型"/>
           <el-table-column fixed="right" align="center" width="80" label="操作">
             <template slot-scope="scope">
               <el-button @click="flyTo(scope.row)" type="text" size="small">定位</el-button>
@@ -82,9 +87,10 @@
       })
       appList().then(response => {
         if (response.code === 200) {
-          response.data.forEach(item => {
+          response.data.forEach((item,index) => {
             var polyline = new AMap.Polyline({
-              path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              // path: [new AMap.LngLat(item.startLongitudeGd, item.startLatitudeGd), new AMap.LngLat(item.endLongitudeGd, item.endLatitudeGd)],
+              path: [[item.startLongitudeGd, item.startLatitudeGd], [item.endLongitudeGd, item.endLatitudeGd]],
               // borderWeight: 1, // 线条宽度，默认为 1
               strokeWeight: 4,
               strokeColor: '#ff4bde', // 线条颜色
@@ -109,6 +115,7 @@
                           position: new AMap.LngLat( point.longitude, point.latitude ),
                           extData: point,
                           icon: icon, // 添加 Icon 实例
+                          offset: new AMap.Pixel(-15, -15),
                         })
                         door.on('click', function (door_e) {
                           getAreasByValve(door_e.target._opts.extData.valveCode).then(re => {
@@ -142,7 +149,7 @@
                             const xlWindow = new XlWindow().$mount()
                             const infoWindow = new window.AMap.InfoWindow({
                               content: xlWindow .$el, // 显示内容
-                              offset: [15, -10], // 偏移
+                              offset: [0, -16], // 偏移
                               autoMove: true // 是否自动调整窗体到视野内
                             })
                             infoWindow.open(window.map, new toLngLat([door_e.target._opts.extData.longitude, door_e.target._opts.extData.latitude]))
@@ -285,7 +292,7 @@
   left: 10px;
   top: 10px;
   border-radius: 10px;
-  width: 300px;
+  width: 400px;
   height: 300px;
   overflow: hidden;
   background: rgba(255, 255, 255, 0.9);
diff --git a/src/views/support/support.vue b/src/views/support/support.vue
index 8013299..a6ec5bb 100644
--- a/src/views/support/support.vue
+++ b/src/views/support/support.vue
@@ -182,7 +182,18 @@
         }
         this.devType = this.deviceTypeList[0].value
         this.devType1 = this.deviceTypeList[0].value
-        this.devType2 = this.deviceTypeList[0].value
+        const arr = this.deviceTypeList.map(item => item.value)
+        const in1 = arr.indexOf('1')
+        const in4 = arr.indexOf('4')
+        if( in1 < in4 && in1 !== -1) {
+          this.devType2 = '1'
+        }
+        else if( in4 < in1 && in4 !== -1) {
+          this.devType2 = '4'
+        }
+        else if( in1 === -1 && in4 === -1) {
+          this.devType2 = ''
+        }
       })
     },
   }
diff --git a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
index a5352b3..4a5ceb9 100644
--- a/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
+++ b/src/views/systemConfig/alarmLevel/components/editGasLevel.vue
@@ -143,6 +143,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, tenantId, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
       this.fetchData(tenantId, row.name, row.deviceType)
       if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.disableEdit = false
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index bddd56a..fe1f518 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -77,7 +77,7 @@
         { type: 'text', label: '点位维护单位', value: 'responsibleDeptName', placeholder: '未知' },
         { type: 'text', label: '井深(m)', value: 'deep', placeholder: '--' },
         { type: 'text', label: '布防状态', value: 'bfztName', placeholder: '未知' },
-        { type: 'text', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
+        { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
@@ -101,7 +101,7 @@
         photos: '', // 照片路径
         notes: '', // 备注,
         qu: '',
-        quName: '', // 区名称
+        quName: '',
         area: '', // 街道
         areaName: '',
         road: '',
@@ -156,8 +156,8 @@
         areaName: row.areaName // 所在区域
       }
       if (row.deptid && row.deptid !== '') {
-        // this.fetchArea1()
-        // this.fetchArea2()
+        this.fetchArea1()
+        this.fetchArea2()
       }
       // 处理图片
       const urls = row.photos.split(';')
@@ -232,53 +232,53 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-  .editDialog{
-    .el-dialog {
-      width: 900px;
-      margin-top: 10vh !important;
-      .el-scrollbar {
-        height: 410px;
-        width: 100%;
-      }
-      .el-scrollbar__wrap {
-        /*overflow: scroll;*/
-        overflow-x: auto;
-        overflow-y: auto;
-      }
-      .el-scrollbar__view{
-        width: 98%;
-      }
+.hide .el-upload--picture-card {
+  display: none;
+}
+.editDialog{
+  .el-dialog {
+    width: 900px;
+    margin-top: 10vh !important;
+    .el-scrollbar {
+      height: 410px;
+      width: 100%;
+    }
+    .el-scrollbar__wrap {
+      /*overflow: scroll;*/
+      overflow-x: auto;
+      overflow-y: auto;
+    }
+    .el-scrollbar__view{
+      width: 98%;
     }
   }
-  .el-select{
-    width: 100%;
-  }
-  .line{
-    width: 50px;
-    margin-left: 5px;
-  }
-  .hide .el-upload-–picture-card{
-    display: none;
-  }
-  .imgBox{
-    width: 100%;
-    text-align: center;
-  }
-  .watch-div {
-    margin-top: 15px;
-    .table-title {
-      margin-top: 10px;
-      .title-header {
-        height: 40px;
-        padding: 10px;
-        border-radius: 4px;
-        border: solid 1px #F3F3F3;
-        background-color: #fafafa;
-        color: #606266;
-      }
+}
+.el-select{
+  width: 100%;
+}
+.line{
+  width: 50px;
+  margin-left: 5px;
+}
+.hide .el-upload-–picture-card{
+  display: none;
+}
+.imgBox{
+  width: 100%;
+  text-align: center;
+}
+.watch-div {
+  margin-top: 15px;
+  .table-title {
+    margin-top: 10px;
+    .title-header {
+      height: 40px;
+      padding: 10px;
+      border-radius: 4px;
+      border: solid 1px #F3F3F3;
+      background-color: #fafafa;
+      color: #606266;
     }
   }
+}
 </style>
diff --git a/src/views/wellManage/editLine.vue b/src/views/wellManage/editLine.vue
index b5d4acc..33bcae4 100644
--- a/src/views/wellManage/editLine.vue
+++ b/src/views/wellManage/editLine.vue
@@ -26,7 +26,12 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="材质" prop="material">
-            <el-input v-model.trim="form.material" :disabled="isEditMode" type="text" placeholder="必填" />
+            <el-select v-model.trim="form.material" :disabled="isEditMode" type="text" placeholder="必填">
+              <el-option label="PE" value="PE"/>
+              <el-option label="钢管" value="钢管"/>
+              <el-option label="无缝钢管" value="无缝钢管"/>
+            </el-select>
+<!--            <el-input v-model.trim="form.material" :disabled="isEditMode" type="text" placeholder="必填" />-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -198,7 +203,7 @@
       }, // 表头显示标题
       btnLoading: false, // 保存按钮的加载中状态
       rules: {
-        pipelineCode: [{ required: true, message: '管线编号为空', trigger: ['blur', 'change'] }],
+        pipelineCode: [{ required: true, message: '管线编号不能为空', trigger: ['blur', 'change'] }],
         pipeDiameter: [{ required: true, validator: validateNum, trigger: ['blur', 'change'] }],
         startLongitude: [{ required: true, validator: validateNum, trigger: ['blur', 'change'] }],
         startLatitude: [{ required: true, validator: validateNum, trigger: ['blur', 'change'] }],
diff --git a/src/views/wellManage/listLine.vue b/src/views/wellManage/listLine.vue
index 826e0a9..21146a8 100644
--- a/src/views/wellManage/listLine.vue
+++ b/src/views/wellManage/listLine.vue
@@ -5,7 +5,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="管线编号/位置" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.pipelineType" size="small" placeholder="选择管线类型" clearable>
+        <el-select v-model="listQuery.pipelineType" size="small" style="width: 140px" placeholder="选择管线类型" clearable>
           <el-option
             v-for="item in lineTypeList"
             :key="item.value"
@@ -15,6 +15,51 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.material" size="small" style="width: 140px" placeholder="材质" clearable>
+          <el-option label="PE" value="PE"/>
+          <el-option label="钢管" value="钢管"/>
+          <el-option label="无缝钢管" value="无缝钢管"/>
+<!--            v-for="item in lineTypeList"-->
+<!--            :key="item.value"-->
+<!--            :label="item.name"-->
+<!--            :value="item.value"-->
+<!--          />-->
+        </el-select>
+<!--        <el-input v-model.trim="listQuery.material" size="small" style="width: 140px" placeholder="材质" clearable />-->
+      </search-item>
+      <span style="position: relative;top: 3px;margin-right: 10px;color: #666666;font-size: 15px;">管径范围</span>
+      <search-item>
+        <el-input-number v-model="listQuery.pipeDiameter1" clearable size="small" :min="0" :max="listQuery.pipeDiameter2===''?100000000:listQuery.pipeDiameter2" label="最小值"/>
+      </search-item>
+      <span style="position: relative;top: 3px;margin: 0 5px;color: #666666;font-size: 15px;">~</span>
+      <search-item>
+        <el-input-number v-model="listQuery.pipeDiameter2" clearable size="small" :min="listQuery.pipeDiameter1" :max="1000000" label="最大值"/>
+      </search-item>
+      <span style="position: relative;top: 3px;margin: 0 10px;color: #666666;font-size: 15px;">建设年代</span>
+      <search-item>
+        <el-date-picker
+          style="width: 120px"
+          v-model="listQuery.beginTime"
+          size="small"
+          value-format="yyyy"
+          type="year"
+          :picker-options="startDatePicker(listQuery.endTime,1,true)"
+          placeholder="开始年代"
+        />
+      </search-item>
+      <span style="position: relative;top: 3px;margin: 0 5px;color: #666666;font-size: 15px;">~</span>
+      <search-item>
+        <el-date-picker
+          style="width: 120px"
+          v-model="listQuery.endTime"
+          size="small"
+          value-format="yyyy"
+          type="year"
+          :picker-options="endDatePicker(listQuery.beginTime,1,true)"
+          placeholder="结束年代"
+        />
+      </search-item>
+      <search-item>
         <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
     </search-area>
@@ -87,6 +132,7 @@
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import { getDictByCode } from '@/api/system/dict'
 import EditLine from "@/views/wellManage/editLine";
+import dayjs from "dayjs";
 
 export default {
   name: 'ListWell',
@@ -95,11 +141,17 @@
     return {
       listQuery: {
         keywords: '',
+        material: '',
         pipelineType: '',
+        pipeDiameter1: '',
+        pipeDiameter2: '',
+        beginTime: '',
+        endTime: '',
         deptid: '',
         offset: 1,
         limit: 20
       }, // 筛选条件
+      timeRange: [], // 时间范围
       columns: [
         { text: '管线编号', value: 'pipelineCode', align: 'center' },
         { text: '管线类型', value: 'pipelineTypeName', align: 'center' },
@@ -149,6 +201,41 @@
     this.fetchData()// 获取数据
   },
   methods: {
+    startDatePicker(endTime,type,today=true) {
+      let endDayEnd = dayjs(endTime).format("YYYY");
+      return {
+        disabledDate:(time)=> {
+          if(type == 1){ // 禁用之前
+            if(endTime){
+              return new Date(time).getFullYear() > new Date(endDayEnd).getFullYear()
+            }
+          }
+        }
+      }
+    },
+    // 参数：同 startDatePicker 对应传入开始时间 startTime
+    endDatePicker(startTime,type,today=true) {
+      let startDayStart = dayjs(startTime).format("YYYY");
+      return {
+        disabledDate:(time)=> {
+          if(type == 1){
+            if (startTime) { // 禁用之前
+              return new Date(time).getFullYear() < new Date(startDayStart).getFullYear()
+            }
+          }
+        }
+      }
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     checkSelection() {
       if (this.multipleSelection.length === 0) {
         return false
@@ -182,7 +269,7 @@
           wellIds.push(value.id)
         })
         this.$confirm(
-          '确定要删除所选井吗？',
+          '确定要删除所选管线吗？',
           '确认操作',
           {
             confirmButtonText: '确定',