diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 3060bee..cc79e85 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -27,7 +27,7 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
-            <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
+          <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
         </el-table>
       </div>
@@ -80,7 +80,7 @@
         metrics: ['total'],
         dimension: ['uptime']
       },
-      data:[]
+      data: []
 
     }
   },
@@ -105,9 +105,12 @@
       this.fetchData() // 传row
     },
     fetchData() {
-      if(this.timeRange.length==2){
+      if (this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 3060bee..cc79e85 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -27,7 +27,7 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
-            <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
+          <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
         </el-table>
       </div>
@@ -80,7 +80,7 @@
         metrics: ['total'],
         dimension: ['uptime']
       },
-      data:[]
+      data: []
 
     }
   },
@@ -105,9 +105,12 @@
       this.fetchData() // 传row
     },
     fetchData() {
-      if(this.timeRange.length==2){
+      if (this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 436978a..d8b75b2 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -18,9 +18,9 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="日用水量（立方米）" prop="dayCount" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
-<!--          <el-table-column label="阀门状态" align="center">-->
-<!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column label="阀门状态" align="center">-->
+          <!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
+          <!--          </el-table-column>-->
         </el-table>
       </div>
     </div>
@@ -44,7 +44,7 @@
         beginTime: '',
         endTime: ''
       },
-      data:[]
+      data: []
 
     }
   },
@@ -70,9 +70,12 @@
     },
     fetchData() {
       this.loading1 = true
-      if(this.timeRange.length==2){
+      if (this.timeRange.length == 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       totalData(this.listQuery).then(response => {
         this.data = response.data
@@ -101,8 +104,7 @@
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
         window.URL.revokeObjectURL(href) // 释放blob对象
-      })
-      .catch((res) => {
+      }).catch((res) => {
         loading.close()
       })
     }

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 3060bee..cc79e85 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -27,7 +27,7 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
-            <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
+          <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
         </el-table>
       </div>
@@ -80,7 +80,7 @@
         metrics: ['total'],
         dimension: ['uptime']
       },
-      data:[]
+      data: []
 
     }
   },
@@ -105,9 +105,12 @@
       this.fetchData() // 传row
     },
     fetchData() {
-      if(this.timeRange.length==2){
+      if (this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 436978a..d8b75b2 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -18,9 +18,9 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="日用水量（立方米）" prop="dayCount" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
-<!--          <el-table-column label="阀门状态" align="center">-->
-<!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column label="阀门状态" align="center">-->
+          <!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
+          <!--          </el-table-column>-->
         </el-table>
       </div>
     </div>
@@ -44,7 +44,7 @@
         beginTime: '',
         endTime: ''
       },
-      data:[]
+      data: []
 
     }
   },
@@ -70,9 +70,12 @@
     },
     fetchData() {
       this.loading1 = true
-      if(this.timeRange.length==2){
+      if (this.timeRange.length == 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       totalData(this.listQuery).then(response => {
         this.data = response.data
@@ -101,8 +104,7 @@
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
         window.URL.revokeObjectURL(href) // 释放blob对象
-      })
-      .catch((res) => {
+      }).catch((res) => {
         loading.close()
       })
     }
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index a3425c4..5437a72 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -247,7 +247,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气配置列表.xlsx` // 下载后文件名
+        downloadElement.download = `噪声配置列表.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 3060bee..cc79e85 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -27,7 +27,7 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
-            <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
+          <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
         </el-table>
       </div>
@@ -80,7 +80,7 @@
         metrics: ['total'],
         dimension: ['uptime']
       },
-      data:[]
+      data: []
 
     }
   },
@@ -105,9 +105,12 @@
       this.fetchData() // 传row
     },
     fetchData() {
-      if(this.timeRange.length==2){
+      if (this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 436978a..d8b75b2 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -18,9 +18,9 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="日用水量（立方米）" prop="dayCount" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
-<!--          <el-table-column label="阀门状态" align="center">-->
-<!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column label="阀门状态" align="center">-->
+          <!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
+          <!--          </el-table-column>-->
         </el-table>
       </div>
     </div>
@@ -44,7 +44,7 @@
         beginTime: '',
         endTime: ''
       },
-      data:[]
+      data: []
 
     }
   },
@@ -70,9 +70,12 @@
     },
     fetchData() {
       this.loading1 = true
-      if(this.timeRange.length==2){
+      if (this.timeRange.length == 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       totalData(this.listQuery).then(response => {
         this.data = response.data
@@ -101,8 +104,7 @@
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
         window.URL.revokeObjectURL(href) // 释放blob对象
-      })
-      .catch((res) => {
+      }).catch((res) => {
         loading.close()
       })
     }
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index a3425c4..5437a72 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -247,7 +247,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气配置列表.xlsx` // 下载后文件名
+        downloadElement.download = `噪声配置列表.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 6765449..8a00de1 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -87,39 +87,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{ hide: hideUpload }"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
-              <i class="el-icon-plus"/>
-            </el-upload>
-            <el-dialog
-              :visible.sync="dialogVisible"
-              title="图片预览"
-              append-to-body
-            >
-              <div class="imgBox">
-                <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto">
-              </div>
-            </el-dialog>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="24">-->
+      <!--          <el-form-item label="路标图片" prop="images">-->
+      <!--            <el-upload-->
+      <!--              ref="upload"-->
+      <!--              :before-upload="handleBeforeUpload"-->
+      <!--              :on-preview="handlePictureCardPreview"-->
+      <!--              :on-remove="handleRemove"-->
+      <!--              :on-exceed="handleExceed"-->
+      <!--              :on-change="handleChange"-->
+      <!--              :on-success="handleSuccess"-->
+      <!--              :limit="4"-->
+      <!--              :class="{ hide: hideUpload }"-->
+      <!--              :http-request="uploadFile"-->
+      <!--              action="string"-->
+      <!--              multiple-->
+      <!--              accept=".jpg,.jpeg,.png "-->
+      <!--              list-type="picture-card"-->
+      <!--            >-->
+      <!--              <i class="el-icon-plus"/>-->
+      <!--            </el-upload>-->
+      <!--            <el-dialog-->
+      <!--              :visible.sync="dialogVisible"-->
+      <!--              title="图片预览"-->
+      <!--              append-to-body-->
+      <!--            >-->
+      <!--              <div class="imgBox">-->
+      <!--                <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto">-->
+      <!--              </div>-->
+      <!--            </el-dialog>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
       <el-row :gutter="2">
         <el-form-item label="所在区域" required>
           <el-col :span="5">
@@ -203,381 +203,381 @@
 </template>
 
 <script>
-  import {toTreeList} from '@/utils/structure'
-  import SelectTree from '@/components/SelectTree/singleSelect'
-  import {getDeptTreeList} from '@/api/system/dept'
-  import {getAreaList, getAreaByDept} from '@/api/system/area'
-  import {getWellType, addWell} from '@/api/well'
-  import {Uploadimg} from '@/api/common'
-  import DeptSelect from '@/components/DeptSelect'
-  import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getWellType, addWell } from '@/api/well'
+import { Uploadimg } from '@/api/common'
+import DeptSelect from '@/components/DeptSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
-  export default {
-    name: 'AddWell',
-    components: {SelectTree, DeptSelect, AreaSelectTree},
-    data() {
-      const validateDeep = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
+export default {
+  name: 'AddWell',
+  components: { SelectTree, DeptSelect, AreaSelectTree },
+  data() {
+    const validateDeep = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          const deep = parseFloat(value)
+          if (deep > 10 || deep < 0) {
+            callback(new Error('请填写0到10数值'))
           } else {
-            const deep = parseFloat(value)
-            if (deep > 10 || deep < 0) {
-              callback(new Error('请填写0到10数值'))
-            } else {
-              callback()
-            }
+            callback()
           }
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateLng = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
         } else {
           callback()
         }
+      } else {
+        callback(new Error('经度不能为空'))
       }
-      const validateLng = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
-          } else {
-            callback()
-          }
+    }
+    const validateLat = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
         } else {
-          callback(new Error('经度不能为空'))
+          callback()
         }
+      } else {
+        callback(new Error('纬度不能为空'))
       }
-      const validateLat = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
-          } else {
-            callback()
-          }
-        } else {
-          callback(new Error('纬度不能为空'))
-        }
-      }
-      return {
-        dialogFormVisible: false, // 对话框是否显示
-        dialogStatus: '', // 对话框类型：create,update
-        node: null,
-        wellForm: {
-          wellCode: '', // 井编号
-          wellName: '', // 井名称
-          wellType: '', // 井类型
-          deptid: '1148031048115494913', // 权属单位
-          deep: '', // 井深，
-          position: '', // 位置描述
-          coordinateX: '', // 经度
-          coordinateY: '', // 纬度
-          photos: '', // 照片路径
-          notes: '', // 备注,
-          city:'',
-          qu: '',
-          area: '', // 街道
-          responsibleDept: '' // 维护人员部门
-        }, // 表单
-        deptProps: {
-          parent: 'pid',
-          value: 'id',
-          label: 'name',
-          children: 'children'
-        },
-        hideUpload: false,
-        fileList: [],
-        imageList: [],
-        deptTreeList: null, // 组织树列表数据
-        secondDeptTreeList: null, // 二级组织树列表
-        wellTypeList: null,
-        cityList: [], // 一级
-        quList: [], // 二级
-        jiedaoList: [], // 三级
-        textMap: {
-          update: '编辑',
-          create: '新增'
-        }, // 表头显示标题
-        rules: {
-          wellCode: [{required: true,message: '井编号不能为空',trigger: ['blur', 'change']}],
-          wellName: [{required: true, message: '井名称不能为空', trigger: ['blur', 'change']}],
-          position: [{required: false, message: '井详细地址不能为空', trigger: ['blur', 'change']}],
-          deep: [{required: false, trigger: ['blur', 'change'], validator: validateDeep}],
-          coordinateX: [{required: true,trigger: ['blur', 'change'], validator: validateLat}],
-          coordinateY: [{required: true, trigger: ['blur', 'change'], validator: validateLng}],
-          deptid: [{required: true, message: '组织机构必选', trigger: 'change'}],
-          wellType: [{required: true, message: '井类型必选', trigger: 'change'}],
-          city: [{required: true, message: '一级分区必选', trigger: 'change'}],
-          qu: [{required: true, message: '二级分区必选', trigger: 'change'}],
-          area: [{required: true, message: '三级分区必选', trigger: 'change'}]
-        },
-        uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
-        dialogImageUrl: '',
-        dialogVisible: false,
-        labelPosition: 'right',
-        responseAssignShow: false,
-        deptShowTop: false, // 权属单位下拉是否显示顶级
-        deptShow: true
-      }
-    },
-    computed: {
-      showResponseDept() {
-        if (this.wellForm.deptid === '') {
-          return true
-        } else {
-          if (this.secondDeptTreeList && this.secondDeptTreeList.length >= 1) {
-            return false
-          } else {
-            return true
-          }
-        }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      node: null,
+      wellForm: {
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '1148031048115494913', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        city: '',
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '' // 维护人员部门
+      }, // 表单
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
       },
-      showArea() {
-        if (this.wellForm.deptid === '') {
-          return true
-        } else {
+      hideUpload: false,
+      fileList: [],
+      imageList: [],
+      deptTreeList: null, // 组织树列表数据
+      secondDeptTreeList: null, // 二级组织树列表
+      wellTypeList: null,
+      cityList: [], // 一级
+      quList: [], // 二级
+      jiedaoList: [], // 三级
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: false, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
+        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
+        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
+        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        city: [{ required: true, message: '一级分区必选', trigger: 'change' }],
+        qu: [{ required: true, message: '二级分区必选', trigger: 'change' }],
+        area: [{ required: true, message: '三级分区必选', trigger: 'change' }]
+      },
+      uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
+      dialogImageUrl: '',
+      dialogVisible: false,
+      labelPosition: 'right',
+      responseAssignShow: false,
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShow: true
+    }
+  },
+  computed: {
+    showResponseDept() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        if (this.secondDeptTreeList && this.secondDeptTreeList.length >= 1) {
           return false
-        }
-      },
-      firstDept() {
-        // 获取权属单位
-        return this.wellForm.deptid
-      },
-      qu() {
-        // 获取区
-        return this.wellForm.qu
-      }
-    },
-    watch: {
-      firstDept(val) {
-        // 监控权属单位变化
-        if (val !== '') {
-          this.wellForm.qu = ''
-          this.wellForm.area = ''
-          this.wellForm.responsibleDept = ''
-          this.fetchSecondDeptTree()
-          this.fetchArea0()
-        }
-      },
-      'wellForm.city'(val) {
-        // 监控市变化
-        if (val !== '') {
-          this.wellForm.qu = ''
-          this.wellForm.area = ''
-          this.fetchArea1()
-        }
-      },
-      'wellForm.qu'(val) {
-        // 监控区变化
-        if (val !== '') {
-          this.wellForm.area = ''
-          this.fetchArea2()
-        }
-      }
-    },
-    created () {
-      this.fetchWellType()
-      this.fetchArea0()
-      this.imageList = []
-      this.fileList = []
-    },
-    methods: {
-      // 加载组织机构树形下拉菜单
-      fetchSecondDeptTree: function () {
-        const listQuery = {
-          pid: this.wellForm.deptid,
-          deptType: '04'
-        }
-        getDeptTreeList(listQuery).then((response) => {
-          console.log(response.data)
-          if (response.data.list) {
-            this.secondDeptTreeList = toTreeList(
-              response.data.list,
-              this.wellForm.deptid
-            )
-          }
-        })
-      },
-      // 获取井类型
-      fetchWellType() {
-        getWellType().then((response) => {
-          this.wellTypeList = []
-          const wellTypes = this.$store.getters.wellTypes
-          for (const wellType of response.data) {
-            if (wellTypes.indexOf(wellType.value) !== -1) {
-              this.wellTypeList.push(wellType)
-            }
-          }
-          this.wellForm.wellType='1'
-          if (this.wellTypeList.length <= 1) {
-            this.showWellType = false
-          }
-        })
-      },
-      // 获取一级分区
-      fetchArea0() {
-        getAreaByDept(this.wellForm.deptid).then((response) => {
-          if (response.code === 200) {
-            const pid = response.data.area
-            getAreaList(pid).then((response) => {
-              this.cityList = response.data
-            })
-          }
-        })
-      },
-      // 获取区域1
-      fetchArea1() {
-        getAreaList(this.wellForm.city).then((response) => {
-          this.quList = response.data
-        })
-      },
-      // 获取区域2
-      fetchArea2() {
-        getAreaList(this.wellForm.qu).then((response) => {
-          this.jiedaoList = response.data
-        })
-      },
-      // 取消
-      cancel() {
-        this.dialogFormVisible = false
-        this.fileList = []
-        // 清除验证
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      // 重置表单
-      resetForm() {
-        this.wellForm = {
-          wellCode: '', // 井编号
-          wellName: '', // 井名称
-          wellType: '', // 井类型
-          deptid: '', // 权属单位
-          deep: '', // 井深，
-          position: '', // 位置描述
-          coordinateX: '', // 经度
-          coordinateY: '', // 纬度
-          photos: '', // 照片路径
-          notes: '', // 备注,
-          qu: '',
-          area: '', // 街道
-          responsibleDept: '' // 维护人员部门
-        }
-        // 清空上传图片
-        this.$refs.upload.clearFiles()
-        this.fileList = []
-        this.imageList = []
-        this.hideUpload = this.fileList.length >= 4
-        // 清除验证
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      // 保存数据
-      saveData: function () {
-        this.wellForm.photos = ''
-        const count = this.fileList.length < 4 ? this.fileList.length : 4
-        for (let i = 0; i < count; i++) {
-          const image = this.fileList[i]
-          this.wellForm.photos += image.url + ';'
-        }
-        // 如果责任部门不选，则用权属作为责任部门
-        if (this.wellForm.responsibleDept === '') {
-          if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
-            this.$message.warning('必须选择维护机构')
-            return
-          } else {
-            this.wellForm.responsibleDept = this.wellForm.deptid
-          }
-        }
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            addWell(this.wellForm).then((response) => {
-              console.log('新增井')
-              if (response.code === 200) {
-                this.$message.success('新增成功!')
-                this.resetForm()
-              }
-            })
-          }
-        })
-      },
-      // 图片上传
-      uploadFile(file) {
-        console.log('uploadFile:' + file.file.name)
-        // const base_url = process.env.BASE_API + '/static/'
-        Uploadimg(file).then((res) => {
-          if (res.code === 200) {
-            this.fileList.push({name: file.file.name, url: res.data})
-          }
-        })
-      },
-      // 上传前判断文件格式及大小
-      handleBeforeUpload(file) {
-        const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
-        let res = true
-        const isLt2M = file.size / 1024 / 1024 < 5
-        if (!isJPG) {
-          this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-          res = false
-        }
-        if (!isLt2M) {
-          this.$message.error('上传图片大小不能超过 5MB!')
-          res = false
-        }
-        for (const i in this.fileList) {
-          if (this.fileList[i].name === file.name) {
-            this.$message.error('该图片已上传过，请选择其他图片')
-            res = false
-          }
-        }
-        return res
-      },
-      // 文件列表移除文件时的钩子
-      handleRemove(file, fileList) {
-        console.log('handleRemove')
-        for (const i in this.fileList) {
-          if (this.fileList[i].name === file.name) {
-            this.fileList.splice(i, 1)
-            this.hideUpload = this.fileList.length >= 4
-            return
-          }
-        }
-        this.handleChange()
-      },
-      // 限制提示
-      handleExceed(files, fileList) {
-        console.log('handleExceed')
-        this.$message.warning(
-          `限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${
-          files.length + fileList.length
-            } 张图片`
-        )
-      },
-      // 点击文件列表中已上传的文件时的钩子
-      handlePictureCardPreview(file) {
-        console.log('handlePictureCardPreview')
-        this.dialogImageUrl = file.url
-        this.dialogVisible = true
-      },
-      handleChange(file, fileList) {
-        console.log('handleChange')
-        if (fileList) {
-          this.hideUpload = fileList.length >= 4
         } else {
-          this.hideUpload = false
+          return true
         }
-      },
-      handleSuccess(response, file, fileList) {
-        console.log('handleSuccess')
-        const base_url = process.env.BASE_API + '/static/'
+      }
+    },
+    showArea() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        return false
+      }
+    },
+    firstDept() {
+      // 获取权属单位
+      return this.wellForm.deptid
+    },
+    qu() {
+      // 获取区
+      return this.wellForm.qu
+    }
+  },
+  watch: {
+    firstDept(val) {
+      // 监控权属单位变化
+      if (val !== '') {
+        this.wellForm.qu = ''
+        this.wellForm.area = ''
+        this.wellForm.responsibleDept = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea0()
+      }
+    },
+    'wellForm.city'(val) {
+      // 监控市变化
+      if (val !== '') {
+        this.wellForm.qu = ''
+        this.wellForm.area = ''
+        this.fetchArea1()
+      }
+    },
+    'wellForm.qu'(val) {
+      // 监控区变化
+      if (val !== '') {
+        this.wellForm.area = ''
+        this.fetchArea2()
+      }
+    }
+  },
+  created() {
+    this.fetchWellType()
+    this.fetchArea0()
+    this.imageList = []
+    this.fileList = []
+  },
+  methods: {
+    // 加载组织机构树形下拉菜单
+    fetchSecondDeptTree: function() {
+      const listQuery = {
+        pid: this.wellForm.deptid,
+        deptType: '04'
+      }
+      getDeptTreeList(listQuery).then((response) => {
+        console.log(response.data)
+        if (response.data.list) {
+          this.secondDeptTreeList = toTreeList(
+            response.data.list,
+            this.wellForm.deptid
+          )
+        }
+      })
+    },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then((response) => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+        this.wellForm.wellType = '1'
+        if (this.wellTypeList.length <= 1) {
+          this.showWellType = false
+        }
+      })
+    },
+    // 获取一级分区
+    fetchArea0() {
+      getAreaByDept(this.wellForm.deptid).then((response) => {
         if (response.code === 200) {
-          this.fileList.push({
-            name: file.file.name,
-            url: base_url + response.data
+          const pid = response.data.area
+          getAreaList(pid).then((response) => {
+            this.cityList = response.data
           })
-          this.handleChange()
-        } else {
-          this.$message.warning(response.message)
         }
+      })
+    },
+    // 获取区域1
+    fetchArea1() {
+      getAreaList(this.wellForm.city).then((response) => {
+        this.quList = response.data
+      })
+    },
+    // 获取区域2
+    fetchArea2() {
+      getAreaList(this.wellForm.qu).then((response) => {
+        this.jiedaoList = response.data
+      })
+    },
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.fileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.wellForm = {
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '' // 维护人员部门
+      }
+      // 清空上传图片
+      this.$refs.upload.clearFiles()
+      this.fileList = []
+      this.imageList = []
+      this.hideUpload = this.fileList.length >= 4
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      this.wellForm.photos = ''
+      const count = this.fileList.length < 4 ? this.fileList.length : 4
+      for (let i = 0; i < count; i++) {
+        const image = this.fileList[i]
+        this.wellForm.photos += image.url + ';'
+      }
+      // 如果责任部门不选，则用权属作为责任部门
+      if (this.wellForm.responsibleDept === '') {
+        if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
+          this.$message.warning('必须选择维护机构')
+          return
+        } else {
+          this.wellForm.responsibleDept = this.wellForm.deptid
+        }
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          addWell(this.wellForm).then((response) => {
+            console.log('新增井')
+            if (response.code === 200) {
+              this.$message.success('新增成功!')
+              this.resetForm()
+            }
+          })
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+      Uploadimg(file).then((res) => {
+        if (res.code === 200) {
+          this.fileList.push({ name: file.file.name, url: res.data })
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.fileList.splice(i, 1)
+          this.hideUpload = this.fileList.length >= 4
+          return
+        }
+      }
+      this.handleChange()
+    },
+    // 限制提示
+    handleExceed(files, fileList) {
+      console.log('handleExceed')
+      this.$message.warning(
+        `限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${
+          files.length + fileList.length
+        } 张图片`
+      )
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      console.log('handlePictureCardPreview')
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      console.log('handleChange')
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
+    },
+    handleSuccess(response, file, fileList) {
+      console.log('handleSuccess')
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.fileList.push({
+          name: file.file.name,
+          url: base_url + response.data
+        })
+        this.handleChange()
+      } else {
+        this.$message.warning(response.message)
       }
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 3060bee..cc79e85 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -27,7 +27,7 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
-            <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
+          <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
         </el-table>
       </div>
@@ -80,7 +80,7 @@
         metrics: ['total'],
         dimension: ['uptime']
       },
-      data:[]
+      data: []
 
     }
   },
@@ -105,9 +105,12 @@
       this.fetchData() // 传row
     },
     fetchData() {
-      if(this.timeRange.length==2){
+      if (this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 436978a..d8b75b2 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -18,9 +18,9 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="日用水量（立方米）" prop="dayCount" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
-<!--          <el-table-column label="阀门状态" align="center">-->
-<!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column label="阀门状态" align="center">-->
+          <!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
+          <!--          </el-table-column>-->
         </el-table>
       </div>
     </div>
@@ -44,7 +44,7 @@
         beginTime: '',
         endTime: ''
       },
-      data:[]
+      data: []
 
     }
   },
@@ -70,9 +70,12 @@
     },
     fetchData() {
       this.loading1 = true
-      if(this.timeRange.length==2){
+      if (this.timeRange.length == 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       totalData(this.listQuery).then(response => {
         this.data = response.data
@@ -101,8 +104,7 @@
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
         window.URL.revokeObjectURL(href) // 释放blob对象
-      })
-      .catch((res) => {
+      }).catch((res) => {
         loading.close()
       })
     }
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index a3425c4..5437a72 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -247,7 +247,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气配置列表.xlsx` // 下载后文件名
+        downloadElement.download = `噪声配置列表.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 6765449..8a00de1 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -87,39 +87,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{ hide: hideUpload }"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
-              <i class="el-icon-plus"/>
-            </el-upload>
-            <el-dialog
-              :visible.sync="dialogVisible"
-              title="图片预览"
-              append-to-body
-            >
-              <div class="imgBox">
-                <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto">
-              </div>
-            </el-dialog>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="24">-->
+      <!--          <el-form-item label="路标图片" prop="images">-->
+      <!--            <el-upload-->
+      <!--              ref="upload"-->
+      <!--              :before-upload="handleBeforeUpload"-->
+      <!--              :on-preview="handlePictureCardPreview"-->
+      <!--              :on-remove="handleRemove"-->
+      <!--              :on-exceed="handleExceed"-->
+      <!--              :on-change="handleChange"-->
+      <!--              :on-success="handleSuccess"-->
+      <!--              :limit="4"-->
+      <!--              :class="{ hide: hideUpload }"-->
+      <!--              :http-request="uploadFile"-->
+      <!--              action="string"-->
+      <!--              multiple-->
+      <!--              accept=".jpg,.jpeg,.png "-->
+      <!--              list-type="picture-card"-->
+      <!--            >-->
+      <!--              <i class="el-icon-plus"/>-->
+      <!--            </el-upload>-->
+      <!--            <el-dialog-->
+      <!--              :visible.sync="dialogVisible"-->
+      <!--              title="图片预览"-->
+      <!--              append-to-body-->
+      <!--            >-->
+      <!--              <div class="imgBox">-->
+      <!--                <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto">-->
+      <!--              </div>-->
+      <!--            </el-dialog>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
       <el-row :gutter="2">
         <el-form-item label="所在区域" required>
           <el-col :span="5">
@@ -203,381 +203,381 @@
 </template>
 
 <script>
-  import {toTreeList} from '@/utils/structure'
-  import SelectTree from '@/components/SelectTree/singleSelect'
-  import {getDeptTreeList} from '@/api/system/dept'
-  import {getAreaList, getAreaByDept} from '@/api/system/area'
-  import {getWellType, addWell} from '@/api/well'
-  import {Uploadimg} from '@/api/common'
-  import DeptSelect from '@/components/DeptSelect'
-  import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getWellType, addWell } from '@/api/well'
+import { Uploadimg } from '@/api/common'
+import DeptSelect from '@/components/DeptSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
-  export default {
-    name: 'AddWell',
-    components: {SelectTree, DeptSelect, AreaSelectTree},
-    data() {
-      const validateDeep = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
+export default {
+  name: 'AddWell',
+  components: { SelectTree, DeptSelect, AreaSelectTree },
+  data() {
+    const validateDeep = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          const deep = parseFloat(value)
+          if (deep > 10 || deep < 0) {
+            callback(new Error('请填写0到10数值'))
           } else {
-            const deep = parseFloat(value)
-            if (deep > 10 || deep < 0) {
-              callback(new Error('请填写0到10数值'))
-            } else {
-              callback()
-            }
+            callback()
           }
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateLng = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
         } else {
           callback()
         }
+      } else {
+        callback(new Error('经度不能为空'))
       }
-      const validateLng = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
-          } else {
-            callback()
-          }
+    }
+    const validateLat = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
         } else {
-          callback(new Error('经度不能为空'))
+          callback()
         }
+      } else {
+        callback(new Error('纬度不能为空'))
       }
-      const validateLat = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
-          } else {
-            callback()
-          }
-        } else {
-          callback(new Error('纬度不能为空'))
-        }
-      }
-      return {
-        dialogFormVisible: false, // 对话框是否显示
-        dialogStatus: '', // 对话框类型：create,update
-        node: null,
-        wellForm: {
-          wellCode: '', // 井编号
-          wellName: '', // 井名称
-          wellType: '', // 井类型
-          deptid: '1148031048115494913', // 权属单位
-          deep: '', // 井深，
-          position: '', // 位置描述
-          coordinateX: '', // 经度
-          coordinateY: '', // 纬度
-          photos: '', // 照片路径
-          notes: '', // 备注,
-          city:'',
-          qu: '',
-          area: '', // 街道
-          responsibleDept: '' // 维护人员部门
-        }, // 表单
-        deptProps: {
-          parent: 'pid',
-          value: 'id',
-          label: 'name',
-          children: 'children'
-        },
-        hideUpload: false,
-        fileList: [],
-        imageList: [],
-        deptTreeList: null, // 组织树列表数据
-        secondDeptTreeList: null, // 二级组织树列表
-        wellTypeList: null,
-        cityList: [], // 一级
-        quList: [], // 二级
-        jiedaoList: [], // 三级
-        textMap: {
-          update: '编辑',
-          create: '新增'
-        }, // 表头显示标题
-        rules: {
-          wellCode: [{required: true,message: '井编号不能为空',trigger: ['blur', 'change']}],
-          wellName: [{required: true, message: '井名称不能为空', trigger: ['blur', 'change']}],
-          position: [{required: false, message: '井详细地址不能为空', trigger: ['blur', 'change']}],
-          deep: [{required: false, trigger: ['blur', 'change'], validator: validateDeep}],
-          coordinateX: [{required: true,trigger: ['blur', 'change'], validator: validateLat}],
-          coordinateY: [{required: true, trigger: ['blur', 'change'], validator: validateLng}],
-          deptid: [{required: true, message: '组织机构必选', trigger: 'change'}],
-          wellType: [{required: true, message: '井类型必选', trigger: 'change'}],
-          city: [{required: true, message: '一级分区必选', trigger: 'change'}],
-          qu: [{required: true, message: '二级分区必选', trigger: 'change'}],
-          area: [{required: true, message: '三级分区必选', trigger: 'change'}]
-        },
-        uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
-        dialogImageUrl: '',
-        dialogVisible: false,
-        labelPosition: 'right',
-        responseAssignShow: false,
-        deptShowTop: false, // 权属单位下拉是否显示顶级
-        deptShow: true
-      }
-    },
-    computed: {
-      showResponseDept() {
-        if (this.wellForm.deptid === '') {
-          return true
-        } else {
-          if (this.secondDeptTreeList && this.secondDeptTreeList.length >= 1) {
-            return false
-          } else {
-            return true
-          }
-        }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      node: null,
+      wellForm: {
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '1148031048115494913', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        city: '',
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '' // 维护人员部门
+      }, // 表单
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
       },
-      showArea() {
-        if (this.wellForm.deptid === '') {
-          return true
-        } else {
+      hideUpload: false,
+      fileList: [],
+      imageList: [],
+      deptTreeList: null, // 组织树列表数据
+      secondDeptTreeList: null, // 二级组织树列表
+      wellTypeList: null,
+      cityList: [], // 一级
+      quList: [], // 二级
+      jiedaoList: [], // 三级
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: false, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
+        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
+        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
+        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        city: [{ required: true, message: '一级分区必选', trigger: 'change' }],
+        qu: [{ required: true, message: '二级分区必选', trigger: 'change' }],
+        area: [{ required: true, message: '三级分区必选', trigger: 'change' }]
+      },
+      uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
+      dialogImageUrl: '',
+      dialogVisible: false,
+      labelPosition: 'right',
+      responseAssignShow: false,
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShow: true
+    }
+  },
+  computed: {
+    showResponseDept() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        if (this.secondDeptTreeList && this.secondDeptTreeList.length >= 1) {
           return false
-        }
-      },
-      firstDept() {
-        // 获取权属单位
-        return this.wellForm.deptid
-      },
-      qu() {
-        // 获取区
-        return this.wellForm.qu
-      }
-    },
-    watch: {
-      firstDept(val) {
-        // 监控权属单位变化
-        if (val !== '') {
-          this.wellForm.qu = ''
-          this.wellForm.area = ''
-          this.wellForm.responsibleDept = ''
-          this.fetchSecondDeptTree()
-          this.fetchArea0()
-        }
-      },
-      'wellForm.city'(val) {
-        // 监控市变化
-        if (val !== '') {
-          this.wellForm.qu = ''
-          this.wellForm.area = ''
-          this.fetchArea1()
-        }
-      },
-      'wellForm.qu'(val) {
-        // 监控区变化
-        if (val !== '') {
-          this.wellForm.area = ''
-          this.fetchArea2()
-        }
-      }
-    },
-    created () {
-      this.fetchWellType()
-      this.fetchArea0()
-      this.imageList = []
-      this.fileList = []
-    },
-    methods: {
-      // 加载组织机构树形下拉菜单
-      fetchSecondDeptTree: function () {
-        const listQuery = {
-          pid: this.wellForm.deptid,
-          deptType: '04'
-        }
-        getDeptTreeList(listQuery).then((response) => {
-          console.log(response.data)
-          if (response.data.list) {
-            this.secondDeptTreeList = toTreeList(
-              response.data.list,
-              this.wellForm.deptid
-            )
-          }
-        })
-      },
-      // 获取井类型
-      fetchWellType() {
-        getWellType().then((response) => {
-          this.wellTypeList = []
-          const wellTypes = this.$store.getters.wellTypes
-          for (const wellType of response.data) {
-            if (wellTypes.indexOf(wellType.value) !== -1) {
-              this.wellTypeList.push(wellType)
-            }
-          }
-          this.wellForm.wellType='1'
-          if (this.wellTypeList.length <= 1) {
-            this.showWellType = false
-          }
-        })
-      },
-      // 获取一级分区
-      fetchArea0() {
-        getAreaByDept(this.wellForm.deptid).then((response) => {
-          if (response.code === 200) {
-            const pid = response.data.area
-            getAreaList(pid).then((response) => {
-              this.cityList = response.data
-            })
-          }
-        })
-      },
-      // 获取区域1
-      fetchArea1() {
-        getAreaList(this.wellForm.city).then((response) => {
-          this.quList = response.data
-        })
-      },
-      // 获取区域2
-      fetchArea2() {
-        getAreaList(this.wellForm.qu).then((response) => {
-          this.jiedaoList = response.data
-        })
-      },
-      // 取消
-      cancel() {
-        this.dialogFormVisible = false
-        this.fileList = []
-        // 清除验证
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      // 重置表单
-      resetForm() {
-        this.wellForm = {
-          wellCode: '', // 井编号
-          wellName: '', // 井名称
-          wellType: '', // 井类型
-          deptid: '', // 权属单位
-          deep: '', // 井深，
-          position: '', // 位置描述
-          coordinateX: '', // 经度
-          coordinateY: '', // 纬度
-          photos: '', // 照片路径
-          notes: '', // 备注,
-          qu: '',
-          area: '', // 街道
-          responsibleDept: '' // 维护人员部门
-        }
-        // 清空上传图片
-        this.$refs.upload.clearFiles()
-        this.fileList = []
-        this.imageList = []
-        this.hideUpload = this.fileList.length >= 4
-        // 清除验证
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      // 保存数据
-      saveData: function () {
-        this.wellForm.photos = ''
-        const count = this.fileList.length < 4 ? this.fileList.length : 4
-        for (let i = 0; i < count; i++) {
-          const image = this.fileList[i]
-          this.wellForm.photos += image.url + ';'
-        }
-        // 如果责任部门不选，则用权属作为责任部门
-        if (this.wellForm.responsibleDept === '') {
-          if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
-            this.$message.warning('必须选择维护机构')
-            return
-          } else {
-            this.wellForm.responsibleDept = this.wellForm.deptid
-          }
-        }
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            addWell(this.wellForm).then((response) => {
-              console.log('新增井')
-              if (response.code === 200) {
-                this.$message.success('新增成功!')
-                this.resetForm()
-              }
-            })
-          }
-        })
-      },
-      // 图片上传
-      uploadFile(file) {
-        console.log('uploadFile:' + file.file.name)
-        // const base_url = process.env.BASE_API + '/static/'
-        Uploadimg(file).then((res) => {
-          if (res.code === 200) {
-            this.fileList.push({name: file.file.name, url: res.data})
-          }
-        })
-      },
-      // 上传前判断文件格式及大小
-      handleBeforeUpload(file) {
-        const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
-        let res = true
-        const isLt2M = file.size / 1024 / 1024 < 5
-        if (!isJPG) {
-          this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-          res = false
-        }
-        if (!isLt2M) {
-          this.$message.error('上传图片大小不能超过 5MB!')
-          res = false
-        }
-        for (const i in this.fileList) {
-          if (this.fileList[i].name === file.name) {
-            this.$message.error('该图片已上传过，请选择其他图片')
-            res = false
-          }
-        }
-        return res
-      },
-      // 文件列表移除文件时的钩子
-      handleRemove(file, fileList) {
-        console.log('handleRemove')
-        for (const i in this.fileList) {
-          if (this.fileList[i].name === file.name) {
-            this.fileList.splice(i, 1)
-            this.hideUpload = this.fileList.length >= 4
-            return
-          }
-        }
-        this.handleChange()
-      },
-      // 限制提示
-      handleExceed(files, fileList) {
-        console.log('handleExceed')
-        this.$message.warning(
-          `限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${
-          files.length + fileList.length
-            } 张图片`
-        )
-      },
-      // 点击文件列表中已上传的文件时的钩子
-      handlePictureCardPreview(file) {
-        console.log('handlePictureCardPreview')
-        this.dialogImageUrl = file.url
-        this.dialogVisible = true
-      },
-      handleChange(file, fileList) {
-        console.log('handleChange')
-        if (fileList) {
-          this.hideUpload = fileList.length >= 4
         } else {
-          this.hideUpload = false
+          return true
         }
-      },
-      handleSuccess(response, file, fileList) {
-        console.log('handleSuccess')
-        const base_url = process.env.BASE_API + '/static/'
+      }
+    },
+    showArea() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        return false
+      }
+    },
+    firstDept() {
+      // 获取权属单位
+      return this.wellForm.deptid
+    },
+    qu() {
+      // 获取区
+      return this.wellForm.qu
+    }
+  },
+  watch: {
+    firstDept(val) {
+      // 监控权属单位变化
+      if (val !== '') {
+        this.wellForm.qu = ''
+        this.wellForm.area = ''
+        this.wellForm.responsibleDept = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea0()
+      }
+    },
+    'wellForm.city'(val) {
+      // 监控市变化
+      if (val !== '') {
+        this.wellForm.qu = ''
+        this.wellForm.area = ''
+        this.fetchArea1()
+      }
+    },
+    'wellForm.qu'(val) {
+      // 监控区变化
+      if (val !== '') {
+        this.wellForm.area = ''
+        this.fetchArea2()
+      }
+    }
+  },
+  created() {
+    this.fetchWellType()
+    this.fetchArea0()
+    this.imageList = []
+    this.fileList = []
+  },
+  methods: {
+    // 加载组织机构树形下拉菜单
+    fetchSecondDeptTree: function() {
+      const listQuery = {
+        pid: this.wellForm.deptid,
+        deptType: '04'
+      }
+      getDeptTreeList(listQuery).then((response) => {
+        console.log(response.data)
+        if (response.data.list) {
+          this.secondDeptTreeList = toTreeList(
+            response.data.list,
+            this.wellForm.deptid
+          )
+        }
+      })
+    },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then((response) => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+        this.wellForm.wellType = '1'
+        if (this.wellTypeList.length <= 1) {
+          this.showWellType = false
+        }
+      })
+    },
+    // 获取一级分区
+    fetchArea0() {
+      getAreaByDept(this.wellForm.deptid).then((response) => {
         if (response.code === 200) {
-          this.fileList.push({
-            name: file.file.name,
-            url: base_url + response.data
+          const pid = response.data.area
+          getAreaList(pid).then((response) => {
+            this.cityList = response.data
           })
-          this.handleChange()
-        } else {
-          this.$message.warning(response.message)
         }
+      })
+    },
+    // 获取区域1
+    fetchArea1() {
+      getAreaList(this.wellForm.city).then((response) => {
+        this.quList = response.data
+      })
+    },
+    // 获取区域2
+    fetchArea2() {
+      getAreaList(this.wellForm.qu).then((response) => {
+        this.jiedaoList = response.data
+      })
+    },
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.fileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.wellForm = {
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '' // 维护人员部门
+      }
+      // 清空上传图片
+      this.$refs.upload.clearFiles()
+      this.fileList = []
+      this.imageList = []
+      this.hideUpload = this.fileList.length >= 4
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      this.wellForm.photos = ''
+      const count = this.fileList.length < 4 ? this.fileList.length : 4
+      for (let i = 0; i < count; i++) {
+        const image = this.fileList[i]
+        this.wellForm.photos += image.url + ';'
+      }
+      // 如果责任部门不选，则用权属作为责任部门
+      if (this.wellForm.responsibleDept === '') {
+        if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
+          this.$message.warning('必须选择维护机构')
+          return
+        } else {
+          this.wellForm.responsibleDept = this.wellForm.deptid
+        }
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          addWell(this.wellForm).then((response) => {
+            console.log('新增井')
+            if (response.code === 200) {
+              this.$message.success('新增成功!')
+              this.resetForm()
+            }
+          })
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+      Uploadimg(file).then((res) => {
+        if (res.code === 200) {
+          this.fileList.push({ name: file.file.name, url: res.data })
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.fileList.splice(i, 1)
+          this.hideUpload = this.fileList.length >= 4
+          return
+        }
+      }
+      this.handleChange()
+    },
+    // 限制提示
+    handleExceed(files, fileList) {
+      console.log('handleExceed')
+      this.$message.warning(
+        `限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${
+          files.length + fileList.length
+        } 张图片`
+      )
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      console.log('handlePictureCardPreview')
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      console.log('handleChange')
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
+    },
+    handleSuccess(response, file, fileList) {
+      console.log('handleSuccess')
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.fileList.push({
+          name: file.file.name,
+          url: base_url + response.data
+        })
+        this.handleChange()
+      } else {
+        this.$message.warning(response.message)
       }
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 6c22232..f841993 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -17,7 +17,7 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="井类型" prop="wellType">
-              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled/>
+              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="给水井" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
@@ -51,67 +51,67 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <div v-if="imageList.length==0">
-                无
-              </div>
-              <!--<el-image-->
-              <!--v-for="image in imageList"-->
-              <!--:src="image"-->
-              <!--:preview-src-list="imageList"-->
-              <!--:z-index="4000"-->
-              <!--style="width: 100px; height: 100px; margin-right:10px"/>-->
-              <el-upload
-                v-else
-                ref="upload"
-                :file-list="imageList"
-                :on-preview="handlePictureCardPreview"
-                class="hide"
-                multiple
-                accept=".jpg,.jpeg,.png "
-                action="string"
-                list-type="picture-card"
-                disabled
-              >
-                <i class="el-icon-plus"/>
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                <!--<img width="100%" :src="dialogImageUrl">-->
-                <div class="imgBox">
-                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
+          <!--          <el-col :span="24">-->
+          <!--            <el-form-item label="路标图片" prop="images">-->
+          <!--              <div v-if="imageList.length==0">-->
+          <!--                无-->
+          <!--              </div>-->
+          <!--              &lt;!&ndash;<el-image&ndash;&gt;-->
+          <!--              &lt;!&ndash;v-for="image in imageList"&ndash;&gt;-->
+          <!--              &lt;!&ndash;:src="image"&ndash;&gt;-->
+          <!--              &lt;!&ndash;:preview-src-list="imageList"&ndash;&gt;-->
+          <!--              &lt;!&ndash;:z-index="4000"&ndash;&gt;-->
+          <!--              &lt;!&ndash;style="width: 100px; height: 100px; margin-right:10px"/>&ndash;&gt;-->
+          <!--              <el-upload-->
+          <!--                v-else-->
+          <!--                ref="upload"-->
+          <!--                :file-list="imageList"-->
+          <!--                :on-preview="handlePictureCardPreview"-->
+          <!--                class="hide"-->
+          <!--                multiple-->
+          <!--                accept=".jpg,.jpeg,.png "-->
+          <!--                action="string"-->
+          <!--                list-type="picture-card"-->
+          <!--                disabled-->
+          <!--              >-->
+          <!--                <i class="el-icon-plus"/>-->
+          <!--              </el-upload>-->
+          <!--              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>-->
+          <!--                &lt;!&ndash;<img width="100%" :src="dialogImageUrl">&ndash;&gt;-->
+          <!--                <div class="imgBox">-->
+          <!--                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">-->
+          <!--                </div>-->
+          <!--              </el-dialog>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
         </el-row>
         <!--<el-row :gutter="1">-->
-          <!--<el-form-item label="所在区域" required>-->
-            <!--<el-col :span="5">-->
-              <!--<el-form-item prop="qu">-->
-                <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
-                  <!--<el-option-->
-                    <!--v-for="item in quList"-->
-                    <!--:key="item.id"-->
-                    <!--:label="item.name"-->
-                    <!--:value="item.id"/>-->
-                <!--</el-select>-->
-              <!--</el-form-item>-->
-            <!--</el-col>-->
-            <!--<el-col :span="1" class="line">区/县</el-col>-->
-            <!--<el-col :span="5">-->
-              <!--<el-form-item prop="area">-->
-                <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
-                  <!--<el-option-->
-                    <!--v-for="item in jiedaoList"-->
-                    <!--:key="item.id"-->
-                    <!--:label="item.name"-->
-                    <!--:value="item.id"/>-->
-                <!--</el-select>-->
-              <!--</el-form-item>-->
-            <!--</el-col>-->
-            <!--<el-col :span="1" class="line">街道/镇</el-col>-->
-          <!--</el-form-item>-->
+        <!--<el-form-item label="所在区域" required>-->
+        <!--<el-col :span="5">-->
+        <!--<el-form-item prop="qu">-->
+        <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
+        <!--<el-option-->
+        <!--v-for="item in quList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.name"-->
+        <!--:value="item.id"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--<el-col :span="1" class="line">区/县</el-col>-->
+        <!--<el-col :span="5">-->
+        <!--<el-form-item prop="area">-->
+        <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
+        <!--<el-option-->
+        <!--v-for="item in jiedaoList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.name"-->
+        <!--:value="item.id"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--<el-col :span="1" class="line">街道/镇</el-col>-->
+        <!--</el-form-item>-->
         <!--</el-row>-->
         <el-row>
           <el-col :span="15">
@@ -120,13 +120,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="井维护单位" prop="responsibleDept">
-              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <!--        <el-row :gutter="20">-->
+        <!--          <el-col :span="10">-->
+        <!--            <el-form-item label="井维护单位" prop="responsibleDept">-->
+        <!--              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
       </el-form>
       <div class="watch-div">
         <el-row class="table-title">

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 3060bee..cc79e85 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -27,7 +27,7 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
-            <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
+          <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
         </el-table>
       </div>
@@ -80,7 +80,7 @@
         metrics: ['total'],
         dimension: ['uptime']
       },
-      data:[]
+      data: []
 
     }
   },
@@ -105,9 +105,12 @@
       this.fetchData() // 传row
     },
     fetchData() {
-      if(this.timeRange.length==2){
+      if (this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 436978a..d8b75b2 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -18,9 +18,9 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="日用水量（立方米）" prop="dayCount" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
-<!--          <el-table-column label="阀门状态" align="center">-->
-<!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column label="阀门状态" align="center">-->
+          <!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
+          <!--          </el-table-column>-->
         </el-table>
       </div>
     </div>
@@ -44,7 +44,7 @@
         beginTime: '',
         endTime: ''
       },
-      data:[]
+      data: []
 
     }
   },
@@ -70,9 +70,12 @@
     },
     fetchData() {
       this.loading1 = true
-      if(this.timeRange.length==2){
+      if (this.timeRange.length == 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       totalData(this.listQuery).then(response => {
         this.data = response.data
@@ -101,8 +104,7 @@
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
         window.URL.revokeObjectURL(href) // 释放blob对象
-      })
-      .catch((res) => {
+      }).catch((res) => {
         loading.close()
       })
     }
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index a3425c4..5437a72 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -247,7 +247,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气配置列表.xlsx` // 下载后文件名
+        downloadElement.download = `噪声配置列表.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 6765449..8a00de1 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -87,39 +87,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{ hide: hideUpload }"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
-              <i class="el-icon-plus"/>
-            </el-upload>
-            <el-dialog
-              :visible.sync="dialogVisible"
-              title="图片预览"
-              append-to-body
-            >
-              <div class="imgBox">
-                <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto">
-              </div>
-            </el-dialog>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="24">-->
+      <!--          <el-form-item label="路标图片" prop="images">-->
+      <!--            <el-upload-->
+      <!--              ref="upload"-->
+      <!--              :before-upload="handleBeforeUpload"-->
+      <!--              :on-preview="handlePictureCardPreview"-->
+      <!--              :on-remove="handleRemove"-->
+      <!--              :on-exceed="handleExceed"-->
+      <!--              :on-change="handleChange"-->
+      <!--              :on-success="handleSuccess"-->
+      <!--              :limit="4"-->
+      <!--              :class="{ hide: hideUpload }"-->
+      <!--              :http-request="uploadFile"-->
+      <!--              action="string"-->
+      <!--              multiple-->
+      <!--              accept=".jpg,.jpeg,.png "-->
+      <!--              list-type="picture-card"-->
+      <!--            >-->
+      <!--              <i class="el-icon-plus"/>-->
+      <!--            </el-upload>-->
+      <!--            <el-dialog-->
+      <!--              :visible.sync="dialogVisible"-->
+      <!--              title="图片预览"-->
+      <!--              append-to-body-->
+      <!--            >-->
+      <!--              <div class="imgBox">-->
+      <!--                <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto">-->
+      <!--              </div>-->
+      <!--            </el-dialog>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
       <el-row :gutter="2">
         <el-form-item label="所在区域" required>
           <el-col :span="5">
@@ -203,381 +203,381 @@
 </template>
 
 <script>
-  import {toTreeList} from '@/utils/structure'
-  import SelectTree from '@/components/SelectTree/singleSelect'
-  import {getDeptTreeList} from '@/api/system/dept'
-  import {getAreaList, getAreaByDept} from '@/api/system/area'
-  import {getWellType, addWell} from '@/api/well'
-  import {Uploadimg} from '@/api/common'
-  import DeptSelect from '@/components/DeptSelect'
-  import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getWellType, addWell } from '@/api/well'
+import { Uploadimg } from '@/api/common'
+import DeptSelect from '@/components/DeptSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
-  export default {
-    name: 'AddWell',
-    components: {SelectTree, DeptSelect, AreaSelectTree},
-    data() {
-      const validateDeep = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
+export default {
+  name: 'AddWell',
+  components: { SelectTree, DeptSelect, AreaSelectTree },
+  data() {
+    const validateDeep = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          const deep = parseFloat(value)
+          if (deep > 10 || deep < 0) {
+            callback(new Error('请填写0到10数值'))
           } else {
-            const deep = parseFloat(value)
-            if (deep > 10 || deep < 0) {
-              callback(new Error('请填写0到10数值'))
-            } else {
-              callback()
-            }
+            callback()
           }
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateLng = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
         } else {
           callback()
         }
+      } else {
+        callback(new Error('经度不能为空'))
       }
-      const validateLng = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
-          } else {
-            callback()
-          }
+    }
+    const validateLat = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
         } else {
-          callback(new Error('经度不能为空'))
+          callback()
         }
+      } else {
+        callback(new Error('纬度不能为空'))
       }
-      const validateLat = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
-          } else {
-            callback()
-          }
-        } else {
-          callback(new Error('纬度不能为空'))
-        }
-      }
-      return {
-        dialogFormVisible: false, // 对话框是否显示
-        dialogStatus: '', // 对话框类型：create,update
-        node: null,
-        wellForm: {
-          wellCode: '', // 井编号
-          wellName: '', // 井名称
-          wellType: '', // 井类型
-          deptid: '1148031048115494913', // 权属单位
-          deep: '', // 井深，
-          position: '', // 位置描述
-          coordinateX: '', // 经度
-          coordinateY: '', // 纬度
-          photos: '', // 照片路径
-          notes: '', // 备注,
-          city:'',
-          qu: '',
-          area: '', // 街道
-          responsibleDept: '' // 维护人员部门
-        }, // 表单
-        deptProps: {
-          parent: 'pid',
-          value: 'id',
-          label: 'name',
-          children: 'children'
-        },
-        hideUpload: false,
-        fileList: [],
-        imageList: [],
-        deptTreeList: null, // 组织树列表数据
-        secondDeptTreeList: null, // 二级组织树列表
-        wellTypeList: null,
-        cityList: [], // 一级
-        quList: [], // 二级
-        jiedaoList: [], // 三级
-        textMap: {
-          update: '编辑',
-          create: '新增'
-        }, // 表头显示标题
-        rules: {
-          wellCode: [{required: true,message: '井编号不能为空',trigger: ['blur', 'change']}],
-          wellName: [{required: true, message: '井名称不能为空', trigger: ['blur', 'change']}],
-          position: [{required: false, message: '井详细地址不能为空', trigger: ['blur', 'change']}],
-          deep: [{required: false, trigger: ['blur', 'change'], validator: validateDeep}],
-          coordinateX: [{required: true,trigger: ['blur', 'change'], validator: validateLat}],
-          coordinateY: [{required: true, trigger: ['blur', 'change'], validator: validateLng}],
-          deptid: [{required: true, message: '组织机构必选', trigger: 'change'}],
-          wellType: [{required: true, message: '井类型必选', trigger: 'change'}],
-          city: [{required: true, message: '一级分区必选', trigger: 'change'}],
-          qu: [{required: true, message: '二级分区必选', trigger: 'change'}],
-          area: [{required: true, message: '三级分区必选', trigger: 'change'}]
-        },
-        uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
-        dialogImageUrl: '',
-        dialogVisible: false,
-        labelPosition: 'right',
-        responseAssignShow: false,
-        deptShowTop: false, // 权属单位下拉是否显示顶级
-        deptShow: true
-      }
-    },
-    computed: {
-      showResponseDept() {
-        if (this.wellForm.deptid === '') {
-          return true
-        } else {
-          if (this.secondDeptTreeList && this.secondDeptTreeList.length >= 1) {
-            return false
-          } else {
-            return true
-          }
-        }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      node: null,
+      wellForm: {
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '1148031048115494913', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        city: '',
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '' // 维护人员部门
+      }, // 表单
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
       },
-      showArea() {
-        if (this.wellForm.deptid === '') {
-          return true
-        } else {
+      hideUpload: false,
+      fileList: [],
+      imageList: [],
+      deptTreeList: null, // 组织树列表数据
+      secondDeptTreeList: null, // 二级组织树列表
+      wellTypeList: null,
+      cityList: [], // 一级
+      quList: [], // 二级
+      jiedaoList: [], // 三级
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: false, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
+        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
+        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
+        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        city: [{ required: true, message: '一级分区必选', trigger: 'change' }],
+        qu: [{ required: true, message: '二级分区必选', trigger: 'change' }],
+        area: [{ required: true, message: '三级分区必选', trigger: 'change' }]
+      },
+      uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
+      dialogImageUrl: '',
+      dialogVisible: false,
+      labelPosition: 'right',
+      responseAssignShow: false,
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShow: true
+    }
+  },
+  computed: {
+    showResponseDept() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        if (this.secondDeptTreeList && this.secondDeptTreeList.length >= 1) {
           return false
-        }
-      },
-      firstDept() {
-        // 获取权属单位
-        return this.wellForm.deptid
-      },
-      qu() {
-        // 获取区
-        return this.wellForm.qu
-      }
-    },
-    watch: {
-      firstDept(val) {
-        // 监控权属单位变化
-        if (val !== '') {
-          this.wellForm.qu = ''
-          this.wellForm.area = ''
-          this.wellForm.responsibleDept = ''
-          this.fetchSecondDeptTree()
-          this.fetchArea0()
-        }
-      },
-      'wellForm.city'(val) {
-        // 监控市变化
-        if (val !== '') {
-          this.wellForm.qu = ''
-          this.wellForm.area = ''
-          this.fetchArea1()
-        }
-      },
-      'wellForm.qu'(val) {
-        // 监控区变化
-        if (val !== '') {
-          this.wellForm.area = ''
-          this.fetchArea2()
-        }
-      }
-    },
-    created () {
-      this.fetchWellType()
-      this.fetchArea0()
-      this.imageList = []
-      this.fileList = []
-    },
-    methods: {
-      // 加载组织机构树形下拉菜单
-      fetchSecondDeptTree: function () {
-        const listQuery = {
-          pid: this.wellForm.deptid,
-          deptType: '04'
-        }
-        getDeptTreeList(listQuery).then((response) => {
-          console.log(response.data)
-          if (response.data.list) {
-            this.secondDeptTreeList = toTreeList(
-              response.data.list,
-              this.wellForm.deptid
-            )
-          }
-        })
-      },
-      // 获取井类型
-      fetchWellType() {
-        getWellType().then((response) => {
-          this.wellTypeList = []
-          const wellTypes = this.$store.getters.wellTypes
-          for (const wellType of response.data) {
-            if (wellTypes.indexOf(wellType.value) !== -1) {
-              this.wellTypeList.push(wellType)
-            }
-          }
-          this.wellForm.wellType='1'
-          if (this.wellTypeList.length <= 1) {
-            this.showWellType = false
-          }
-        })
-      },
-      // 获取一级分区
-      fetchArea0() {
-        getAreaByDept(this.wellForm.deptid).then((response) => {
-          if (response.code === 200) {
-            const pid = response.data.area
-            getAreaList(pid).then((response) => {
-              this.cityList = response.data
-            })
-          }
-        })
-      },
-      // 获取区域1
-      fetchArea1() {
-        getAreaList(this.wellForm.city).then((response) => {
-          this.quList = response.data
-        })
-      },
-      // 获取区域2
-      fetchArea2() {
-        getAreaList(this.wellForm.qu).then((response) => {
-          this.jiedaoList = response.data
-        })
-      },
-      // 取消
-      cancel() {
-        this.dialogFormVisible = false
-        this.fileList = []
-        // 清除验证
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      // 重置表单
-      resetForm() {
-        this.wellForm = {
-          wellCode: '', // 井编号
-          wellName: '', // 井名称
-          wellType: '', // 井类型
-          deptid: '', // 权属单位
-          deep: '', // 井深，
-          position: '', // 位置描述
-          coordinateX: '', // 经度
-          coordinateY: '', // 纬度
-          photos: '', // 照片路径
-          notes: '', // 备注,
-          qu: '',
-          area: '', // 街道
-          responsibleDept: '' // 维护人员部门
-        }
-        // 清空上传图片
-        this.$refs.upload.clearFiles()
-        this.fileList = []
-        this.imageList = []
-        this.hideUpload = this.fileList.length >= 4
-        // 清除验证
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      // 保存数据
-      saveData: function () {
-        this.wellForm.photos = ''
-        const count = this.fileList.length < 4 ? this.fileList.length : 4
-        for (let i = 0; i < count; i++) {
-          const image = this.fileList[i]
-          this.wellForm.photos += image.url + ';'
-        }
-        // 如果责任部门不选，则用权属作为责任部门
-        if (this.wellForm.responsibleDept === '') {
-          if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
-            this.$message.warning('必须选择维护机构')
-            return
-          } else {
-            this.wellForm.responsibleDept = this.wellForm.deptid
-          }
-        }
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            addWell(this.wellForm).then((response) => {
-              console.log('新增井')
-              if (response.code === 200) {
-                this.$message.success('新增成功!')
-                this.resetForm()
-              }
-            })
-          }
-        })
-      },
-      // 图片上传
-      uploadFile(file) {
-        console.log('uploadFile:' + file.file.name)
-        // const base_url = process.env.BASE_API + '/static/'
-        Uploadimg(file).then((res) => {
-          if (res.code === 200) {
-            this.fileList.push({name: file.file.name, url: res.data})
-          }
-        })
-      },
-      // 上传前判断文件格式及大小
-      handleBeforeUpload(file) {
-        const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
-        let res = true
-        const isLt2M = file.size / 1024 / 1024 < 5
-        if (!isJPG) {
-          this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-          res = false
-        }
-        if (!isLt2M) {
-          this.$message.error('上传图片大小不能超过 5MB!')
-          res = false
-        }
-        for (const i in this.fileList) {
-          if (this.fileList[i].name === file.name) {
-            this.$message.error('该图片已上传过，请选择其他图片')
-            res = false
-          }
-        }
-        return res
-      },
-      // 文件列表移除文件时的钩子
-      handleRemove(file, fileList) {
-        console.log('handleRemove')
-        for (const i in this.fileList) {
-          if (this.fileList[i].name === file.name) {
-            this.fileList.splice(i, 1)
-            this.hideUpload = this.fileList.length >= 4
-            return
-          }
-        }
-        this.handleChange()
-      },
-      // 限制提示
-      handleExceed(files, fileList) {
-        console.log('handleExceed')
-        this.$message.warning(
-          `限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${
-          files.length + fileList.length
-            } 张图片`
-        )
-      },
-      // 点击文件列表中已上传的文件时的钩子
-      handlePictureCardPreview(file) {
-        console.log('handlePictureCardPreview')
-        this.dialogImageUrl = file.url
-        this.dialogVisible = true
-      },
-      handleChange(file, fileList) {
-        console.log('handleChange')
-        if (fileList) {
-          this.hideUpload = fileList.length >= 4
         } else {
-          this.hideUpload = false
+          return true
         }
-      },
-      handleSuccess(response, file, fileList) {
-        console.log('handleSuccess')
-        const base_url = process.env.BASE_API + '/static/'
+      }
+    },
+    showArea() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        return false
+      }
+    },
+    firstDept() {
+      // 获取权属单位
+      return this.wellForm.deptid
+    },
+    qu() {
+      // 获取区
+      return this.wellForm.qu
+    }
+  },
+  watch: {
+    firstDept(val) {
+      // 监控权属单位变化
+      if (val !== '') {
+        this.wellForm.qu = ''
+        this.wellForm.area = ''
+        this.wellForm.responsibleDept = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea0()
+      }
+    },
+    'wellForm.city'(val) {
+      // 监控市变化
+      if (val !== '') {
+        this.wellForm.qu = ''
+        this.wellForm.area = ''
+        this.fetchArea1()
+      }
+    },
+    'wellForm.qu'(val) {
+      // 监控区变化
+      if (val !== '') {
+        this.wellForm.area = ''
+        this.fetchArea2()
+      }
+    }
+  },
+  created() {
+    this.fetchWellType()
+    this.fetchArea0()
+    this.imageList = []
+    this.fileList = []
+  },
+  methods: {
+    // 加载组织机构树形下拉菜单
+    fetchSecondDeptTree: function() {
+      const listQuery = {
+        pid: this.wellForm.deptid,
+        deptType: '04'
+      }
+      getDeptTreeList(listQuery).then((response) => {
+        console.log(response.data)
+        if (response.data.list) {
+          this.secondDeptTreeList = toTreeList(
+            response.data.list,
+            this.wellForm.deptid
+          )
+        }
+      })
+    },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then((response) => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+        this.wellForm.wellType = '1'
+        if (this.wellTypeList.length <= 1) {
+          this.showWellType = false
+        }
+      })
+    },
+    // 获取一级分区
+    fetchArea0() {
+      getAreaByDept(this.wellForm.deptid).then((response) => {
         if (response.code === 200) {
-          this.fileList.push({
-            name: file.file.name,
-            url: base_url + response.data
+          const pid = response.data.area
+          getAreaList(pid).then((response) => {
+            this.cityList = response.data
           })
-          this.handleChange()
-        } else {
-          this.$message.warning(response.message)
         }
+      })
+    },
+    // 获取区域1
+    fetchArea1() {
+      getAreaList(this.wellForm.city).then((response) => {
+        this.quList = response.data
+      })
+    },
+    // 获取区域2
+    fetchArea2() {
+      getAreaList(this.wellForm.qu).then((response) => {
+        this.jiedaoList = response.data
+      })
+    },
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.fileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.wellForm = {
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '' // 维护人员部门
+      }
+      // 清空上传图片
+      this.$refs.upload.clearFiles()
+      this.fileList = []
+      this.imageList = []
+      this.hideUpload = this.fileList.length >= 4
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      this.wellForm.photos = ''
+      const count = this.fileList.length < 4 ? this.fileList.length : 4
+      for (let i = 0; i < count; i++) {
+        const image = this.fileList[i]
+        this.wellForm.photos += image.url + ';'
+      }
+      // 如果责任部门不选，则用权属作为责任部门
+      if (this.wellForm.responsibleDept === '') {
+        if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
+          this.$message.warning('必须选择维护机构')
+          return
+        } else {
+          this.wellForm.responsibleDept = this.wellForm.deptid
+        }
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          addWell(this.wellForm).then((response) => {
+            console.log('新增井')
+            if (response.code === 200) {
+              this.$message.success('新增成功!')
+              this.resetForm()
+            }
+          })
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+      Uploadimg(file).then((res) => {
+        if (res.code === 200) {
+          this.fileList.push({ name: file.file.name, url: res.data })
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.fileList.splice(i, 1)
+          this.hideUpload = this.fileList.length >= 4
+          return
+        }
+      }
+      this.handleChange()
+    },
+    // 限制提示
+    handleExceed(files, fileList) {
+      console.log('handleExceed')
+      this.$message.warning(
+        `限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${
+          files.length + fileList.length
+        } 张图片`
+      )
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      console.log('handlePictureCardPreview')
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      console.log('handleChange')
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
+    },
+    handleSuccess(response, file, fileList) {
+      console.log('handleSuccess')
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.fileList.push({
+          name: file.file.name,
+          url: base_url + response.data
+        })
+        this.handleChange()
+      } else {
+        this.$message.warning(response.message)
       }
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 6c22232..f841993 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -17,7 +17,7 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="井类型" prop="wellType">
-              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled/>
+              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="给水井" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
@@ -51,67 +51,67 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <div v-if="imageList.length==0">
-                无
-              </div>
-              <!--<el-image-->
-              <!--v-for="image in imageList"-->
-              <!--:src="image"-->
-              <!--:preview-src-list="imageList"-->
-              <!--:z-index="4000"-->
-              <!--style="width: 100px; height: 100px; margin-right:10px"/>-->
-              <el-upload
-                v-else
-                ref="upload"
-                :file-list="imageList"
-                :on-preview="handlePictureCardPreview"
-                class="hide"
-                multiple
-                accept=".jpg,.jpeg,.png "
-                action="string"
-                list-type="picture-card"
-                disabled
-              >
-                <i class="el-icon-plus"/>
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                <!--<img width="100%" :src="dialogImageUrl">-->
-                <div class="imgBox">
-                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
+          <!--          <el-col :span="24">-->
+          <!--            <el-form-item label="路标图片" prop="images">-->
+          <!--              <div v-if="imageList.length==0">-->
+          <!--                无-->
+          <!--              </div>-->
+          <!--              &lt;!&ndash;<el-image&ndash;&gt;-->
+          <!--              &lt;!&ndash;v-for="image in imageList"&ndash;&gt;-->
+          <!--              &lt;!&ndash;:src="image"&ndash;&gt;-->
+          <!--              &lt;!&ndash;:preview-src-list="imageList"&ndash;&gt;-->
+          <!--              &lt;!&ndash;:z-index="4000"&ndash;&gt;-->
+          <!--              &lt;!&ndash;style="width: 100px; height: 100px; margin-right:10px"/>&ndash;&gt;-->
+          <!--              <el-upload-->
+          <!--                v-else-->
+          <!--                ref="upload"-->
+          <!--                :file-list="imageList"-->
+          <!--                :on-preview="handlePictureCardPreview"-->
+          <!--                class="hide"-->
+          <!--                multiple-->
+          <!--                accept=".jpg,.jpeg,.png "-->
+          <!--                action="string"-->
+          <!--                list-type="picture-card"-->
+          <!--                disabled-->
+          <!--              >-->
+          <!--                <i class="el-icon-plus"/>-->
+          <!--              </el-upload>-->
+          <!--              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>-->
+          <!--                &lt;!&ndash;<img width="100%" :src="dialogImageUrl">&ndash;&gt;-->
+          <!--                <div class="imgBox">-->
+          <!--                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">-->
+          <!--                </div>-->
+          <!--              </el-dialog>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
         </el-row>
         <!--<el-row :gutter="1">-->
-          <!--<el-form-item label="所在区域" required>-->
-            <!--<el-col :span="5">-->
-              <!--<el-form-item prop="qu">-->
-                <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
-                  <!--<el-option-->
-                    <!--v-for="item in quList"-->
-                    <!--:key="item.id"-->
-                    <!--:label="item.name"-->
-                    <!--:value="item.id"/>-->
-                <!--</el-select>-->
-              <!--</el-form-item>-->
-            <!--</el-col>-->
-            <!--<el-col :span="1" class="line">区/县</el-col>-->
-            <!--<el-col :span="5">-->
-              <!--<el-form-item prop="area">-->
-                <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
-                  <!--<el-option-->
-                    <!--v-for="item in jiedaoList"-->
-                    <!--:key="item.id"-->
-                    <!--:label="item.name"-->
-                    <!--:value="item.id"/>-->
-                <!--</el-select>-->
-              <!--</el-form-item>-->
-            <!--</el-col>-->
-            <!--<el-col :span="1" class="line">街道/镇</el-col>-->
-          <!--</el-form-item>-->
+        <!--<el-form-item label="所在区域" required>-->
+        <!--<el-col :span="5">-->
+        <!--<el-form-item prop="qu">-->
+        <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
+        <!--<el-option-->
+        <!--v-for="item in quList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.name"-->
+        <!--:value="item.id"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--<el-col :span="1" class="line">区/县</el-col>-->
+        <!--<el-col :span="5">-->
+        <!--<el-form-item prop="area">-->
+        <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
+        <!--<el-option-->
+        <!--v-for="item in jiedaoList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.name"-->
+        <!--:value="item.id"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--<el-col :span="1" class="line">街道/镇</el-col>-->
+        <!--</el-form-item>-->
         <!--</el-row>-->
         <el-row>
           <el-col :span="15">
@@ -120,13 +120,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="井维护单位" prop="responsibleDept">
-              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <!--        <el-row :gutter="20">-->
+        <!--          <el-col :span="10">-->
+        <!--            <el-form-item label="井维护单位" prop="responsibleDept">-->
+        <!--              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
       </el-form>
       <div class="watch-div">
         <el-row class="table-title">
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index a259516..f46ac28 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -96,44 +96,44 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <el-upload
-                ref="upload"
-                :before-upload="handleBeforeUpload"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                :on-exceed="handleExceed"
-                :on-change="handleChange"
-                :http-request="uploadFile"
-                :file-list="imageList"
-                :limit="4"
-                :class="{ hide: hideUpload }"
-                multiple
-                action="string"
-                accept=".jpg,.jpeg,.png "
-                list-type="picture-card"
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
-              <el-dialog
-                :visible.sync="dialogVisible"
-                title="图片预览"
-                append-to-body
-              >
-                <div class="imgBox">
-                  <img
-                    :src="dialogImageUrl"
-                    max-height="400px;"
-                    alt=""
-                    style="margin: 0 auto"
-                  >
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <!--        <el-row>-->
+        <!--          <el-col :span="24">-->
+        <!--            <el-form-item label="路标图片" prop="images">-->
+        <!--              <el-upload-->
+        <!--                ref="upload"-->
+        <!--                :before-upload="handleBeforeUpload"-->
+        <!--                :on-preview="handlePictureCardPreview"-->
+        <!--                :on-remove="handleRemove"-->
+        <!--                :on-exceed="handleExceed"-->
+        <!--                :on-change="handleChange"-->
+        <!--                :http-request="uploadFile"-->
+        <!--                :file-list="imageList"-->
+        <!--                :limit="4"-->
+        <!--                :class="{ hide: hideUpload }"-->
+        <!--                multiple-->
+        <!--                action="string"-->
+        <!--                accept=".jpg,.jpeg,.png "-->
+        <!--                list-type="picture-card"-->
+        <!--              >-->
+        <!--                <i class="el-icon-plus" />-->
+        <!--              </el-upload>-->
+        <!--              <el-dialog-->
+        <!--                :visible.sync="dialogVisible"-->
+        <!--                title="图片预览"-->
+        <!--                append-to-body-->
+        <!--              >-->
+        <!--                <div class="imgBox">-->
+        <!--                  <img-->
+        <!--                    :src="dialogImageUrl"-->
+        <!--                    max-height="400px;"-->
+        <!--                    alt=""-->
+        <!--                    style="margin: 0 auto"-->
+        <!--                  >-->
+        <!--                </div>-->
+        <!--              </el-dialog>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
         <!-- <el-row :gutter="1">
           <el-form-item label="所在区域" required>
             <el-col :span="5">

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..d7dc9b2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -70,6 +70,7 @@
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -105,16 +106,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +262,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..8301f8c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -60,9 +60,10 @@
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.type!='Button'&&!column.level" :class="column.class">{{ scope.row[column.value] }}</span>
-            <span v-if="column.type!='Button'&&column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.level" :class="column.class">{{ formatValue(scope.row[column.value]) }}</span>
+            <span v-else-if="column.value === 'position'">{{ scope.row["areaFullName"] + '/' + scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="hasPerm('/job/info')" label="操作" align="center" width="80">
@@ -95,17 +96,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +133,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +156,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +193,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +250,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +317,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 3060bee..cc79e85 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -27,7 +27,7 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
-            <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
+          <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
         </el-table>
       </div>
@@ -80,7 +80,7 @@
         metrics: ['total'],
         dimension: ['uptime']
       },
-      data:[]
+      data: []
 
     }
   },
@@ -105,9 +105,12 @@
       this.fetchData() // 传row
     },
     fetchData() {
-      if(this.timeRange.length==2){
+      if (this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 436978a..d8b75b2 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -18,9 +18,9 @@
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
           <el-table-column label="日用水量（立方米）" prop="dayCount" align="center"/>
           <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
-<!--          <el-table-column label="阀门状态" align="center">-->
-<!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column label="阀门状态" align="center">-->
+          <!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
+          <!--          </el-table-column>-->
         </el-table>
       </div>
     </div>
@@ -44,7 +44,7 @@
         beginTime: '',
         endTime: ''
       },
-      data:[]
+      data: []
 
     }
   },
@@ -70,9 +70,12 @@
     },
     fetchData() {
       this.loading1 = true
-      if(this.timeRange.length==2){
+      if (this.timeRange.length == 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
       }
       totalData(this.listQuery).then(response => {
         this.data = response.data
@@ -101,8 +104,7 @@
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
         window.URL.revokeObjectURL(href) // 释放blob对象
-      })
-      .catch((res) => {
+      }).catch((res) => {
         loading.close()
       })
     }
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index a3425c4..5437a72 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -247,7 +247,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `燃气配置列表.xlsx` // 下载后文件名
+        downloadElement.download = `噪声配置列表.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 6765449..8a00de1 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -87,39 +87,39 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{ hide: hideUpload }"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
-              <i class="el-icon-plus"/>
-            </el-upload>
-            <el-dialog
-              :visible.sync="dialogVisible"
-              title="图片预览"
-              append-to-body
-            >
-              <div class="imgBox">
-                <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto">
-              </div>
-            </el-dialog>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="24">-->
+      <!--          <el-form-item label="路标图片" prop="images">-->
+      <!--            <el-upload-->
+      <!--              ref="upload"-->
+      <!--              :before-upload="handleBeforeUpload"-->
+      <!--              :on-preview="handlePictureCardPreview"-->
+      <!--              :on-remove="handleRemove"-->
+      <!--              :on-exceed="handleExceed"-->
+      <!--              :on-change="handleChange"-->
+      <!--              :on-success="handleSuccess"-->
+      <!--              :limit="4"-->
+      <!--              :class="{ hide: hideUpload }"-->
+      <!--              :http-request="uploadFile"-->
+      <!--              action="string"-->
+      <!--              multiple-->
+      <!--              accept=".jpg,.jpeg,.png "-->
+      <!--              list-type="picture-card"-->
+      <!--            >-->
+      <!--              <i class="el-icon-plus"/>-->
+      <!--            </el-upload>-->
+      <!--            <el-dialog-->
+      <!--              :visible.sync="dialogVisible"-->
+      <!--              title="图片预览"-->
+      <!--              append-to-body-->
+      <!--            >-->
+      <!--              <div class="imgBox">-->
+      <!--                <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto">-->
+      <!--              </div>-->
+      <!--            </el-dialog>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
       <el-row :gutter="2">
         <el-form-item label="所在区域" required>
           <el-col :span="5">
@@ -203,381 +203,381 @@
 </template>
 
 <script>
-  import {toTreeList} from '@/utils/structure'
-  import SelectTree from '@/components/SelectTree/singleSelect'
-  import {getDeptTreeList} from '@/api/system/dept'
-  import {getAreaList, getAreaByDept} from '@/api/system/area'
-  import {getWellType, addWell} from '@/api/well'
-  import {Uploadimg} from '@/api/common'
-  import DeptSelect from '@/components/DeptSelect'
-  import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
+import { toTreeList } from '@/utils/structure'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getWellType, addWell } from '@/api/well'
+import { Uploadimg } from '@/api/common'
+import DeptSelect from '@/components/DeptSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
-  export default {
-    name: 'AddWell',
-    components: {SelectTree, DeptSelect, AreaSelectTree},
-    data() {
-      const validateDeep = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
+export default {
+  name: 'AddWell',
+  components: { SelectTree, DeptSelect, AreaSelectTree },
+  data() {
+    const validateDeep = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          const deep = parseFloat(value)
+          if (deep > 10 || deep < 0) {
+            callback(new Error('请填写0到10数值'))
           } else {
-            const deep = parseFloat(value)
-            if (deep > 10 || deep < 0) {
-              callback(new Error('请填写0到10数值'))
-            } else {
-              callback()
-            }
+            callback()
           }
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateLng = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
         } else {
           callback()
         }
+      } else {
+        callback(new Error('经度不能为空'))
       }
-      const validateLng = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
-          } else {
-            callback()
-          }
+    }
+    const validateLat = (rule, value, callback) => {
+      if (value !== '') {
+        if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
         } else {
-          callback(new Error('经度不能为空'))
+          callback()
         }
+      } else {
+        callback(new Error('纬度不能为空'))
       }
-      const validateLat = (rule, value, callback) => {
-        if (value !== '') {
-          if (/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(value) === false) {
-            callback(new Error('请填写大于0的数字'))
-          } else {
-            callback()
-          }
-        } else {
-          callback(new Error('纬度不能为空'))
-        }
-      }
-      return {
-        dialogFormVisible: false, // 对话框是否显示
-        dialogStatus: '', // 对话框类型：create,update
-        node: null,
-        wellForm: {
-          wellCode: '', // 井编号
-          wellName: '', // 井名称
-          wellType: '', // 井类型
-          deptid: '1148031048115494913', // 权属单位
-          deep: '', // 井深，
-          position: '', // 位置描述
-          coordinateX: '', // 经度
-          coordinateY: '', // 纬度
-          photos: '', // 照片路径
-          notes: '', // 备注,
-          city:'',
-          qu: '',
-          area: '', // 街道
-          responsibleDept: '' // 维护人员部门
-        }, // 表单
-        deptProps: {
-          parent: 'pid',
-          value: 'id',
-          label: 'name',
-          children: 'children'
-        },
-        hideUpload: false,
-        fileList: [],
-        imageList: [],
-        deptTreeList: null, // 组织树列表数据
-        secondDeptTreeList: null, // 二级组织树列表
-        wellTypeList: null,
-        cityList: [], // 一级
-        quList: [], // 二级
-        jiedaoList: [], // 三级
-        textMap: {
-          update: '编辑',
-          create: '新增'
-        }, // 表头显示标题
-        rules: {
-          wellCode: [{required: true,message: '井编号不能为空',trigger: ['blur', 'change']}],
-          wellName: [{required: true, message: '井名称不能为空', trigger: ['blur', 'change']}],
-          position: [{required: false, message: '井详细地址不能为空', trigger: ['blur', 'change']}],
-          deep: [{required: false, trigger: ['blur', 'change'], validator: validateDeep}],
-          coordinateX: [{required: true,trigger: ['blur', 'change'], validator: validateLat}],
-          coordinateY: [{required: true, trigger: ['blur', 'change'], validator: validateLng}],
-          deptid: [{required: true, message: '组织机构必选', trigger: 'change'}],
-          wellType: [{required: true, message: '井类型必选', trigger: 'change'}],
-          city: [{required: true, message: '一级分区必选', trigger: 'change'}],
-          qu: [{required: true, message: '二级分区必选', trigger: 'change'}],
-          area: [{required: true, message: '三级分区必选', trigger: 'change'}]
-        },
-        uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
-        dialogImageUrl: '',
-        dialogVisible: false,
-        labelPosition: 'right',
-        responseAssignShow: false,
-        deptShowTop: false, // 权属单位下拉是否显示顶级
-        deptShow: true
-      }
-    },
-    computed: {
-      showResponseDept() {
-        if (this.wellForm.deptid === '') {
-          return true
-        } else {
-          if (this.secondDeptTreeList && this.secondDeptTreeList.length >= 1) {
-            return false
-          } else {
-            return true
-          }
-        }
+    }
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      node: null,
+      wellForm: {
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '1148031048115494913', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        city: '',
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '' // 维护人员部门
+      }, // 表单
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
       },
-      showArea() {
-        if (this.wellForm.deptid === '') {
-          return true
-        } else {
+      hideUpload: false,
+      fileList: [],
+      imageList: [],
+      deptTreeList: null, // 组织树列表数据
+      secondDeptTreeList: null, // 二级组织树列表
+      wellTypeList: null,
+      cityList: [], // 一级
+      quList: [], // 二级
+      jiedaoList: [], // 三级
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: false, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
+        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
+        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
+        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        city: [{ required: true, message: '一级分区必选', trigger: 'change' }],
+        qu: [{ required: true, message: '二级分区必选', trigger: 'change' }],
+        area: [{ required: true, message: '三级分区必选', trigger: 'change' }]
+      },
+      uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
+      dialogImageUrl: '',
+      dialogVisible: false,
+      labelPosition: 'right',
+      responseAssignShow: false,
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShow: true
+    }
+  },
+  computed: {
+    showResponseDept() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        if (this.secondDeptTreeList && this.secondDeptTreeList.length >= 1) {
           return false
-        }
-      },
-      firstDept() {
-        // 获取权属单位
-        return this.wellForm.deptid
-      },
-      qu() {
-        // 获取区
-        return this.wellForm.qu
-      }
-    },
-    watch: {
-      firstDept(val) {
-        // 监控权属单位变化
-        if (val !== '') {
-          this.wellForm.qu = ''
-          this.wellForm.area = ''
-          this.wellForm.responsibleDept = ''
-          this.fetchSecondDeptTree()
-          this.fetchArea0()
-        }
-      },
-      'wellForm.city'(val) {
-        // 监控市变化
-        if (val !== '') {
-          this.wellForm.qu = ''
-          this.wellForm.area = ''
-          this.fetchArea1()
-        }
-      },
-      'wellForm.qu'(val) {
-        // 监控区变化
-        if (val !== '') {
-          this.wellForm.area = ''
-          this.fetchArea2()
-        }
-      }
-    },
-    created () {
-      this.fetchWellType()
-      this.fetchArea0()
-      this.imageList = []
-      this.fileList = []
-    },
-    methods: {
-      // 加载组织机构树形下拉菜单
-      fetchSecondDeptTree: function () {
-        const listQuery = {
-          pid: this.wellForm.deptid,
-          deptType: '04'
-        }
-        getDeptTreeList(listQuery).then((response) => {
-          console.log(response.data)
-          if (response.data.list) {
-            this.secondDeptTreeList = toTreeList(
-              response.data.list,
-              this.wellForm.deptid
-            )
-          }
-        })
-      },
-      // 获取井类型
-      fetchWellType() {
-        getWellType().then((response) => {
-          this.wellTypeList = []
-          const wellTypes = this.$store.getters.wellTypes
-          for (const wellType of response.data) {
-            if (wellTypes.indexOf(wellType.value) !== -1) {
-              this.wellTypeList.push(wellType)
-            }
-          }
-          this.wellForm.wellType='1'
-          if (this.wellTypeList.length <= 1) {
-            this.showWellType = false
-          }
-        })
-      },
-      // 获取一级分区
-      fetchArea0() {
-        getAreaByDept(this.wellForm.deptid).then((response) => {
-          if (response.code === 200) {
-            const pid = response.data.area
-            getAreaList(pid).then((response) => {
-              this.cityList = response.data
-            })
-          }
-        })
-      },
-      // 获取区域1
-      fetchArea1() {
-        getAreaList(this.wellForm.city).then((response) => {
-          this.quList = response.data
-        })
-      },
-      // 获取区域2
-      fetchArea2() {
-        getAreaList(this.wellForm.qu).then((response) => {
-          this.jiedaoList = response.data
-        })
-      },
-      // 取消
-      cancel() {
-        this.dialogFormVisible = false
-        this.fileList = []
-        // 清除验证
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      // 重置表单
-      resetForm() {
-        this.wellForm = {
-          wellCode: '', // 井编号
-          wellName: '', // 井名称
-          wellType: '', // 井类型
-          deptid: '', // 权属单位
-          deep: '', // 井深，
-          position: '', // 位置描述
-          coordinateX: '', // 经度
-          coordinateY: '', // 纬度
-          photos: '', // 照片路径
-          notes: '', // 备注,
-          qu: '',
-          area: '', // 街道
-          responsibleDept: '' // 维护人员部门
-        }
-        // 清空上传图片
-        this.$refs.upload.clearFiles()
-        this.fileList = []
-        this.imageList = []
-        this.hideUpload = this.fileList.length >= 4
-        // 清除验证
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      // 保存数据
-      saveData: function () {
-        this.wellForm.photos = ''
-        const count = this.fileList.length < 4 ? this.fileList.length : 4
-        for (let i = 0; i < count; i++) {
-          const image = this.fileList[i]
-          this.wellForm.photos += image.url + ';'
-        }
-        // 如果责任部门不选，则用权属作为责任部门
-        if (this.wellForm.responsibleDept === '') {
-          if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
-            this.$message.warning('必须选择维护机构')
-            return
-          } else {
-            this.wellForm.responsibleDept = this.wellForm.deptid
-          }
-        }
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            addWell(this.wellForm).then((response) => {
-              console.log('新增井')
-              if (response.code === 200) {
-                this.$message.success('新增成功!')
-                this.resetForm()
-              }
-            })
-          }
-        })
-      },
-      // 图片上传
-      uploadFile(file) {
-        console.log('uploadFile:' + file.file.name)
-        // const base_url = process.env.BASE_API + '/static/'
-        Uploadimg(file).then((res) => {
-          if (res.code === 200) {
-            this.fileList.push({name: file.file.name, url: res.data})
-          }
-        })
-      },
-      // 上传前判断文件格式及大小
-      handleBeforeUpload(file) {
-        const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
-        let res = true
-        const isLt2M = file.size / 1024 / 1024 < 5
-        if (!isJPG) {
-          this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
-          res = false
-        }
-        if (!isLt2M) {
-          this.$message.error('上传图片大小不能超过 5MB!')
-          res = false
-        }
-        for (const i in this.fileList) {
-          if (this.fileList[i].name === file.name) {
-            this.$message.error('该图片已上传过，请选择其他图片')
-            res = false
-          }
-        }
-        return res
-      },
-      // 文件列表移除文件时的钩子
-      handleRemove(file, fileList) {
-        console.log('handleRemove')
-        for (const i in this.fileList) {
-          if (this.fileList[i].name === file.name) {
-            this.fileList.splice(i, 1)
-            this.hideUpload = this.fileList.length >= 4
-            return
-          }
-        }
-        this.handleChange()
-      },
-      // 限制提示
-      handleExceed(files, fileList) {
-        console.log('handleExceed')
-        this.$message.warning(
-          `限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${
-          files.length + fileList.length
-            } 张图片`
-        )
-      },
-      // 点击文件列表中已上传的文件时的钩子
-      handlePictureCardPreview(file) {
-        console.log('handlePictureCardPreview')
-        this.dialogImageUrl = file.url
-        this.dialogVisible = true
-      },
-      handleChange(file, fileList) {
-        console.log('handleChange')
-        if (fileList) {
-          this.hideUpload = fileList.length >= 4
         } else {
-          this.hideUpload = false
+          return true
         }
-      },
-      handleSuccess(response, file, fileList) {
-        console.log('handleSuccess')
-        const base_url = process.env.BASE_API + '/static/'
+      }
+    },
+    showArea() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        return false
+      }
+    },
+    firstDept() {
+      // 获取权属单位
+      return this.wellForm.deptid
+    },
+    qu() {
+      // 获取区
+      return this.wellForm.qu
+    }
+  },
+  watch: {
+    firstDept(val) {
+      // 监控权属单位变化
+      if (val !== '') {
+        this.wellForm.qu = ''
+        this.wellForm.area = ''
+        this.wellForm.responsibleDept = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea0()
+      }
+    },
+    'wellForm.city'(val) {
+      // 监控市变化
+      if (val !== '') {
+        this.wellForm.qu = ''
+        this.wellForm.area = ''
+        this.fetchArea1()
+      }
+    },
+    'wellForm.qu'(val) {
+      // 监控区变化
+      if (val !== '') {
+        this.wellForm.area = ''
+        this.fetchArea2()
+      }
+    }
+  },
+  created() {
+    this.fetchWellType()
+    this.fetchArea0()
+    this.imageList = []
+    this.fileList = []
+  },
+  methods: {
+    // 加载组织机构树形下拉菜单
+    fetchSecondDeptTree: function() {
+      const listQuery = {
+        pid: this.wellForm.deptid,
+        deptType: '04'
+      }
+      getDeptTreeList(listQuery).then((response) => {
+        console.log(response.data)
+        if (response.data.list) {
+          this.secondDeptTreeList = toTreeList(
+            response.data.list,
+            this.wellForm.deptid
+          )
+        }
+      })
+    },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then((response) => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+        this.wellForm.wellType = '1'
+        if (this.wellTypeList.length <= 1) {
+          this.showWellType = false
+        }
+      })
+    },
+    // 获取一级分区
+    fetchArea0() {
+      getAreaByDept(this.wellForm.deptid).then((response) => {
         if (response.code === 200) {
-          this.fileList.push({
-            name: file.file.name,
-            url: base_url + response.data
+          const pid = response.data.area
+          getAreaList(pid).then((response) => {
+            this.cityList = response.data
           })
-          this.handleChange()
-        } else {
-          this.$message.warning(response.message)
         }
+      })
+    },
+    // 获取区域1
+    fetchArea1() {
+      getAreaList(this.wellForm.city).then((response) => {
+        this.quList = response.data
+      })
+    },
+    // 获取区域2
+    fetchArea2() {
+      getAreaList(this.wellForm.qu).then((response) => {
+        this.jiedaoList = response.data
+      })
+    },
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.fileList = []
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.wellForm = {
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '' // 维护人员部门
+      }
+      // 清空上传图片
+      this.$refs.upload.clearFiles()
+      this.fileList = []
+      this.imageList = []
+      this.hideUpload = this.fileList.length >= 4
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      this.wellForm.photos = ''
+      const count = this.fileList.length < 4 ? this.fileList.length : 4
+      for (let i = 0; i < count; i++) {
+        const image = this.fileList[i]
+        this.wellForm.photos += image.url + ';'
+      }
+      // 如果责任部门不选，则用权属作为责任部门
+      if (this.wellForm.responsibleDept === '') {
+        if (this.secondDeptTreeList && this.secondDeptTreeList.length > 0) {
+          this.$message.warning('必须选择维护机构')
+          return
+        } else {
+          this.wellForm.responsibleDept = this.wellForm.deptid
+        }
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          addWell(this.wellForm).then((response) => {
+            console.log('新增井')
+            if (response.code === 200) {
+              this.$message.success('新增成功!')
+              this.resetForm()
+            }
+          })
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+      Uploadimg(file).then((res) => {
+        if (res.code === 200) {
+          this.fileList.push({ name: file.file.name, url: res.data })
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = file.type === 'image/jpeg' || file.type === 'image/png'
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.fileList.splice(i, 1)
+          this.hideUpload = this.fileList.length >= 4
+          return
+        }
+      }
+      this.handleChange()
+    },
+    // 限制提示
+    handleExceed(files, fileList) {
+      console.log('handleExceed')
+      this.$message.warning(
+        `限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${
+          files.length + fileList.length
+        } 张图片`
+      )
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      console.log('handlePictureCardPreview')
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      console.log('handleChange')
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
+    },
+    handleSuccess(response, file, fileList) {
+      console.log('handleSuccess')
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.fileList.push({
+          name: file.file.name,
+          url: base_url + response.data
+        })
+        this.handleChange()
+      } else {
+        this.$message.warning(response.message)
       }
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 6c22232..f841993 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -17,7 +17,7 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="井类型" prop="wellType">
-              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled/>
+              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="给水井" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
@@ -51,67 +51,67 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <div v-if="imageList.length==0">
-                无
-              </div>
-              <!--<el-image-->
-              <!--v-for="image in imageList"-->
-              <!--:src="image"-->
-              <!--:preview-src-list="imageList"-->
-              <!--:z-index="4000"-->
-              <!--style="width: 100px; height: 100px; margin-right:10px"/>-->
-              <el-upload
-                v-else
-                ref="upload"
-                :file-list="imageList"
-                :on-preview="handlePictureCardPreview"
-                class="hide"
-                multiple
-                accept=".jpg,.jpeg,.png "
-                action="string"
-                list-type="picture-card"
-                disabled
-              >
-                <i class="el-icon-plus"/>
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                <!--<img width="100%" :src="dialogImageUrl">-->
-                <div class="imgBox">
-                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
+          <!--          <el-col :span="24">-->
+          <!--            <el-form-item label="路标图片" prop="images">-->
+          <!--              <div v-if="imageList.length==0">-->
+          <!--                无-->
+          <!--              </div>-->
+          <!--              &lt;!&ndash;<el-image&ndash;&gt;-->
+          <!--              &lt;!&ndash;v-for="image in imageList"&ndash;&gt;-->
+          <!--              &lt;!&ndash;:src="image"&ndash;&gt;-->
+          <!--              &lt;!&ndash;:preview-src-list="imageList"&ndash;&gt;-->
+          <!--              &lt;!&ndash;:z-index="4000"&ndash;&gt;-->
+          <!--              &lt;!&ndash;style="width: 100px; height: 100px; margin-right:10px"/>&ndash;&gt;-->
+          <!--              <el-upload-->
+          <!--                v-else-->
+          <!--                ref="upload"-->
+          <!--                :file-list="imageList"-->
+          <!--                :on-preview="handlePictureCardPreview"-->
+          <!--                class="hide"-->
+          <!--                multiple-->
+          <!--                accept=".jpg,.jpeg,.png "-->
+          <!--                action="string"-->
+          <!--                list-type="picture-card"-->
+          <!--                disabled-->
+          <!--              >-->
+          <!--                <i class="el-icon-plus"/>-->
+          <!--              </el-upload>-->
+          <!--              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>-->
+          <!--                &lt;!&ndash;<img width="100%" :src="dialogImageUrl">&ndash;&gt;-->
+          <!--                <div class="imgBox">-->
+          <!--                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">-->
+          <!--                </div>-->
+          <!--              </el-dialog>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
         </el-row>
         <!--<el-row :gutter="1">-->
-          <!--<el-form-item label="所在区域" required>-->
-            <!--<el-col :span="5">-->
-              <!--<el-form-item prop="qu">-->
-                <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
-                  <!--<el-option-->
-                    <!--v-for="item in quList"-->
-                    <!--:key="item.id"-->
-                    <!--:label="item.name"-->
-                    <!--:value="item.id"/>-->
-                <!--</el-select>-->
-              <!--</el-form-item>-->
-            <!--</el-col>-->
-            <!--<el-col :span="1" class="line">区/县</el-col>-->
-            <!--<el-col :span="5">-->
-              <!--<el-form-item prop="area">-->
-                <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
-                  <!--<el-option-->
-                    <!--v-for="item in jiedaoList"-->
-                    <!--:key="item.id"-->
-                    <!--:label="item.name"-->
-                    <!--:value="item.id"/>-->
-                <!--</el-select>-->
-              <!--</el-form-item>-->
-            <!--</el-col>-->
-            <!--<el-col :span="1" class="line">街道/镇</el-col>-->
-          <!--</el-form-item>-->
+        <!--<el-form-item label="所在区域" required>-->
+        <!--<el-col :span="5">-->
+        <!--<el-form-item prop="qu">-->
+        <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
+        <!--<el-option-->
+        <!--v-for="item in quList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.name"-->
+        <!--:value="item.id"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--<el-col :span="1" class="line">区/县</el-col>-->
+        <!--<el-col :span="5">-->
+        <!--<el-form-item prop="area">-->
+        <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
+        <!--<el-option-->
+        <!--v-for="item in jiedaoList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.name"-->
+        <!--:value="item.id"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--<el-col :span="1" class="line">街道/镇</el-col>-->
+        <!--</el-form-item>-->
         <!--</el-row>-->
         <el-row>
           <el-col :span="15">
@@ -120,13 +120,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="井维护单位" prop="responsibleDept">
-              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <!--        <el-row :gutter="20">-->
+        <!--          <el-col :span="10">-->
+        <!--            <el-form-item label="井维护单位" prop="responsibleDept">-->
+        <!--              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
       </el-form>
       <div class="watch-div">
         <el-row class="table-title">
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index a259516..f46ac28 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -96,44 +96,44 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <el-upload
-                ref="upload"
-                :before-upload="handleBeforeUpload"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                :on-exceed="handleExceed"
-                :on-change="handleChange"
-                :http-request="uploadFile"
-                :file-list="imageList"
-                :limit="4"
-                :class="{ hide: hideUpload }"
-                multiple
-                action="string"
-                accept=".jpg,.jpeg,.png "
-                list-type="picture-card"
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
-              <el-dialog
-                :visible.sync="dialogVisible"
-                title="图片预览"
-                append-to-body
-              >
-                <div class="imgBox">
-                  <img
-                    :src="dialogImageUrl"
-                    max-height="400px;"
-                    alt=""
-                    style="margin: 0 auto"
-                  >
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <!--        <el-row>-->
+        <!--          <el-col :span="24">-->
+        <!--            <el-form-item label="路标图片" prop="images">-->
+        <!--              <el-upload-->
+        <!--                ref="upload"-->
+        <!--                :before-upload="handleBeforeUpload"-->
+        <!--                :on-preview="handlePictureCardPreview"-->
+        <!--                :on-remove="handleRemove"-->
+        <!--                :on-exceed="handleExceed"-->
+        <!--                :on-change="handleChange"-->
+        <!--                :http-request="uploadFile"-->
+        <!--                :file-list="imageList"-->
+        <!--                :limit="4"-->
+        <!--                :class="{ hide: hideUpload }"-->
+        <!--                multiple-->
+        <!--                action="string"-->
+        <!--                accept=".jpg,.jpeg,.png "-->
+        <!--                list-type="picture-card"-->
+        <!--              >-->
+        <!--                <i class="el-icon-plus" />-->
+        <!--              </el-upload>-->
+        <!--              <el-dialog-->
+        <!--                :visible.sync="dialogVisible"-->
+        <!--                title="图片预览"-->
+        <!--                append-to-body-->
+        <!--              >-->
+        <!--                <div class="imgBox">-->
+        <!--                  <img-->
+        <!--                    :src="dialogImageUrl"-->
+        <!--                    max-height="400px;"-->
+        <!--                    alt=""-->
+        <!--                    style="margin: 0 auto"-->
+        <!--                  >-->
+        <!--                </div>-->
+        <!--              </el-dialog>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
         <!-- <el-row :gutter="1">
           <el-form-item label="所在区域" required>
             <el-col :span="5">
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index eab3498..6d6f716 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -15,7 +15,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="井类型" prop="wellType">
-              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled/>
+              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="给水井" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -30,35 +30,35 @@
               <el-input v-model="wellForm.deep" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
-          <el-col :span="7">
-            <el-form-item label="布防状态" prop="coordinateX">
-              <el-input v-model="wellForm.bfztName" type="text" placeholder="未知" disabled/>
-            </el-form-item>
-          </el-col>
+          <!--          <el-col :span="7">-->
+          <!--            <el-form-item label="布防状态" prop="coordinateX">-->
+          <!--              <el-input v-model="wellForm.bfztName" type="text" placeholder="未知" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
         </el-row>
         <!--<el-row :gutter="1">-->
-          <!--<el-form-item label="所在区域" required>-->
-            <!--<el-col :span="4">-->
-              <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
-                <!--<el-option-->
-                  <!--v-for="item in quList"-->
-                  <!--:key="item.id"-->
-                  <!--:label="item.name"-->
-                  <!--:value="item.id"/>-->
-              <!--</el-select>-->
-            <!--</el-col>-->
-            <!--<el-col :span="1" class="line">区/县</el-col>-->
-            <!--<el-col :span="5">-->
-              <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
-                <!--<el-option-->
-                  <!--v-for="item in jiedaoList"-->
-                  <!--:key="item.id"-->
-                  <!--:label="item.name"-->
-                  <!--:value="item.id"/>-->
-              <!--</el-select>-->
-            <!--</el-col>-->
-            <!--<el-col :span="1" class="line">街道/镇</el-col>-->
-          <!--</el-form-item>-->
+        <!--<el-form-item label="所在区域" required>-->
+        <!--<el-col :span="4">-->
+        <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
+        <!--<el-option-->
+        <!--v-for="item in quList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.name"-->
+        <!--:value="item.id"/>-->
+        <!--</el-select>-->
+        <!--</el-col>-->
+        <!--<el-col :span="1" class="line">区/县</el-col>-->
+        <!--<el-col :span="5">-->
+        <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
+        <!--<el-option-->
+        <!--v-for="item in jiedaoList"-->
+        <!--:key="item.id"-->
+        <!--:label="item.name"-->
+        <!--:value="item.id"/>-->
+        <!--</el-select>-->
+        <!--</el-col>-->
+        <!--<el-col :span="1" class="line">街道/镇</el-col>-->
+        <!--</el-form-item>-->
 
         <!--</el-row>-->
         <el-row>
@@ -84,7 +84,7 @@
 import { AMapManager } from 'vue-amap'
 
 export default {
-  name: 'DetailWell',
+  name: 'InfoWell',
   data() {
     return {
       dialogFormVisible: false, // 对话框是否显示