diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 83a4c59..01ad4db 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -20,14 +20,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -42,19 +34,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -76,6 +63,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -163,7 +153,6 @@
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       listLoading: true // 加载动画
     }
@@ -172,6 +161,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -199,46 +192,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceModel(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 83a4c59..01ad4db 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -20,14 +20,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -42,19 +34,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -76,6 +63,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -163,7 +153,6 @@
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       listLoading: true // 加载动画
     }
@@ -172,6 +161,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -199,46 +192,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceModel(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 5838d52..05bd847 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -35,14 +35,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -57,19 +49,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -87,6 +74,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -176,6 +166,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -206,46 +200,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceType(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceType(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 83a4c59..01ad4db 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -20,14 +20,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -42,19 +34,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -76,6 +63,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -163,7 +153,6 @@
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       listLoading: true // 加载动画
     }
@@ -172,6 +161,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -199,46 +192,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceModel(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 5838d52..05bd847 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -35,14 +35,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -57,19 +49,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -87,6 +74,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -176,6 +166,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -206,46 +200,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceType(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceType(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index aa511b8..e043a58 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -1,12 +1,18 @@
 <template>
-  <div id="map3dContainer" />
+  <div id="map3dContainer" :style="{height:(bodyHeight-50)+'px'}" />
 </template>
 
 <script>
 import * as mars3d from 'mars3d'
+import { mapGetters } from 'vuex'
 import { getMapLayers } from '@/utils/maputils'
 export default {
   name: 'Overview3d',
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
   mounted() {
     this.initMap()
   },

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 83a4c59..01ad4db 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -20,14 +20,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -42,19 +34,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -76,6 +63,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -163,7 +153,6 @@
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       listLoading: true // 加载动画
     }
@@ -172,6 +161,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -199,46 +192,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceModel(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 5838d52..05bd847 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -35,14 +35,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -57,19 +49,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -87,6 +74,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -176,6 +166,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -206,46 +200,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceType(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceType(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index aa511b8..e043a58 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -1,12 +1,18 @@
 <template>
-  <div id="map3dContainer" />
+  <div id="map3dContainer" :style="{height:(bodyHeight-50)+'px'}" />
 </template>
 
 <script>
 import * as mars3d from 'mars3d'
+import { mapGetters } from 'vuex'
 import { getMapLayers } from '@/utils/maputils'
 export default {
   name: 'Overview3d',
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
   mounted() {
     this.initMap()
   },
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index aacab93..d30d97f 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -3,7 +3,7 @@
   <div>
     <div class="overview-map-container">
       <!--地图-->
-      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-70)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
+      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-50)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
         <!--报警点位-->
         <a-map-marker v-for="alarmWell of alarmWells" :visible="showAlarm && alarmWell.visible" :position="alarmWell.coordinates" :offset="alarmOffset">
           <el-image :src="alarmIcon" :style="{'width':alarmIconSize[0]+'px','height':alarmIconSize[1]+'px'}" fit="fill" @click="openAlarmWindow(alarmWell.wellId, alarmWell.coordinates)" />

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 83a4c59..01ad4db 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -20,14 +20,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -42,19 +34,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -76,6 +63,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -163,7 +153,6 @@
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       listLoading: true // 加载动画
     }
@@ -172,6 +161,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -199,46 +192,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceModel(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 5838d52..05bd847 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -35,14 +35,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -57,19 +49,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -87,6 +74,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -176,6 +166,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -206,46 +200,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceType(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceType(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index aa511b8..e043a58 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -1,12 +1,18 @@
 <template>
-  <div id="map3dContainer" />
+  <div id="map3dContainer" :style="{height:(bodyHeight-50)+'px'}" />
 </template>
 
 <script>
 import * as mars3d from 'mars3d'
+import { mapGetters } from 'vuex'
 import { getMapLayers } from '@/utils/maputils'
 export default {
   name: 'Overview3d',
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
   mounted() {
     this.initMap()
   },
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index aacab93..d30d97f 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -3,7 +3,7 @@
   <div>
     <div class="overview-map-container">
       <!--地图-->
-      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-70)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
+      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-50)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
         <!--报警点位-->
         <a-map-marker v-for="alarmWell of alarmWells" :visible="showAlarm && alarmWell.visible" :position="alarmWell.coordinates" :offset="alarmOffset">
           <el-image :src="alarmIcon" :style="{'width':alarmIconSize[0]+'px','height':alarmIconSize[1]+'px'}" fit="fill" @click="openAlarmWindow(alarmWell.wellId, alarmWell.coordinates)" />
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index a3c4758..0b10922 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -8,7 +8,7 @@
             <div slot="header" class="clearfix">
               <span>组织机构</span>
             </div>
-            <el-scrollbar ref="deptScroll" :style="{'height':(bodyHeight-116)+'px'}" class="user-dept-scroll">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
               <el-tree
                 ref="tree2"
                 v-loading="treeLoading"
@@ -374,10 +374,7 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 265px);
-        .filter-tree{
-
-        }
+        height: calc(100vh - 260px);
       }
     }
   }

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 83a4c59..01ad4db 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -20,14 +20,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -42,19 +34,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -76,6 +63,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -163,7 +153,6 @@
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       listLoading: true // 加载动画
     }
@@ -172,6 +161,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -199,46 +192,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceModel(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 5838d52..05bd847 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -35,14 +35,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -57,19 +49,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -87,6 +74,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -176,6 +166,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -206,46 +200,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceType(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceType(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index aa511b8..e043a58 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -1,12 +1,18 @@
 <template>
-  <div id="map3dContainer" />
+  <div id="map3dContainer" :style="{height:(bodyHeight-50)+'px'}" />
 </template>
 
 <script>
 import * as mars3d from 'mars3d'
+import { mapGetters } from 'vuex'
 import { getMapLayers } from '@/utils/maputils'
 export default {
   name: 'Overview3d',
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
   mounted() {
     this.initMap()
   },
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index aacab93..d30d97f 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -3,7 +3,7 @@
   <div>
     <div class="overview-map-container">
       <!--地图-->
-      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-70)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
+      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-50)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
         <!--报警点位-->
         <a-map-marker v-for="alarmWell of alarmWells" :visible="showAlarm && alarmWell.visible" :position="alarmWell.coordinates" :offset="alarmOffset">
           <el-image :src="alarmIcon" :style="{'width':alarmIconSize[0]+'px','height':alarmIconSize[1]+'px'}" fit="fill" @click="openAlarmWindow(alarmWell.wellId, alarmWell.coordinates)" />
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index a3c4758..0b10922 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -8,7 +8,7 @@
             <div slot="header" class="clearfix">
               <span>组织机构</span>
             </div>
-            <el-scrollbar ref="deptScroll" :style="{'height':(bodyHeight-116)+'px'}" class="user-dept-scroll">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
               <el-tree
                 ref="tree2"
                 v-loading="treeLoading"
@@ -374,10 +374,7 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 265px);
-        .filter-tree{
-
-        }
+        height: calc(100vh - 260px);
       }
     }
   }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index dfafd2e..8303dc4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -20,7 +20,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -37,7 +37,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -54,7 +54,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -68,7 +68,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -91,7 +91,7 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="saveData">
+      <el-button size="small" @click="up">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
@@ -109,6 +109,7 @@
   name: 'AlarmPushCondig',
   data() {
     return {
+      dialogStatus: true,
       // 表单内容
       deviceForm: {
         devcode: '',
@@ -124,6 +125,7 @@
     }
   },
   methods: {
+    saveData() {}
   }
 }
 </script>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 83a4c59..01ad4db 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -20,14 +20,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -42,19 +34,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -76,6 +63,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -163,7 +153,6 @@
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       listLoading: true // 加载动画
     }
@@ -172,6 +161,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -199,46 +192,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceModel(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 5838d52..05bd847 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -35,14 +35,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -57,19 +49,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -87,6 +74,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -176,6 +166,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -206,46 +200,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceType(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceType(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index aa511b8..e043a58 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -1,12 +1,18 @@
 <template>
-  <div id="map3dContainer" />
+  <div id="map3dContainer" :style="{height:(bodyHeight-50)+'px'}" />
 </template>
 
 <script>
 import * as mars3d from 'mars3d'
+import { mapGetters } from 'vuex'
 import { getMapLayers } from '@/utils/maputils'
 export default {
   name: 'Overview3d',
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
   mounted() {
     this.initMap()
   },
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index aacab93..d30d97f 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -3,7 +3,7 @@
   <div>
     <div class="overview-map-container">
       <!--地图-->
-      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-70)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
+      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-50)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
         <!--报警点位-->
         <a-map-marker v-for="alarmWell of alarmWells" :visible="showAlarm && alarmWell.visible" :position="alarmWell.coordinates" :offset="alarmOffset">
           <el-image :src="alarmIcon" :style="{'width':alarmIconSize[0]+'px','height':alarmIconSize[1]+'px'}" fit="fill" @click="openAlarmWindow(alarmWell.wellId, alarmWell.coordinates)" />
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index a3c4758..0b10922 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -8,7 +8,7 @@
             <div slot="header" class="clearfix">
               <span>组织机构</span>
             </div>
-            <el-scrollbar ref="deptScroll" :style="{'height':(bodyHeight-116)+'px'}" class="user-dept-scroll">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
               <el-tree
                 ref="tree2"
                 v-loading="treeLoading"
@@ -374,10 +374,7 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 265px);
-        .filter-tree{
-
-        }
+        height: calc(100vh - 260px);
       }
     }
   }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index dfafd2e..8303dc4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -20,7 +20,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -37,7 +37,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -54,7 +54,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -68,7 +68,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -91,7 +91,7 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="saveData">
+      <el-button size="small" @click="up">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
@@ -109,6 +109,7 @@
   name: 'AlarmPushCondig',
   data() {
     return {
+      dialogStatus: true,
       // 表单内容
       deviceForm: {
         devcode: '',
@@ -124,6 +125,7 @@
     }
   },
   methods: {
+    saveData() {}
   }
 }
 </script>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index f8e5ca4..7ce996e 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -5,25 +5,38 @@
       <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1" @click="alarmPushCon">
-                <i class="el-icon-share" />报警推送配置
-              </div>
-              <div tabIndex="2" @click="alarmLevenCon">
-                <i class="el-icon-upload" />报警等级配置
-              </div>
-              <div tabIndex="3" @click="alarmContentCon">
-                <i class="el-icon-copy-document" />报警内容配置
-              </div>
+            <el-scrollbar class="user-dept-scroll">
+              <el-menu
+                default-active="1"
+                class="el-menu-vertical-demo"
+                @select="selectMenu"
+              >
+                <el-menu-item index="1">
+                  <i class="el-icon-share" />
+                  <span slot="title">报警推送配置</span>
+                </el-menu-item>
+                <el-menu-item index="2">
+                  <i class="el-icon-upload" />
+                  <span slot="title">报警等级配置</span>
+                </el-menu-item>
+                <el-menu-item index="3">
+                  <i class="el-icon-copy-document" />
+                  <span slot="title">报警内容配置</span>
+                </el-menu-item>
+              </el-menu>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
       <el-col :span="20">
-        <alarm-push-condig v-if="alarmPushConShow" />
-        <alarm-leven-config v-if="alarmLevenConShow" />
-        <alarm-content-config v-if="alarmContentConShow" />
+        <el-card>
+          <el-scrollbar class="user-dept-scroll-content">
+            <alarm-push-condig v-if="alarmPushConShow" />
+            <alarm-leven-config v-if="alarmLevenConShow" />
+            <alarm-content-config v-if="alarmContentConShow" />
+          </el-scrollbar>
+        </el-card>
       </el-col>
     </el-row>
   </app-container>
@@ -47,20 +60,21 @@
   mounted() {
   },
   methods: {
-    alarmPushCon() {
-      this.alarmPushConShow = true
-      this.alarmLevenConShow = false
-      this.alarmContentConShow = false
-    },
-    alarmLevenCon() {
-      this.alarmPushConShow = false
-      this.alarmLevenConShow = true
-      this.alarmContentConShow = false
-    },
-    alarmContentCon() {
-      this.alarmPushConShow = false
-      this.alarmLevenConShow = false
-      this.alarmContentConShow = true
+    selectMenu(val) {
+      console.log(val)
+      if (val === '1') {
+        this.alarmPushConShow = true
+        this.alarmLevenConShow = false
+        this.alarmContentConShow = false
+      } else if (val === '2') {
+        this.alarmPushConShow = false
+        this.alarmLevenConShow = true
+        this.alarmContentConShow = false
+      } else if (val === '3') {
+        this.alarmPushConShow = false
+        this.alarmLevenConShow = false
+        this.alarmContentConShow = true
+      }
     }
   }
 }
@@ -73,7 +87,7 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 200px);
+        height: calc(100vh - 640px);
         div{
           text-align: center;
           margin: 20px 0;
@@ -86,16 +100,8 @@
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
-  }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
-  }
-  .headerTeam{
-    font-size: 20px;
+  .user-dept-scroll-content{
+    height: calc(100vh - 200px);
   }
 </style>
 <style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 83a4c59..01ad4db 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -20,14 +20,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -42,19 +34,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -76,6 +63,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -163,7 +153,6 @@
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       listLoading: true // 加载动画
     }
@@ -172,6 +161,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -199,46 +192,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceModel(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 5838d52..05bd847 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -35,14 +35,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -57,19 +49,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -87,6 +74,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -176,6 +166,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -206,46 +200,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceType(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceType(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index aa511b8..e043a58 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -1,12 +1,18 @@
 <template>
-  <div id="map3dContainer" />
+  <div id="map3dContainer" :style="{height:(bodyHeight-50)+'px'}" />
 </template>
 
 <script>
 import * as mars3d from 'mars3d'
+import { mapGetters } from 'vuex'
 import { getMapLayers } from '@/utils/maputils'
 export default {
   name: 'Overview3d',
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
   mounted() {
     this.initMap()
   },
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index aacab93..d30d97f 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -3,7 +3,7 @@
   <div>
     <div class="overview-map-container">
       <!--地图-->
-      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-70)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
+      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-50)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
         <!--报警点位-->
         <a-map-marker v-for="alarmWell of alarmWells" :visible="showAlarm && alarmWell.visible" :position="alarmWell.coordinates" :offset="alarmOffset">
           <el-image :src="alarmIcon" :style="{'width':alarmIconSize[0]+'px','height':alarmIconSize[1]+'px'}" fit="fill" @click="openAlarmWindow(alarmWell.wellId, alarmWell.coordinates)" />
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index a3c4758..0b10922 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -8,7 +8,7 @@
             <div slot="header" class="clearfix">
               <span>组织机构</span>
             </div>
-            <el-scrollbar ref="deptScroll" :style="{'height':(bodyHeight-116)+'px'}" class="user-dept-scroll">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
               <el-tree
                 ref="tree2"
                 v-loading="treeLoading"
@@ -374,10 +374,7 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 265px);
-        .filter-tree{
-
-        }
+        height: calc(100vh - 260px);
       }
     }
   }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index dfafd2e..8303dc4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -20,7 +20,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -37,7 +37,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -54,7 +54,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -68,7 +68,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -91,7 +91,7 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="saveData">
+      <el-button size="small" @click="up">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
@@ -109,6 +109,7 @@
   name: 'AlarmPushCondig',
   data() {
     return {
+      dialogStatus: true,
       // 表单内容
       deviceForm: {
         devcode: '',
@@ -124,6 +125,7 @@
     }
   },
   methods: {
+    saveData() {}
   }
 }
 </script>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index f8e5ca4..7ce996e 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -5,25 +5,38 @@
       <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1" @click="alarmPushCon">
-                <i class="el-icon-share" />报警推送配置
-              </div>
-              <div tabIndex="2" @click="alarmLevenCon">
-                <i class="el-icon-upload" />报警等级配置
-              </div>
-              <div tabIndex="3" @click="alarmContentCon">
-                <i class="el-icon-copy-document" />报警内容配置
-              </div>
+            <el-scrollbar class="user-dept-scroll">
+              <el-menu
+                default-active="1"
+                class="el-menu-vertical-demo"
+                @select="selectMenu"
+              >
+                <el-menu-item index="1">
+                  <i class="el-icon-share" />
+                  <span slot="title">报警推送配置</span>
+                </el-menu-item>
+                <el-menu-item index="2">
+                  <i class="el-icon-upload" />
+                  <span slot="title">报警等级配置</span>
+                </el-menu-item>
+                <el-menu-item index="3">
+                  <i class="el-icon-copy-document" />
+                  <span slot="title">报警内容配置</span>
+                </el-menu-item>
+              </el-menu>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
       <el-col :span="20">
-        <alarm-push-condig v-if="alarmPushConShow" />
-        <alarm-leven-config v-if="alarmLevenConShow" />
-        <alarm-content-config v-if="alarmContentConShow" />
+        <el-card>
+          <el-scrollbar class="user-dept-scroll-content">
+            <alarm-push-condig v-if="alarmPushConShow" />
+            <alarm-leven-config v-if="alarmLevenConShow" />
+            <alarm-content-config v-if="alarmContentConShow" />
+          </el-scrollbar>
+        </el-card>
       </el-col>
     </el-row>
   </app-container>
@@ -47,20 +60,21 @@
   mounted() {
   },
   methods: {
-    alarmPushCon() {
-      this.alarmPushConShow = true
-      this.alarmLevenConShow = false
-      this.alarmContentConShow = false
-    },
-    alarmLevenCon() {
-      this.alarmPushConShow = false
-      this.alarmLevenConShow = true
-      this.alarmContentConShow = false
-    },
-    alarmContentCon() {
-      this.alarmPushConShow = false
-      this.alarmLevenConShow = false
-      this.alarmContentConShow = true
+    selectMenu(val) {
+      console.log(val)
+      if (val === '1') {
+        this.alarmPushConShow = true
+        this.alarmLevenConShow = false
+        this.alarmContentConShow = false
+      } else if (val === '2') {
+        this.alarmPushConShow = false
+        this.alarmLevenConShow = true
+        this.alarmContentConShow = false
+      } else if (val === '3') {
+        this.alarmPushConShow = false
+        this.alarmLevenConShow = false
+        this.alarmContentConShow = true
+      }
     }
   }
 }
@@ -73,7 +87,7 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 200px);
+        height: calc(100vh - 640px);
         div{
           text-align: center;
           margin: 20px 0;
@@ -86,16 +100,8 @@
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
-  }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
-  }
-  .headerTeam{
-    font-size: 20px;
+  .user-dept-scroll-content{
+    height: calc(100vh - 200px);
   }
 </style>
 <style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index b17f043..021f45f 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -24,12 +24,38 @@
       </el-col>
       <!--右半部分-->
       <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
+        <!--筛选条件-->
+        <search-area size="small" @search="search">
+          <search-item>
+            <el-input
+              v-model="listQuery.tenantName"
+              size="small"
+              clearable
+              placeholder="请输入项目名称"
+            />
+          </search-item>
+        </search-area>
+        <el-row class="table-title">
+          <el-col :span="6">
+            <div class="title-header">
+              <i class="el-icon-menu" />{{ headerValue }}
+            </div>
+          </el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button
+              class="edit_btn"
+              size="small"
+              @click="add"
+            >
+              新增
+            </el-button>
+          </el-col>
+        </el-row>
         <el-table :data="list">
           <el-table-column label="通讯协议" align="center" />
           <el-table-column label="默认坐标系" align="center" />
+          <el-table-column label="经度" align="center" />
+          <el-table-column label="维度" align="center" />
           <el-table-column label="生成工单" align="center" />
           <el-table-column label="APP推送" align="center" />
           <el-table-column label="NB平台配置" align="center">
@@ -46,6 +72,9 @@
               <el-button type="text" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="text" @click="del(scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -76,6 +105,7 @@
       expandAllNode: true,
       expandNodeClick: false,
       listQuery: {
+        tenantName: '',
         keywords: '',
         beginTime: '',
         endTime: '',
@@ -91,6 +121,7 @@
     this.fetchData()
   },
   methods: {
+    search() {},
     // 获取组织结构树
     fetchDeptTree() {
       this.treeLoading = true
@@ -108,6 +139,10 @@
     // 获取用户数据
     fetchData() {
     },
+    // 新增
+    add() {
+      this.$refs.editTenantConfig.initDialog('create')
+    },
     // 修改
     edit(row) {
       this.$refs.editTenantConfig.initDialog('update', row)
@@ -131,8 +166,31 @@
       }
     }
   }
-  .headerTeam{
-    font-size: 20px;
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>
 <style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 9eb9a36..c2b0b01 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -68,8 +68,7 @@
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
-      // debugger
+    initDialog: function(dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -79,7 +78,7 @@
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
-        this.formData.id = jobId
+        this.formData.id = id
       }
     },
     handleClose(done) {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 39b3ff4..ea04b30 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,16 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        :row-class-name="tableRowClassName"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="showWellDetail(scope.row)">
@@ -68,7 +76,15 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatFun"
+          show-overflow-tooltip
+        >
           <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>
@@ -77,7 +93,7 @@
         </el-table-column>
         <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">
               取消报警
             </el-button>
           </template>
@@ -127,6 +143,7 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      multipleSelection: [], // 多选选中项
       columns: [
         {
           text: '设备编号',
@@ -184,7 +201,6 @@
         //   align: 'center'
         // }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
       deviceTypeList: [], // 集中器类型列表
@@ -251,18 +267,39 @@
     this.fetchData(false)
   },
   methods: {
-    // 取消报警
-    cancelAlarm(jobId) {
-      this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
-    // 取消报警,调用结束工单接口
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 批量消警,调用结束工单接口
     batchCancel() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        const jobId = deviceIds.toString()
+        this.cancelShow = true
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 取消报警
+    cancelAlarm(id) {
       this.cancelShow = true
       // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      this.$refs.handlePrompt.initDialog(true, id, false)
       // }, 100)
     },
     formatValue(cellValue) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e179dcc..7f228d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -111,7 +111,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   &-container {
-    margin: 30px;
+    margin-bottom:30px;
   }
   &-text {
     font-size: 30px;
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 83a4c59..01ad4db 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -20,14 +20,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -42,19 +34,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -76,6 +63,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -163,7 +153,6 @@
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       listLoading: true // 加载动画
     }
@@ -172,6 +161,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -199,46 +192,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceModel(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 5838d52..05bd847 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -35,14 +35,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button
-            class="edit_btn"
-            size="small"
-            @click="del"
-          >
-            删除
-          </el-button>
           <el-button
             class="edit_btn"
             size="small"
@@ -57,19 +49,14 @@
         :data="list"
         class="table"
         border
-        @selection-change="handleSelectionChange"
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-        />
-        <!-- <el-table-column
+          :index="indexMethod"
           align="center"
           type="index"
           label="序号"
           width="55"
-        /> -->
+        />
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -87,6 +74,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
+            <el-button type="text" @click="del(scope.row)">
+              删除
+            </el-button>
             <!-- <el-button type="text" @click="detail(scope.row)">
               详情
             </el-button> -->
@@ -176,6 +166,10 @@
     this.fetchData()
   },
   methods: {
+    // 序号计算
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
     // 改变页容量
     handleSizeChange(val) {
       this.listQuery.limit = val
@@ -206,46 +200,24 @@
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDeviceType(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceType(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      })
     },
     // 详情
     detail(row) {
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index aa511b8..e043a58 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -1,12 +1,18 @@
 <template>
-  <div id="map3dContainer" />
+  <div id="map3dContainer" :style="{height:(bodyHeight-50)+'px'}" />
 </template>
 
 <script>
 import * as mars3d from 'mars3d'
+import { mapGetters } from 'vuex'
 import { getMapLayers } from '@/utils/maputils'
 export default {
   name: 'Overview3d',
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
   mounted() {
     this.initMap()
   },
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index aacab93..d30d97f 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -3,7 +3,7 @@
   <div>
     <div class="overview-map-container">
       <!--地图-->
-      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-70)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
+      <a-map-container ref="map" :center="center" :zoom="zoom" :base-layer="baseLayer" :style="{height:(bodyHeight-50)+'px'}" vid="overview" class="map-demo" @ready="mapReady">
         <!--报警点位-->
         <a-map-marker v-for="alarmWell of alarmWells" :visible="showAlarm && alarmWell.visible" :position="alarmWell.coordinates" :offset="alarmOffset">
           <el-image :src="alarmIcon" :style="{'width':alarmIconSize[0]+'px','height':alarmIconSize[1]+'px'}" fit="fill" @click="openAlarmWindow(alarmWell.wellId, alarmWell.coordinates)" />
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index a3c4758..0b10922 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -8,7 +8,7 @@
             <div slot="header" class="clearfix">
               <span>组织机构</span>
             </div>
-            <el-scrollbar ref="deptScroll" :style="{'height':(bodyHeight-116)+'px'}" class="user-dept-scroll">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
               <el-tree
                 ref="tree2"
                 v-loading="treeLoading"
@@ -374,10 +374,7 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 265px);
-        .filter-tree{
-
-        }
+        height: calc(100vh - 260px);
       }
     }
   }
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
index dfafd2e..8303dc4 100644
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
@@ -20,7 +20,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -37,7 +37,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -54,7 +54,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -68,7 +68,7 @@
               v-model.trim="deviceForm.devcode"
               clearable
               size="small"
-              :disabled="dialogStatus === 'create' ? false : true"
+              :disabled="dialogStatus"
               type="text"
               placeholder="必填"
             />
@@ -91,7 +91,7 @@
       </el-row>
     </el-form>
     <div>
-      <el-button size="small" @click="saveData">
+      <el-button size="small" @click="up">
         修改
       </el-button>
       <el-button size="small" @click="saveData">
@@ -109,6 +109,7 @@
   name: 'AlarmPushCondig',
   data() {
     return {
+      dialogStatus: true,
       // 表单内容
       deviceForm: {
         devcode: '',
@@ -124,6 +125,7 @@
     }
   },
   methods: {
+    saveData() {}
   }
 }
 </script>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index f8e5ca4..7ce996e 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -5,25 +5,38 @@
       <el-col :span="4">
         <div class="dept-div">
           <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <div tabIndex="1" @click="alarmPushCon">
-                <i class="el-icon-share" />报警推送配置
-              </div>
-              <div tabIndex="2" @click="alarmLevenCon">
-                <i class="el-icon-upload" />报警等级配置
-              </div>
-              <div tabIndex="3" @click="alarmContentCon">
-                <i class="el-icon-copy-document" />报警内容配置
-              </div>
+            <el-scrollbar class="user-dept-scroll">
+              <el-menu
+                default-active="1"
+                class="el-menu-vertical-demo"
+                @select="selectMenu"
+              >
+                <el-menu-item index="1">
+                  <i class="el-icon-share" />
+                  <span slot="title">报警推送配置</span>
+                </el-menu-item>
+                <el-menu-item index="2">
+                  <i class="el-icon-upload" />
+                  <span slot="title">报警等级配置</span>
+                </el-menu-item>
+                <el-menu-item index="3">
+                  <i class="el-icon-copy-document" />
+                  <span slot="title">报警内容配置</span>
+                </el-menu-item>
+              </el-menu>
             </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
       <el-col :span="20">
-        <alarm-push-condig v-if="alarmPushConShow" />
-        <alarm-leven-config v-if="alarmLevenConShow" />
-        <alarm-content-config v-if="alarmContentConShow" />
+        <el-card>
+          <el-scrollbar class="user-dept-scroll-content">
+            <alarm-push-condig v-if="alarmPushConShow" />
+            <alarm-leven-config v-if="alarmLevenConShow" />
+            <alarm-content-config v-if="alarmContentConShow" />
+          </el-scrollbar>
+        </el-card>
       </el-col>
     </el-row>
   </app-container>
@@ -47,20 +60,21 @@
   mounted() {
   },
   methods: {
-    alarmPushCon() {
-      this.alarmPushConShow = true
-      this.alarmLevenConShow = false
-      this.alarmContentConShow = false
-    },
-    alarmLevenCon() {
-      this.alarmPushConShow = false
-      this.alarmLevenConShow = true
-      this.alarmContentConShow = false
-    },
-    alarmContentCon() {
-      this.alarmPushConShow = false
-      this.alarmLevenConShow = false
-      this.alarmContentConShow = true
+    selectMenu(val) {
+      console.log(val)
+      if (val === '1') {
+        this.alarmPushConShow = true
+        this.alarmLevenConShow = false
+        this.alarmContentConShow = false
+      } else if (val === '2') {
+        this.alarmPushConShow = false
+        this.alarmLevenConShow = true
+        this.alarmContentConShow = false
+      } else if (val === '3') {
+        this.alarmPushConShow = false
+        this.alarmLevenConShow = false
+        this.alarmContentConShow = true
+      }
     }
   }
 }
@@ -73,7 +87,7 @@
       width:100%;
       .user-dept-scroll{
         width:100%;
-        height: calc(100vh - 200px);
+        height: calc(100vh - 640px);
         div{
           text-align: center;
           margin: 20px 0;
@@ -86,16 +100,8 @@
       }
     }
   }
-  .user-dept-scroll div:focus{
-    color: gray;
-    background: rgb(242, 238, 238);
-  }
-  .user-dept-scroll div:hover{
-    color: gray;
-    background: rgb(242, 238, 238);
-  }
-  .headerTeam{
-    font-size: 20px;
+  .user-dept-scroll-content{
+    height: calc(100vh - 200px);
   }
 </style>
 <style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index b17f043..021f45f 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -24,12 +24,38 @@
       </el-col>
       <!--右半部分-->
       <el-col :span="19">
-        <div class="headerTeam">
-          <span>{{ headerValue }}</span>
-        </div>
+        <!--筛选条件-->
+        <search-area size="small" @search="search">
+          <search-item>
+            <el-input
+              v-model="listQuery.tenantName"
+              size="small"
+              clearable
+              placeholder="请输入项目名称"
+            />
+          </search-item>
+        </search-area>
+        <el-row class="table-title">
+          <el-col :span="6">
+            <div class="title-header">
+              <i class="el-icon-menu" />{{ headerValue }}
+            </div>
+          </el-col>
+          <el-col :span="12" :offset="6" class="edit_btns">
+            <el-button
+              class="edit_btn"
+              size="small"
+              @click="add"
+            >
+              新增
+            </el-button>
+          </el-col>
+        </el-row>
         <el-table :data="list">
           <el-table-column label="通讯协议" align="center" />
           <el-table-column label="默认坐标系" align="center" />
+          <el-table-column label="经度" align="center" />
+          <el-table-column label="维度" align="center" />
           <el-table-column label="生成工单" align="center" />
           <el-table-column label="APP推送" align="center" />
           <el-table-column label="NB平台配置" align="center">
@@ -46,6 +72,9 @@
               <el-button type="text" @click="detail(scope.row)">
                 详情
               </el-button>
+              <el-button type="text" @click="del(scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -76,6 +105,7 @@
       expandAllNode: true,
       expandNodeClick: false,
       listQuery: {
+        tenantName: '',
         keywords: '',
         beginTime: '',
         endTime: '',
@@ -91,6 +121,7 @@
     this.fetchData()
   },
   methods: {
+    search() {},
     // 获取组织结构树
     fetchDeptTree() {
       this.treeLoading = true
@@ -108,6 +139,10 @@
     // 获取用户数据
     fetchData() {
     },
+    // 新增
+    add() {
+      this.$refs.editTenantConfig.initDialog('create')
+    },
     // 修改
     edit(row) {
       this.$refs.editTenantConfig.initDialog('update', row)
@@ -131,8 +166,31 @@
       }
     }
   }
-  .headerTeam{
-    font-size: 20px;
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
 </style>
 <style>
diff --git a/src/views/wellManage/postionCorrectWell.vue b/src/views/wellManage/postionCorrectWell.vue
index fd09fb9..40d9374 100644
--- a/src/views/wellManage/postionCorrectWell.vue
+++ b/src/views/wellManage/postionCorrectWell.vue
@@ -7,7 +7,7 @@
         :center="center"
         :zoom="zoom"
         :base-layer="baseLayer"
-        :style="{height:(bodyHeight-70)+'px'}"
+        :style="{height:(bodyHeight-50)+'px'}"
         vid="overview"
         class="map-demo"
         @ready="mapReady"