diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index afa2d60..676b364 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -46,7 +46,7 @@
           <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" empty-text="--" border @selection-change="handleSelectionChange">
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index afa2d60..676b364 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -46,7 +46,7 @@
           <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" empty-text="--" border @selection-change="handleSelectionChange">
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..56193f1 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -35,7 +35,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/nbdevice/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index afa2d60..676b364 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -46,7 +46,7 @@
           <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" empty-text="--" border @selection-change="handleSelectionChange">
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..56193f1 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -35,7 +35,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/nbdevice/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 2ab51c6..23d3e77 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -20,13 +20,16 @@
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-form-item style="margin-left:10px">
+            <el-checkbox v-model="showAll">显示全部闸井</el-checkbox>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
     <div class="refresh-div">
       <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
     </div>
-    <div class="map-alarm-div">
+    <div v-show="hasAlarm" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
         <span class="icon-right" @click="tableShow=!tableShow">
@@ -54,7 +57,7 @@
         </el-scrollbar>
       </transition>
     </div>
-    <div class="overview-map-container">
+    <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :zoom="zoom" vid="overview" class="map-demo">
         <!--闸井marker-->
@@ -95,6 +98,7 @@
             <div class="info-header">{{ wellInfo.wellCode }}</div>
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>井深：{{ wellInfo.deep }}(m)</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -110,6 +114,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider/>
+              <div>井深：{{ alarmInfo.deep }}(m)</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -132,9 +137,10 @@
   data() {
     return {
       listQuery: {
-        keywords: '',
-        wellType: '',
-        deptid: ''
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
@@ -194,22 +200,43 @@
         position: '',
         wellTypeName: '',
         deptName: '',
-        bfztName: ''
+        bfztName: '',
+        deep: ''
       }, // 显示井详细信息气泡内容
       alarmInfo: {
         wellCode: '',
         deptName: '',
         position: '',
+        deep: '',
         alarms: []
       }, // 显示报警详情气泡内容
       currentWindow: {
         visible: false, // 窗体显示与否
         position: [116.4, 39.9],
-        windowType: 'info' // 窗体类型：详情或报警
-      },
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
       infoWindowClass: 'nomal-info-window',
-      deptShowTop: false,
-      clock: null
+      deptShowTop: false, // 是否显示顶级
+      clock: null, // 计时器
+      hasAlarm: false, // 是否有报警,
+      showAll: false, // 是否显示全部闸井（包含报警和不报警，为false时只显示报警）
+      firstAmount: false, // 是否第一次加载井数据
+      loading: true
+    }
+  },
+  watch: {
+    showAll(val) {
+      if (val) { // 显示全部
+        this.listQuery.isAlarm = '0'
+        if (this.firstAmount === false) { // 如果是第一次，从后台加载全部数据
+          this.getWellList()
+        } else {
+          this.search()
+        }
+      } else { // 仅显示报警
+        this.listQuery.isAlarm = '1'
+        this.search()
+      }
     }
   },
   created() {
@@ -251,23 +278,32 @@
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
+      const isAlarm = this.listQuery.isAlarm
+      let center = []
       // 查询全部井，是否匹配
+      debugger
       for (const marker of this.markers) {
         let show = true
         // 关键字不为空，且没有匹配成功，不显示
-        if (keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
+        if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功
-        if (deptid !== '' && marker.deptid !== deptid) {
+        if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
         // 井类型不为空，且没有匹配成功
-        if (wellType !== '' && marker.wellType !== wellType) {
+        if (wellType && wellType !== '' && marker.wellType !== wellType) {
+          show = false
+        }
+        // 如果只显示报警,井的状态不是报警
+        if (isAlarm === '1' && marker.wellStatus !== 'alarm') {
           show = false
         }
         if (show === false) {
           hideWellIds.push(marker.wellId)
+        } else {
+          center = marker.position
         }
         marker.visible = show
       }
@@ -283,24 +319,73 @@
           }
         }
       }
+      if (center.length > 0) {
+        this.center = center
+      }
     },
     // 获取闸井列表
     getWellList() {
-      getWellList(this.listQuery).then(response => {
+      this.loading = true
+      const listQuery = {
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: this.listQuery.isAlarm
+      }
+      getWellList(listQuery).then(response => {
+        this.loading = false
         if (response.code === 200) {
           const wells = response.data
-          for (const well of wells) {
-            this.markers.push({
-              wellId: well.id,
-              wellCode: well.wellCode,
-              position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
-              positionInfo: well.position,
-              wellType: well.wellType,
-              deptid: well.deptid,
-              bfzt: well.bfzt,
-              icon: this.icons[well.wellType],
-              visible: true
-            })
+          if (wells.length > 0) {
+            // 正在报警的井
+            if (listQuery.isAlarm === '1') {
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'alarm'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            } else if (listQuery.isAlarm === '0') { // 状态正常的井
+              this.firstAmount = false
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'normal'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            }
           }
         }
       })
@@ -316,7 +401,8 @@
             position: wellInfo.position,
             wellTypeName: wellInfo.wellTypeName,
             deptName: wellInfo.deptName,
-            bfztName: wellInfo.bfztName
+            bfztName: wellInfo.bfztName,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = [wellInfo.lngGaode, wellInfo.latGaode]
           this.$nextTick(() => {
@@ -333,6 +419,9 @@
       getAlarmsNow().then(response => {
         if (response.code === 200) {
           this.alarmList = response.data
+          if (this.alarmList.length > 0) {
+            this.hasAlarm = true
+          }
           for (const alarm of response.data) {
             const item = this.alarmWells.findIndex(item => {
               return item.wellCode === alarm.wellCode
@@ -360,7 +449,8 @@
             wellCode: wellInfo.wellCode,
             position: wellInfo.position,
             deptName: wellInfo.deptName,
-            alarms: wellInfo.alarmList
+            alarms: wellInfo.alarmList,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = position
           this.$nextTick(() => {
@@ -377,6 +467,9 @@
       for (const alarmWell of this.alarmWells) {
         if (alarmWell.wellId === wellId) {
           this.center = alarmWell.position
+          if (this.zoom < 16) {
+            this.zoom = 16
+          }
           this.openAlarmWindow(alarmWell.wellId, alarmWell.position)
         }
       }

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index afa2d60..676b364 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -46,7 +46,7 @@
           <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" empty-text="--" border @selection-change="handleSelectionChange">
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..56193f1 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -35,7 +35,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/nbdevice/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 2ab51c6..23d3e77 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -20,13 +20,16 @@
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-form-item style="margin-left:10px">
+            <el-checkbox v-model="showAll">显示全部闸井</el-checkbox>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
     <div class="refresh-div">
       <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
     </div>
-    <div class="map-alarm-div">
+    <div v-show="hasAlarm" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
         <span class="icon-right" @click="tableShow=!tableShow">
@@ -54,7 +57,7 @@
         </el-scrollbar>
       </transition>
     </div>
-    <div class="overview-map-container">
+    <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :zoom="zoom" vid="overview" class="map-demo">
         <!--闸井marker-->
@@ -95,6 +98,7 @@
             <div class="info-header">{{ wellInfo.wellCode }}</div>
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>井深：{{ wellInfo.deep }}(m)</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -110,6 +114,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider/>
+              <div>井深：{{ alarmInfo.deep }}(m)</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -132,9 +137,10 @@
   data() {
     return {
       listQuery: {
-        keywords: '',
-        wellType: '',
-        deptid: ''
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
@@ -194,22 +200,43 @@
         position: '',
         wellTypeName: '',
         deptName: '',
-        bfztName: ''
+        bfztName: '',
+        deep: ''
       }, // 显示井详细信息气泡内容
       alarmInfo: {
         wellCode: '',
         deptName: '',
         position: '',
+        deep: '',
         alarms: []
       }, // 显示报警详情气泡内容
       currentWindow: {
         visible: false, // 窗体显示与否
         position: [116.4, 39.9],
-        windowType: 'info' // 窗体类型：详情或报警
-      },
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
       infoWindowClass: 'nomal-info-window',
-      deptShowTop: false,
-      clock: null
+      deptShowTop: false, // 是否显示顶级
+      clock: null, // 计时器
+      hasAlarm: false, // 是否有报警,
+      showAll: false, // 是否显示全部闸井（包含报警和不报警，为false时只显示报警）
+      firstAmount: false, // 是否第一次加载井数据
+      loading: true
+    }
+  },
+  watch: {
+    showAll(val) {
+      if (val) { // 显示全部
+        this.listQuery.isAlarm = '0'
+        if (this.firstAmount === false) { // 如果是第一次，从后台加载全部数据
+          this.getWellList()
+        } else {
+          this.search()
+        }
+      } else { // 仅显示报警
+        this.listQuery.isAlarm = '1'
+        this.search()
+      }
     }
   },
   created() {
@@ -251,23 +278,32 @@
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
+      const isAlarm = this.listQuery.isAlarm
+      let center = []
       // 查询全部井，是否匹配
+      debugger
       for (const marker of this.markers) {
         let show = true
         // 关键字不为空，且没有匹配成功，不显示
-        if (keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
+        if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功
-        if (deptid !== '' && marker.deptid !== deptid) {
+        if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
         // 井类型不为空，且没有匹配成功
-        if (wellType !== '' && marker.wellType !== wellType) {
+        if (wellType && wellType !== '' && marker.wellType !== wellType) {
+          show = false
+        }
+        // 如果只显示报警,井的状态不是报警
+        if (isAlarm === '1' && marker.wellStatus !== 'alarm') {
           show = false
         }
         if (show === false) {
           hideWellIds.push(marker.wellId)
+        } else {
+          center = marker.position
         }
         marker.visible = show
       }
@@ -283,24 +319,73 @@
           }
         }
       }
+      if (center.length > 0) {
+        this.center = center
+      }
     },
     // 获取闸井列表
     getWellList() {
-      getWellList(this.listQuery).then(response => {
+      this.loading = true
+      const listQuery = {
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: this.listQuery.isAlarm
+      }
+      getWellList(listQuery).then(response => {
+        this.loading = false
         if (response.code === 200) {
           const wells = response.data
-          for (const well of wells) {
-            this.markers.push({
-              wellId: well.id,
-              wellCode: well.wellCode,
-              position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
-              positionInfo: well.position,
-              wellType: well.wellType,
-              deptid: well.deptid,
-              bfzt: well.bfzt,
-              icon: this.icons[well.wellType],
-              visible: true
-            })
+          if (wells.length > 0) {
+            // 正在报警的井
+            if (listQuery.isAlarm === '1') {
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'alarm'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            } else if (listQuery.isAlarm === '0') { // 状态正常的井
+              this.firstAmount = false
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'normal'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            }
           }
         }
       })
@@ -316,7 +401,8 @@
             position: wellInfo.position,
             wellTypeName: wellInfo.wellTypeName,
             deptName: wellInfo.deptName,
-            bfztName: wellInfo.bfztName
+            bfztName: wellInfo.bfztName,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = [wellInfo.lngGaode, wellInfo.latGaode]
           this.$nextTick(() => {
@@ -333,6 +419,9 @@
       getAlarmsNow().then(response => {
         if (response.code === 200) {
           this.alarmList = response.data
+          if (this.alarmList.length > 0) {
+            this.hasAlarm = true
+          }
           for (const alarm of response.data) {
             const item = this.alarmWells.findIndex(item => {
               return item.wellCode === alarm.wellCode
@@ -360,7 +449,8 @@
             wellCode: wellInfo.wellCode,
             position: wellInfo.position,
             deptName: wellInfo.deptName,
-            alarms: wellInfo.alarmList
+            alarms: wellInfo.alarmList,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = position
           this.$nextTick(() => {
@@ -377,6 +467,9 @@
       for (const alarmWell of this.alarmWells) {
         if (alarmWell.wellId === wellId) {
           this.center = alarmWell.position
+          if (this.zoom < 16) {
+            this.zoom = 16
+          }
           this.openAlarmWindow(alarmWell.wellId, alarmWell.position)
         }
       }
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index f86360f..2fd735a 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="userForm.deptid" placeholder="请选择组织机构" />
+            <dept-select v-model="userForm.deptid" dept-show="deptShow" placeholder="请选择组织机构" />
             <!--<select-tree v-model="userForm.deptid" :options="deptTreeList" :props="deptProps" />-->
           </el-form-item>
         </el-col>
@@ -185,7 +185,8 @@
           message: '请输入正确的手机号',
           trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: ''
+      roleName: '',
+      deptShow: true
     }
   },
   computed: {

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index afa2d60..676b364 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -46,7 +46,7 @@
           <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" empty-text="--" border @selection-change="handleSelectionChange">
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..56193f1 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -35,7 +35,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/nbdevice/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 2ab51c6..23d3e77 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -20,13 +20,16 @@
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-form-item style="margin-left:10px">
+            <el-checkbox v-model="showAll">显示全部闸井</el-checkbox>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
     <div class="refresh-div">
       <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
     </div>
-    <div class="map-alarm-div">
+    <div v-show="hasAlarm" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
         <span class="icon-right" @click="tableShow=!tableShow">
@@ -54,7 +57,7 @@
         </el-scrollbar>
       </transition>
     </div>
-    <div class="overview-map-container">
+    <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :zoom="zoom" vid="overview" class="map-demo">
         <!--闸井marker-->
@@ -95,6 +98,7 @@
             <div class="info-header">{{ wellInfo.wellCode }}</div>
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>井深：{{ wellInfo.deep }}(m)</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -110,6 +114,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider/>
+              <div>井深：{{ alarmInfo.deep }}(m)</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -132,9 +137,10 @@
   data() {
     return {
       listQuery: {
-        keywords: '',
-        wellType: '',
-        deptid: ''
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
@@ -194,22 +200,43 @@
         position: '',
         wellTypeName: '',
         deptName: '',
-        bfztName: ''
+        bfztName: '',
+        deep: ''
       }, // 显示井详细信息气泡内容
       alarmInfo: {
         wellCode: '',
         deptName: '',
         position: '',
+        deep: '',
         alarms: []
       }, // 显示报警详情气泡内容
       currentWindow: {
         visible: false, // 窗体显示与否
         position: [116.4, 39.9],
-        windowType: 'info' // 窗体类型：详情或报警
-      },
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
       infoWindowClass: 'nomal-info-window',
-      deptShowTop: false,
-      clock: null
+      deptShowTop: false, // 是否显示顶级
+      clock: null, // 计时器
+      hasAlarm: false, // 是否有报警,
+      showAll: false, // 是否显示全部闸井（包含报警和不报警，为false时只显示报警）
+      firstAmount: false, // 是否第一次加载井数据
+      loading: true
+    }
+  },
+  watch: {
+    showAll(val) {
+      if (val) { // 显示全部
+        this.listQuery.isAlarm = '0'
+        if (this.firstAmount === false) { // 如果是第一次，从后台加载全部数据
+          this.getWellList()
+        } else {
+          this.search()
+        }
+      } else { // 仅显示报警
+        this.listQuery.isAlarm = '1'
+        this.search()
+      }
     }
   },
   created() {
@@ -251,23 +278,32 @@
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
+      const isAlarm = this.listQuery.isAlarm
+      let center = []
       // 查询全部井，是否匹配
+      debugger
       for (const marker of this.markers) {
         let show = true
         // 关键字不为空，且没有匹配成功，不显示
-        if (keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
+        if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功
-        if (deptid !== '' && marker.deptid !== deptid) {
+        if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
         // 井类型不为空，且没有匹配成功
-        if (wellType !== '' && marker.wellType !== wellType) {
+        if (wellType && wellType !== '' && marker.wellType !== wellType) {
+          show = false
+        }
+        // 如果只显示报警,井的状态不是报警
+        if (isAlarm === '1' && marker.wellStatus !== 'alarm') {
           show = false
         }
         if (show === false) {
           hideWellIds.push(marker.wellId)
+        } else {
+          center = marker.position
         }
         marker.visible = show
       }
@@ -283,24 +319,73 @@
           }
         }
       }
+      if (center.length > 0) {
+        this.center = center
+      }
     },
     // 获取闸井列表
     getWellList() {
-      getWellList(this.listQuery).then(response => {
+      this.loading = true
+      const listQuery = {
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: this.listQuery.isAlarm
+      }
+      getWellList(listQuery).then(response => {
+        this.loading = false
         if (response.code === 200) {
           const wells = response.data
-          for (const well of wells) {
-            this.markers.push({
-              wellId: well.id,
-              wellCode: well.wellCode,
-              position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
-              positionInfo: well.position,
-              wellType: well.wellType,
-              deptid: well.deptid,
-              bfzt: well.bfzt,
-              icon: this.icons[well.wellType],
-              visible: true
-            })
+          if (wells.length > 0) {
+            // 正在报警的井
+            if (listQuery.isAlarm === '1') {
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'alarm'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            } else if (listQuery.isAlarm === '0') { // 状态正常的井
+              this.firstAmount = false
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'normal'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            }
           }
         }
       })
@@ -316,7 +401,8 @@
             position: wellInfo.position,
             wellTypeName: wellInfo.wellTypeName,
             deptName: wellInfo.deptName,
-            bfztName: wellInfo.bfztName
+            bfztName: wellInfo.bfztName,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = [wellInfo.lngGaode, wellInfo.latGaode]
           this.$nextTick(() => {
@@ -333,6 +419,9 @@
       getAlarmsNow().then(response => {
         if (response.code === 200) {
           this.alarmList = response.data
+          if (this.alarmList.length > 0) {
+            this.hasAlarm = true
+          }
           for (const alarm of response.data) {
             const item = this.alarmWells.findIndex(item => {
               return item.wellCode === alarm.wellCode
@@ -360,7 +449,8 @@
             wellCode: wellInfo.wellCode,
             position: wellInfo.position,
             deptName: wellInfo.deptName,
-            alarms: wellInfo.alarmList
+            alarms: wellInfo.alarmList,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = position
           this.$nextTick(() => {
@@ -377,6 +467,9 @@
       for (const alarmWell of this.alarmWells) {
         if (alarmWell.wellId === wellId) {
           this.center = alarmWell.position
+          if (this.zoom < 16) {
+            this.zoom = 16
+          }
           this.openAlarmWindow(alarmWell.wellId, alarmWell.position)
         }
       }
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index f86360f..2fd735a 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="userForm.deptid" placeholder="请选择组织机构" />
+            <dept-select v-model="userForm.deptid" dept-show="deptShow" placeholder="请选择组织机构" />
             <!--<select-tree v-model="userForm.deptid" :options="deptTreeList" :props="deptProps" />-->
           </el-form-item>
         </el-col>
@@ -185,7 +185,8 @@
           message: '请输入正确的手机号',
           trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: ''
+      roleName: '',
+      deptShow: true
     }
   },
   computed: {
diff --git a/src/views/system/user/resetPwd.vue b/src/views/system/user/resetPwd.vue
index 69fa532..99d95e8 100644
--- a/src/views/system/user/resetPwd.vue
+++ b/src/views/system/user/resetPwd.vue
@@ -32,9 +32,19 @@
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
-        if (this.userForm.repassword !== '') {
-          this.$refs.dataForm.validateField('repassword')
+        var reg = /^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&*]+$)[a-zA-Z\d!@#$%^&*]+$/
+        if (value.match(reg)) { // 样式匹配
+          if (value.length < 8 || value.length > 16) {
+            callback(new Error('密码长度必须在8到16位之间'))
+          } else {
+            if (this.userForm.repassword !== '') {
+              this.$refs.dataForm.validateField('repassword')
+            }
+          }
+        } else {
+          callback(new Error('必须由数字、字母、字符中至少两种组成'))
         }
+
         callback()
       }
     }

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index afa2d60..676b364 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -46,7 +46,7 @@
           <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" empty-text="--" border @selection-change="handleSelectionChange">
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..56193f1 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -35,7 +35,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/nbdevice/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 2ab51c6..23d3e77 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -20,13 +20,16 @@
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-form-item style="margin-left:10px">
+            <el-checkbox v-model="showAll">显示全部闸井</el-checkbox>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
     <div class="refresh-div">
       <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
     </div>
-    <div class="map-alarm-div">
+    <div v-show="hasAlarm" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
         <span class="icon-right" @click="tableShow=!tableShow">
@@ -54,7 +57,7 @@
         </el-scrollbar>
       </transition>
     </div>
-    <div class="overview-map-container">
+    <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :zoom="zoom" vid="overview" class="map-demo">
         <!--闸井marker-->
@@ -95,6 +98,7 @@
             <div class="info-header">{{ wellInfo.wellCode }}</div>
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>井深：{{ wellInfo.deep }}(m)</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -110,6 +114,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider/>
+              <div>井深：{{ alarmInfo.deep }}(m)</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -132,9 +137,10 @@
   data() {
     return {
       listQuery: {
-        keywords: '',
-        wellType: '',
-        deptid: ''
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
@@ -194,22 +200,43 @@
         position: '',
         wellTypeName: '',
         deptName: '',
-        bfztName: ''
+        bfztName: '',
+        deep: ''
       }, // 显示井详细信息气泡内容
       alarmInfo: {
         wellCode: '',
         deptName: '',
         position: '',
+        deep: '',
         alarms: []
       }, // 显示报警详情气泡内容
       currentWindow: {
         visible: false, // 窗体显示与否
         position: [116.4, 39.9],
-        windowType: 'info' // 窗体类型：详情或报警
-      },
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
       infoWindowClass: 'nomal-info-window',
-      deptShowTop: false,
-      clock: null
+      deptShowTop: false, // 是否显示顶级
+      clock: null, // 计时器
+      hasAlarm: false, // 是否有报警,
+      showAll: false, // 是否显示全部闸井（包含报警和不报警，为false时只显示报警）
+      firstAmount: false, // 是否第一次加载井数据
+      loading: true
+    }
+  },
+  watch: {
+    showAll(val) {
+      if (val) { // 显示全部
+        this.listQuery.isAlarm = '0'
+        if (this.firstAmount === false) { // 如果是第一次，从后台加载全部数据
+          this.getWellList()
+        } else {
+          this.search()
+        }
+      } else { // 仅显示报警
+        this.listQuery.isAlarm = '1'
+        this.search()
+      }
     }
   },
   created() {
@@ -251,23 +278,32 @@
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
+      const isAlarm = this.listQuery.isAlarm
+      let center = []
       // 查询全部井，是否匹配
+      debugger
       for (const marker of this.markers) {
         let show = true
         // 关键字不为空，且没有匹配成功，不显示
-        if (keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
+        if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功
-        if (deptid !== '' && marker.deptid !== deptid) {
+        if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
         // 井类型不为空，且没有匹配成功
-        if (wellType !== '' && marker.wellType !== wellType) {
+        if (wellType && wellType !== '' && marker.wellType !== wellType) {
+          show = false
+        }
+        // 如果只显示报警,井的状态不是报警
+        if (isAlarm === '1' && marker.wellStatus !== 'alarm') {
           show = false
         }
         if (show === false) {
           hideWellIds.push(marker.wellId)
+        } else {
+          center = marker.position
         }
         marker.visible = show
       }
@@ -283,24 +319,73 @@
           }
         }
       }
+      if (center.length > 0) {
+        this.center = center
+      }
     },
     // 获取闸井列表
     getWellList() {
-      getWellList(this.listQuery).then(response => {
+      this.loading = true
+      const listQuery = {
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: this.listQuery.isAlarm
+      }
+      getWellList(listQuery).then(response => {
+        this.loading = false
         if (response.code === 200) {
           const wells = response.data
-          for (const well of wells) {
-            this.markers.push({
-              wellId: well.id,
-              wellCode: well.wellCode,
-              position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
-              positionInfo: well.position,
-              wellType: well.wellType,
-              deptid: well.deptid,
-              bfzt: well.bfzt,
-              icon: this.icons[well.wellType],
-              visible: true
-            })
+          if (wells.length > 0) {
+            // 正在报警的井
+            if (listQuery.isAlarm === '1') {
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'alarm'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            } else if (listQuery.isAlarm === '0') { // 状态正常的井
+              this.firstAmount = false
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'normal'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            }
           }
         }
       })
@@ -316,7 +401,8 @@
             position: wellInfo.position,
             wellTypeName: wellInfo.wellTypeName,
             deptName: wellInfo.deptName,
-            bfztName: wellInfo.bfztName
+            bfztName: wellInfo.bfztName,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = [wellInfo.lngGaode, wellInfo.latGaode]
           this.$nextTick(() => {
@@ -333,6 +419,9 @@
       getAlarmsNow().then(response => {
         if (response.code === 200) {
           this.alarmList = response.data
+          if (this.alarmList.length > 0) {
+            this.hasAlarm = true
+          }
           for (const alarm of response.data) {
             const item = this.alarmWells.findIndex(item => {
               return item.wellCode === alarm.wellCode
@@ -360,7 +449,8 @@
             wellCode: wellInfo.wellCode,
             position: wellInfo.position,
             deptName: wellInfo.deptName,
-            alarms: wellInfo.alarmList
+            alarms: wellInfo.alarmList,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = position
           this.$nextTick(() => {
@@ -377,6 +467,9 @@
       for (const alarmWell of this.alarmWells) {
         if (alarmWell.wellId === wellId) {
           this.center = alarmWell.position
+          if (this.zoom < 16) {
+            this.zoom = 16
+          }
           this.openAlarmWindow(alarmWell.wellId, alarmWell.position)
         }
       }
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index f86360f..2fd735a 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="userForm.deptid" placeholder="请选择组织机构" />
+            <dept-select v-model="userForm.deptid" dept-show="deptShow" placeholder="请选择组织机构" />
             <!--<select-tree v-model="userForm.deptid" :options="deptTreeList" :props="deptProps" />-->
           </el-form-item>
         </el-col>
@@ -185,7 +185,8 @@
           message: '请输入正确的手机号',
           trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: ''
+      roleName: '',
+      deptShow: true
     }
   },
   computed: {
diff --git a/src/views/system/user/resetPwd.vue b/src/views/system/user/resetPwd.vue
index 69fa532..99d95e8 100644
--- a/src/views/system/user/resetPwd.vue
+++ b/src/views/system/user/resetPwd.vue
@@ -32,9 +32,19 @@
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
-        if (this.userForm.repassword !== '') {
-          this.$refs.dataForm.validateField('repassword')
+        var reg = /^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&*]+$)[a-zA-Z\d!@#$%^&*]+$/
+        if (value.match(reg)) { // 样式匹配
+          if (value.length < 8 || value.length > 16) {
+            callback(new Error('密码长度必须在8到16位之间'))
+          } else {
+            if (this.userForm.repassword !== '') {
+              this.$refs.dataForm.validateField('repassword')
+            }
+          }
+        } else {
+          callback(new Error('必须由数字、字母、字符中至少两种组成'))
         }
+
         callback()
       }
     }
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 16f8bae..3843939 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -130,7 +130,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
-          <el-button size="medium" @click="resetForm"> 重置 </el-button>
+          <el-button size="medium" @click="cancel"> 重置 </el-button>
           <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData"> 保存 </el-button>
         </el-col>
       </el-row>
@@ -185,6 +185,17 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validatePosition = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.length > 50) {
+          callback(new Error('位置长度不能超过50个字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('位置不能为空'))
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -224,7 +235,7 @@
       rules: {
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         wellName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ required: true, message: '闸井详细地址不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, trigger: ['blur', 'change'], validator: validatePosition }],
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
@@ -336,11 +347,23 @@
     },
     // 取消
     cancel() {
-      this.dialogFormVisible = false
-      this.fileList = []
-      // 清除验证
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
+      console.log('取消')
+      this.$confirm(
+        '闸井信息尚未保存，确认重置吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.resetForm()
+        this.dialogFormVisible = false
+        this.fileList = []
+        // 清除验证
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       })
     },
     // 重置表单

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index afa2d60..676b364 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -46,7 +46,7 @@
           <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" empty-text="--" border @selection-change="handleSelectionChange">
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..56193f1 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -35,7 +35,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/nbdevice/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 2ab51c6..23d3e77 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -20,13 +20,16 @@
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-form-item style="margin-left:10px">
+            <el-checkbox v-model="showAll">显示全部闸井</el-checkbox>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
     <div class="refresh-div">
       <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
     </div>
-    <div class="map-alarm-div">
+    <div v-show="hasAlarm" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
         <span class="icon-right" @click="tableShow=!tableShow">
@@ -54,7 +57,7 @@
         </el-scrollbar>
       </transition>
     </div>
-    <div class="overview-map-container">
+    <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :zoom="zoom" vid="overview" class="map-demo">
         <!--闸井marker-->
@@ -95,6 +98,7 @@
             <div class="info-header">{{ wellInfo.wellCode }}</div>
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>井深：{{ wellInfo.deep }}(m)</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -110,6 +114,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider/>
+              <div>井深：{{ alarmInfo.deep }}(m)</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -132,9 +137,10 @@
   data() {
     return {
       listQuery: {
-        keywords: '',
-        wellType: '',
-        deptid: ''
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
@@ -194,22 +200,43 @@
         position: '',
         wellTypeName: '',
         deptName: '',
-        bfztName: ''
+        bfztName: '',
+        deep: ''
       }, // 显示井详细信息气泡内容
       alarmInfo: {
         wellCode: '',
         deptName: '',
         position: '',
+        deep: '',
         alarms: []
       }, // 显示报警详情气泡内容
       currentWindow: {
         visible: false, // 窗体显示与否
         position: [116.4, 39.9],
-        windowType: 'info' // 窗体类型：详情或报警
-      },
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
       infoWindowClass: 'nomal-info-window',
-      deptShowTop: false,
-      clock: null
+      deptShowTop: false, // 是否显示顶级
+      clock: null, // 计时器
+      hasAlarm: false, // 是否有报警,
+      showAll: false, // 是否显示全部闸井（包含报警和不报警，为false时只显示报警）
+      firstAmount: false, // 是否第一次加载井数据
+      loading: true
+    }
+  },
+  watch: {
+    showAll(val) {
+      if (val) { // 显示全部
+        this.listQuery.isAlarm = '0'
+        if (this.firstAmount === false) { // 如果是第一次，从后台加载全部数据
+          this.getWellList()
+        } else {
+          this.search()
+        }
+      } else { // 仅显示报警
+        this.listQuery.isAlarm = '1'
+        this.search()
+      }
     }
   },
   created() {
@@ -251,23 +278,32 @@
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
+      const isAlarm = this.listQuery.isAlarm
+      let center = []
       // 查询全部井，是否匹配
+      debugger
       for (const marker of this.markers) {
         let show = true
         // 关键字不为空，且没有匹配成功，不显示
-        if (keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
+        if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功
-        if (deptid !== '' && marker.deptid !== deptid) {
+        if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
         // 井类型不为空，且没有匹配成功
-        if (wellType !== '' && marker.wellType !== wellType) {
+        if (wellType && wellType !== '' && marker.wellType !== wellType) {
+          show = false
+        }
+        // 如果只显示报警,井的状态不是报警
+        if (isAlarm === '1' && marker.wellStatus !== 'alarm') {
           show = false
         }
         if (show === false) {
           hideWellIds.push(marker.wellId)
+        } else {
+          center = marker.position
         }
         marker.visible = show
       }
@@ -283,24 +319,73 @@
           }
         }
       }
+      if (center.length > 0) {
+        this.center = center
+      }
     },
     // 获取闸井列表
     getWellList() {
-      getWellList(this.listQuery).then(response => {
+      this.loading = true
+      const listQuery = {
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: this.listQuery.isAlarm
+      }
+      getWellList(listQuery).then(response => {
+        this.loading = false
         if (response.code === 200) {
           const wells = response.data
-          for (const well of wells) {
-            this.markers.push({
-              wellId: well.id,
-              wellCode: well.wellCode,
-              position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
-              positionInfo: well.position,
-              wellType: well.wellType,
-              deptid: well.deptid,
-              bfzt: well.bfzt,
-              icon: this.icons[well.wellType],
-              visible: true
-            })
+          if (wells.length > 0) {
+            // 正在报警的井
+            if (listQuery.isAlarm === '1') {
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'alarm'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            } else if (listQuery.isAlarm === '0') { // 状态正常的井
+              this.firstAmount = false
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'normal'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            }
           }
         }
       })
@@ -316,7 +401,8 @@
             position: wellInfo.position,
             wellTypeName: wellInfo.wellTypeName,
             deptName: wellInfo.deptName,
-            bfztName: wellInfo.bfztName
+            bfztName: wellInfo.bfztName,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = [wellInfo.lngGaode, wellInfo.latGaode]
           this.$nextTick(() => {
@@ -333,6 +419,9 @@
       getAlarmsNow().then(response => {
         if (response.code === 200) {
           this.alarmList = response.data
+          if (this.alarmList.length > 0) {
+            this.hasAlarm = true
+          }
           for (const alarm of response.data) {
             const item = this.alarmWells.findIndex(item => {
               return item.wellCode === alarm.wellCode
@@ -360,7 +449,8 @@
             wellCode: wellInfo.wellCode,
             position: wellInfo.position,
             deptName: wellInfo.deptName,
-            alarms: wellInfo.alarmList
+            alarms: wellInfo.alarmList,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = position
           this.$nextTick(() => {
@@ -377,6 +467,9 @@
       for (const alarmWell of this.alarmWells) {
         if (alarmWell.wellId === wellId) {
           this.center = alarmWell.position
+          if (this.zoom < 16) {
+            this.zoom = 16
+          }
           this.openAlarmWindow(alarmWell.wellId, alarmWell.position)
         }
       }
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index f86360f..2fd735a 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="userForm.deptid" placeholder="请选择组织机构" />
+            <dept-select v-model="userForm.deptid" dept-show="deptShow" placeholder="请选择组织机构" />
             <!--<select-tree v-model="userForm.deptid" :options="deptTreeList" :props="deptProps" />-->
           </el-form-item>
         </el-col>
@@ -185,7 +185,8 @@
           message: '请输入正确的手机号',
           trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: ''
+      roleName: '',
+      deptShow: true
     }
   },
   computed: {
diff --git a/src/views/system/user/resetPwd.vue b/src/views/system/user/resetPwd.vue
index 69fa532..99d95e8 100644
--- a/src/views/system/user/resetPwd.vue
+++ b/src/views/system/user/resetPwd.vue
@@ -32,9 +32,19 @@
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
-        if (this.userForm.repassword !== '') {
-          this.$refs.dataForm.validateField('repassword')
+        var reg = /^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&*]+$)[a-zA-Z\d!@#$%^&*]+$/
+        if (value.match(reg)) { // 样式匹配
+          if (value.length < 8 || value.length > 16) {
+            callback(new Error('密码长度必须在8到16位之间'))
+          } else {
+            if (this.userForm.repassword !== '') {
+              this.$refs.dataForm.validateField('repassword')
+            }
+          }
+        } else {
+          callback(new Error('必须由数字、字母、字符中至少两种组成'))
         }
+
         callback()
       }
     }
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 16f8bae..3843939 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -130,7 +130,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
-          <el-button size="medium" @click="resetForm"> 重置 </el-button>
+          <el-button size="medium" @click="cancel"> 重置 </el-button>
           <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData"> 保存 </el-button>
         </el-col>
       </el-row>
@@ -185,6 +185,17 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validatePosition = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.length > 50) {
+          callback(new Error('位置长度不能超过50个字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('位置不能为空'))
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -224,7 +235,7 @@
       rules: {
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         wellName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ required: true, message: '闸井详细地址不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, trigger: ['blur', 'change'], validator: validatePosition }],
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
@@ -336,11 +347,23 @@
     },
     // 取消
     cancel() {
-      this.dialogFormVisible = false
-      this.fileList = []
-      // 清除验证
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
+      console.log('取消')
+      this.$confirm(
+        '闸井信息尚未保存，确认重置吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.resetForm()
+        this.dialogFormVisible = false
+        this.fileList = []
+        // 清除验证
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       })
     },
     // 重置表单
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 7aa2de9..8513d37 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -170,6 +170,17 @@
         callback(new Error('井深不能为空'))
       }
     }
+    const validatePosition = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.length > 50) {
+          callback(new Error('位置长度不能超过50个字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('位置不能为空'))
+      }
+    }
     const validateLng = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
@@ -230,7 +241,7 @@
       rules: {
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         wellName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ required: true, message: '闸井详细地址不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, trigger: ['blur', 'change'], validator: validatePosition }],
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index afa2d60..676b364 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -46,7 +46,7 @@
           <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" empty-text="--" border @selection-change="handleSelectionChange">
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..56193f1 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -35,7 +35,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/nbdevice/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 2ab51c6..23d3e77 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -20,13 +20,16 @@
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-form-item style="margin-left:10px">
+            <el-checkbox v-model="showAll">显示全部闸井</el-checkbox>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
     <div class="refresh-div">
       <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
     </div>
-    <div class="map-alarm-div">
+    <div v-show="hasAlarm" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
         <span class="icon-right" @click="tableShow=!tableShow">
@@ -54,7 +57,7 @@
         </el-scrollbar>
       </transition>
     </div>
-    <div class="overview-map-container">
+    <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :zoom="zoom" vid="overview" class="map-demo">
         <!--闸井marker-->
@@ -95,6 +98,7 @@
             <div class="info-header">{{ wellInfo.wellCode }}</div>
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>井深：{{ wellInfo.deep }}(m)</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -110,6 +114,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider/>
+              <div>井深：{{ alarmInfo.deep }}(m)</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -132,9 +137,10 @@
   data() {
     return {
       listQuery: {
-        keywords: '',
-        wellType: '',
-        deptid: ''
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
@@ -194,22 +200,43 @@
         position: '',
         wellTypeName: '',
         deptName: '',
-        bfztName: ''
+        bfztName: '',
+        deep: ''
       }, // 显示井详细信息气泡内容
       alarmInfo: {
         wellCode: '',
         deptName: '',
         position: '',
+        deep: '',
         alarms: []
       }, // 显示报警详情气泡内容
       currentWindow: {
         visible: false, // 窗体显示与否
         position: [116.4, 39.9],
-        windowType: 'info' // 窗体类型：详情或报警
-      },
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
       infoWindowClass: 'nomal-info-window',
-      deptShowTop: false,
-      clock: null
+      deptShowTop: false, // 是否显示顶级
+      clock: null, // 计时器
+      hasAlarm: false, // 是否有报警,
+      showAll: false, // 是否显示全部闸井（包含报警和不报警，为false时只显示报警）
+      firstAmount: false, // 是否第一次加载井数据
+      loading: true
+    }
+  },
+  watch: {
+    showAll(val) {
+      if (val) { // 显示全部
+        this.listQuery.isAlarm = '0'
+        if (this.firstAmount === false) { // 如果是第一次，从后台加载全部数据
+          this.getWellList()
+        } else {
+          this.search()
+        }
+      } else { // 仅显示报警
+        this.listQuery.isAlarm = '1'
+        this.search()
+      }
     }
   },
   created() {
@@ -251,23 +278,32 @@
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
+      const isAlarm = this.listQuery.isAlarm
+      let center = []
       // 查询全部井，是否匹配
+      debugger
       for (const marker of this.markers) {
         let show = true
         // 关键字不为空，且没有匹配成功，不显示
-        if (keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
+        if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功
-        if (deptid !== '' && marker.deptid !== deptid) {
+        if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
         // 井类型不为空，且没有匹配成功
-        if (wellType !== '' && marker.wellType !== wellType) {
+        if (wellType && wellType !== '' && marker.wellType !== wellType) {
+          show = false
+        }
+        // 如果只显示报警,井的状态不是报警
+        if (isAlarm === '1' && marker.wellStatus !== 'alarm') {
           show = false
         }
         if (show === false) {
           hideWellIds.push(marker.wellId)
+        } else {
+          center = marker.position
         }
         marker.visible = show
       }
@@ -283,24 +319,73 @@
           }
         }
       }
+      if (center.length > 0) {
+        this.center = center
+      }
     },
     // 获取闸井列表
     getWellList() {
-      getWellList(this.listQuery).then(response => {
+      this.loading = true
+      const listQuery = {
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: this.listQuery.isAlarm
+      }
+      getWellList(listQuery).then(response => {
+        this.loading = false
         if (response.code === 200) {
           const wells = response.data
-          for (const well of wells) {
-            this.markers.push({
-              wellId: well.id,
-              wellCode: well.wellCode,
-              position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
-              positionInfo: well.position,
-              wellType: well.wellType,
-              deptid: well.deptid,
-              bfzt: well.bfzt,
-              icon: this.icons[well.wellType],
-              visible: true
-            })
+          if (wells.length > 0) {
+            // 正在报警的井
+            if (listQuery.isAlarm === '1') {
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'alarm'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            } else if (listQuery.isAlarm === '0') { // 状态正常的井
+              this.firstAmount = false
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'normal'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            }
           }
         }
       })
@@ -316,7 +401,8 @@
             position: wellInfo.position,
             wellTypeName: wellInfo.wellTypeName,
             deptName: wellInfo.deptName,
-            bfztName: wellInfo.bfztName
+            bfztName: wellInfo.bfztName,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = [wellInfo.lngGaode, wellInfo.latGaode]
           this.$nextTick(() => {
@@ -333,6 +419,9 @@
       getAlarmsNow().then(response => {
         if (response.code === 200) {
           this.alarmList = response.data
+          if (this.alarmList.length > 0) {
+            this.hasAlarm = true
+          }
           for (const alarm of response.data) {
             const item = this.alarmWells.findIndex(item => {
               return item.wellCode === alarm.wellCode
@@ -360,7 +449,8 @@
             wellCode: wellInfo.wellCode,
             position: wellInfo.position,
             deptName: wellInfo.deptName,
-            alarms: wellInfo.alarmList
+            alarms: wellInfo.alarmList,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = position
           this.$nextTick(() => {
@@ -377,6 +467,9 @@
       for (const alarmWell of this.alarmWells) {
         if (alarmWell.wellId === wellId) {
           this.center = alarmWell.position
+          if (this.zoom < 16) {
+            this.zoom = 16
+          }
           this.openAlarmWindow(alarmWell.wellId, alarmWell.position)
         }
       }
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index f86360f..2fd735a 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="userForm.deptid" placeholder="请选择组织机构" />
+            <dept-select v-model="userForm.deptid" dept-show="deptShow" placeholder="请选择组织机构" />
             <!--<select-tree v-model="userForm.deptid" :options="deptTreeList" :props="deptProps" />-->
           </el-form-item>
         </el-col>
@@ -185,7 +185,8 @@
           message: '请输入正确的手机号',
           trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: ''
+      roleName: '',
+      deptShow: true
     }
   },
   computed: {
diff --git a/src/views/system/user/resetPwd.vue b/src/views/system/user/resetPwd.vue
index 69fa532..99d95e8 100644
--- a/src/views/system/user/resetPwd.vue
+++ b/src/views/system/user/resetPwd.vue
@@ -32,9 +32,19 @@
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
-        if (this.userForm.repassword !== '') {
-          this.$refs.dataForm.validateField('repassword')
+        var reg = /^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&*]+$)[a-zA-Z\d!@#$%^&*]+$/
+        if (value.match(reg)) { // 样式匹配
+          if (value.length < 8 || value.length > 16) {
+            callback(new Error('密码长度必须在8到16位之间'))
+          } else {
+            if (this.userForm.repassword !== '') {
+              this.$refs.dataForm.validateField('repassword')
+            }
+          }
+        } else {
+          callback(new Error('必须由数字、字母、字符中至少两种组成'))
         }
+
         callback()
       }
     }
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 16f8bae..3843939 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -130,7 +130,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
-          <el-button size="medium" @click="resetForm"> 重置 </el-button>
+          <el-button size="medium" @click="cancel"> 重置 </el-button>
           <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData"> 保存 </el-button>
         </el-col>
       </el-row>
@@ -185,6 +185,17 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validatePosition = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.length > 50) {
+          callback(new Error('位置长度不能超过50个字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('位置不能为空'))
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -224,7 +235,7 @@
       rules: {
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         wellName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ required: true, message: '闸井详细地址不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, trigger: ['blur', 'change'], validator: validatePosition }],
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
@@ -336,11 +347,23 @@
     },
     // 取消
     cancel() {
-      this.dialogFormVisible = false
-      this.fileList = []
-      // 清除验证
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
+      console.log('取消')
+      this.$confirm(
+        '闸井信息尚未保存，确认重置吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.resetForm()
+        this.dialogFormVisible = false
+        this.fileList = []
+        // 清除验证
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       })
     },
     // 重置表单
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 7aa2de9..8513d37 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -170,6 +170,17 @@
         callback(new Error('井深不能为空'))
       }
     }
+    const validatePosition = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.length > 50) {
+          callback(new Error('位置长度不能超过50个字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('位置不能为空'))
+      }
+    }
     const validateLng = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
@@ -230,7 +241,7 @@
       rules: {
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         wellName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ required: true, message: '闸井详细地址不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, trigger: ['blur', 'change'], validator: validatePosition }],
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index 0db715d..0f9e4a9 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -167,6 +167,7 @@
           responsibleDept: row.responsibleDept // 维护人员部门
         }
         this.center = [row.lngGaode, row.latGaode]
+        this.markers = []
         this.markers.push({ position: [row.lngGaode, row.latGaode] })
         if (row.deptid && row.deptid !== '') {
           this.fetchArea1()

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..96a98ed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,8 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.imgBox img{
+  max-height: 400px !important;
+  max-width:700px !important;
+  margin: 0px auto;
+}
diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue
index 4850d06..2d036b7 100644
--- a/src/views/concentrator/listConcentrator.vue
+++ b/src/views/concentrator/listConcentrator.vue
@@ -44,7 +44,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/concentrator/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 0f93fcf..4f841c8 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -96,13 +96,6 @@
           align: 'center'
         },
         {
-          text: '状态',
-          value: 'status',
-          width: 80,
-          align: 'center',
-          checkState: true
-        },
-        {
           text: '状态描述',
           value: 'descn',
           align: 'center',
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 2f4507a..790f9e2 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,16 +2,25 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>
-          </el-form-item>
-        </el-col>
+        <!--<el-col :span="12">-->
+          <!--<el-form-item label="设备名称" prop="deviceName">-->
+            <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -49,17 +58,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -97,7 +95,7 @@
       showDeviceType: true, // 是否显示设备类型选项
       showModelType: true, // 是否显示型号选项
       rules: {
-        deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
         devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index fcd14a1..d13530d 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -115,11 +115,11 @@
           value: 'devcode',
           align: 'center'
         },
-        {
-          text: '设备名称',
-          value: 'deviceName',
-          align: 'center'
-        },
+        // {
+        //   text: '设备名称',
+        //   value: 'deviceName',
+        //   align: 'center'
+        // },
         {
           text: '监控内容',
           value: 'watchType',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index afa2d60..676b364 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -46,7 +46,7 @@
           <el-button v-if="hasPerm('/job/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" empty-text="--" border @selection-change="handleSelectionChange">
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue
index c81957e..56193f1 100644
--- a/src/views/nbDevice/listNbDevice.vue
+++ b/src/views/nbDevice/listNbDevice.vue
@@ -35,7 +35,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/nbdevice/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 2ab51c6..23d3e77 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -20,13 +20,16 @@
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-form-item style="margin-left:10px">
+            <el-checkbox v-model="showAll">显示全部闸井</el-checkbox>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
     <div class="refresh-div">
       <span class="font-red">{{ count }}</span>  s后刷新<i class="el-icon-refresh" @click="refreshAlarm"/>
     </div>
-    <div class="map-alarm-div">
+    <div v-show="hasAlarm" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
         <span class="icon-right" @click="tableShow=!tableShow">
@@ -54,7 +57,7 @@
         </el-scrollbar>
       </transition>
     </div>
-    <div class="overview-map-container">
+    <div v-loading="loading" class="overview-map-container">
       <!--地图-->
       <el-amap ref="map" :center="center" :zoom="zoom" vid="overview" class="map-demo">
         <!--闸井marker-->
@@ -95,6 +98,7 @@
             <div class="info-header">{{ wellInfo.wellCode }}</div>
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
+              <div>井深：{{ wellInfo.deep }}(m)</div>
               <div>权属单位：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
@@ -110,6 +114,7 @@
                 <div>设备编号：<span>{{ alarm.devcode }}</span></div>
               </div>
               <el-divider/>
+              <div>井深：{{ alarmInfo.deep }}(m)</div>
               <div>权属单位：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
@@ -132,9 +137,10 @@
   data() {
     return {
       listQuery: {
-        keywords: '',
-        wellType: '',
-        deptid: ''
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: '1' // 是否报警
       }, // 筛选条件
       columns: [
         {
@@ -194,22 +200,43 @@
         position: '',
         wellTypeName: '',
         deptName: '',
-        bfztName: ''
+        bfztName: '',
+        deep: ''
       }, // 显示井详细信息气泡内容
       alarmInfo: {
         wellCode: '',
         deptName: '',
         position: '',
+        deep: '',
         alarms: []
       }, // 显示报警详情气泡内容
       currentWindow: {
         visible: false, // 窗体显示与否
         position: [116.4, 39.9],
-        windowType: 'info' // 窗体类型：详情或报警
-      },
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
       infoWindowClass: 'nomal-info-window',
-      deptShowTop: false,
-      clock: null
+      deptShowTop: false, // 是否显示顶级
+      clock: null, // 计时器
+      hasAlarm: false, // 是否有报警,
+      showAll: false, // 是否显示全部闸井（包含报警和不报警，为false时只显示报警）
+      firstAmount: false, // 是否第一次加载井数据
+      loading: true
+    }
+  },
+  watch: {
+    showAll(val) {
+      if (val) { // 显示全部
+        this.listQuery.isAlarm = '0'
+        if (this.firstAmount === false) { // 如果是第一次，从后台加载全部数据
+          this.getWellList()
+        } else {
+          this.search()
+        }
+      } else { // 仅显示报警
+        this.listQuery.isAlarm = '1'
+        this.search()
+      }
     }
   },
   created() {
@@ -251,23 +278,32 @@
       const keywords = this.listQuery.keywords
       const deptid = this.listQuery.deptid
       const wellType = this.listQuery.wellType
+      const isAlarm = this.listQuery.isAlarm
+      let center = []
       // 查询全部井，是否匹配
+      debugger
       for (const marker of this.markers) {
         let show = true
         // 关键字不为空，且没有匹配成功，不显示
-        if (keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
+        if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) {
           show = false
         }
         // 部门不为空， 且没有匹配成功
-        if (deptid !== '' && marker.deptid !== deptid) {
+        if (deptid && deptid !== '' && marker.deptid !== deptid) {
           show = false
         }
         // 井类型不为空，且没有匹配成功
-        if (wellType !== '' && marker.wellType !== wellType) {
+        if (wellType && wellType !== '' && marker.wellType !== wellType) {
+          show = false
+        }
+        // 如果只显示报警,井的状态不是报警
+        if (isAlarm === '1' && marker.wellStatus !== 'alarm') {
           show = false
         }
         if (show === false) {
           hideWellIds.push(marker.wellId)
+        } else {
+          center = marker.position
         }
         marker.visible = show
       }
@@ -283,24 +319,73 @@
           }
         }
       }
+      if (center.length > 0) {
+        this.center = center
+      }
     },
     // 获取闸井列表
     getWellList() {
-      getWellList(this.listQuery).then(response => {
+      this.loading = true
+      const listQuery = {
+        keywords: '', // 关键字
+        wellType: '', // 井类型
+        deptid: '', // 组织机构
+        isAlarm: this.listQuery.isAlarm
+      }
+      getWellList(listQuery).then(response => {
+        this.loading = false
         if (response.code === 200) {
           const wells = response.data
-          for (const well of wells) {
-            this.markers.push({
-              wellId: well.id,
-              wellCode: well.wellCode,
-              position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
-              positionInfo: well.position,
-              wellType: well.wellType,
-              deptid: well.deptid,
-              bfzt: well.bfzt,
-              icon: this.icons[well.wellType],
-              visible: true
-            })
+          if (wells.length > 0) {
+            // 正在报警的井
+            if (listQuery.isAlarm === '1') {
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'alarm'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            } else if (listQuery.isAlarm === '0') { // 状态正常的井
+              this.firstAmount = false
+              const centerxs = []
+              const centerys = []
+              for (const well of wells) {
+                this.markers.push({
+                  wellId: well.id,
+                  wellCode: well.wellCode,
+                  position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)],
+                  positionInfo: well.position,
+                  wellType: well.wellType,
+                  deptid: well.deptid,
+                  bfzt: well.bfzt,
+                  icon: this.icons[well.wellType],
+                  visible: true,
+                  wellStatus: 'normal'
+                })
+                centerxs.push(parseFloat(well.lngGaode))
+                centerys.push(parseFloat(well.latGaode))
+              }
+              centerxs.sort()
+              centerys.sort()
+              const index = Math.floor(centerxs.length / 2)
+              this.center = [centerxs[index], centerys[index]]
+            }
           }
         }
       })
@@ -316,7 +401,8 @@
             position: wellInfo.position,
             wellTypeName: wellInfo.wellTypeName,
             deptName: wellInfo.deptName,
-            bfztName: wellInfo.bfztName
+            bfztName: wellInfo.bfztName,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = [wellInfo.lngGaode, wellInfo.latGaode]
           this.$nextTick(() => {
@@ -333,6 +419,9 @@
       getAlarmsNow().then(response => {
         if (response.code === 200) {
           this.alarmList = response.data
+          if (this.alarmList.length > 0) {
+            this.hasAlarm = true
+          }
           for (const alarm of response.data) {
             const item = this.alarmWells.findIndex(item => {
               return item.wellCode === alarm.wellCode
@@ -360,7 +449,8 @@
             wellCode: wellInfo.wellCode,
             position: wellInfo.position,
             deptName: wellInfo.deptName,
-            alarms: wellInfo.alarmList
+            alarms: wellInfo.alarmList,
+            deep: wellInfo.deep
           }
           this.currentWindow.position = position
           this.$nextTick(() => {
@@ -377,6 +467,9 @@
       for (const alarmWell of this.alarmWells) {
         if (alarmWell.wellId === wellId) {
           this.center = alarmWell.position
+          if (this.zoom < 16) {
+            this.zoom = 16
+          }
           this.openAlarmWindow(alarmWell.wellId, alarmWell.position)
         }
       }
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index f86360f..2fd735a 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
-            <dept-select v-model="userForm.deptid" placeholder="请选择组织机构" />
+            <dept-select v-model="userForm.deptid" dept-show="deptShow" placeholder="请选择组织机构" />
             <!--<select-tree v-model="userForm.deptid" :options="deptTreeList" :props="deptProps" />-->
           </el-form-item>
         </el-col>
@@ -185,7 +185,8 @@
           message: '请输入正确的手机号',
           trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: ''
+      roleName: '',
+      deptShow: true
     }
   },
   computed: {
diff --git a/src/views/system/user/resetPwd.vue b/src/views/system/user/resetPwd.vue
index 69fa532..99d95e8 100644
--- a/src/views/system/user/resetPwd.vue
+++ b/src/views/system/user/resetPwd.vue
@@ -32,9 +32,19 @@
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
-        if (this.userForm.repassword !== '') {
-          this.$refs.dataForm.validateField('repassword')
+        var reg = /^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&*]+$)[a-zA-Z\d!@#$%^&*]+$/
+        if (value.match(reg)) { // 样式匹配
+          if (value.length < 8 || value.length > 16) {
+            callback(new Error('密码长度必须在8到16位之间'))
+          } else {
+            if (this.userForm.repassword !== '') {
+              this.$refs.dataForm.validateField('repassword')
+            }
+          }
+        } else {
+          callback(new Error('必须由数字、字母、字符中至少两种组成'))
         }
+
         callback()
       }
     }
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 16f8bae..3843939 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -130,7 +130,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
-          <el-button size="medium" @click="resetForm"> 重置 </el-button>
+          <el-button size="medium" @click="cancel"> 重置 </el-button>
           <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData"> 保存 </el-button>
         </el-col>
       </el-row>
@@ -185,6 +185,17 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validatePosition = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.length > 50) {
+          callback(new Error('位置长度不能超过50个字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('位置不能为空'))
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -224,7 +235,7 @@
       rules: {
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         wellName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ required: true, message: '闸井详细地址不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, trigger: ['blur', 'change'], validator: validatePosition }],
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
@@ -336,11 +347,23 @@
     },
     // 取消
     cancel() {
-      this.dialogFormVisible = false
-      this.fileList = []
-      // 清除验证
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
+      console.log('取消')
+      this.$confirm(
+        '闸井信息尚未保存，确认重置吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        this.resetForm()
+        this.dialogFormVisible = false
+        this.fileList = []
+        // 清除验证
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       })
     },
     // 重置表单
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 7aa2de9..8513d37 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -170,6 +170,17 @@
         callback(new Error('井深不能为空'))
       }
     }
+    const validatePosition = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.length > 50) {
+          callback(new Error('位置长度不能超过50个字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('位置不能为空'))
+      }
+    }
     const validateLng = (rule, value, callback) => {
       if (value !== '') {
         if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
@@ -230,7 +241,7 @@
       rules: {
         wellCode: [{ required: true, message: '闸井编号不能为空', trigger: ['blur', 'change'] }],
         wellName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
-        position: [{ required: true, message: '闸井详细地址不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, trigger: ['blur', 'change'], validator: validatePosition }],
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index 0db715d..0f9e4a9 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -167,6 +167,7 @@
           responsibleDept: row.responsibleDept // 维护人员部门
         }
         this.center = [row.lngGaode, row.latGaode]
+        this.markers = []
         this.markers.push({ position: [row.lngGaode, row.latGaode] })
         if (row.deptid && row.deptid !== '') {
           this.fetchArea1()
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 7b9d02c..1e7066e 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -48,7 +48,7 @@
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column v-if="hasPerm('/well/delete')" align="center" type="selection" width="55"/>
         <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">