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/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..633fe89 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/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..633fe89 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/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..633fe89 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/overview/overview.vue b/src/views/overview/overview.vue
index 8f5e084..e83fdf4 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -228,7 +228,6 @@
           init(o) {
             // o 是高德地图定位插件实例
             o.getCurrentPosition((status, result) => {
-              debugger
               if (result && result.position) {
                 console.log('geolocation')
                 console.log(result)