diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 5099a0c..87ce8d2 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -113,9 +113,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -169,12 +169,12 @@
           align: 'center'
         },
         {
-          text: '型号名称',
+          text: '型号',
           value: 'modelName',
           align: 'center'
         },
         {
-          text: '设备类型名称',
+          text: '设备类型',
           value: 'deviceTypeName',
           align: 'center'
         },

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 5099a0c..87ce8d2 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -113,9 +113,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -169,12 +169,12 @@
           align: 'center'
         },
         {
-          text: '型号名称',
+          text: '型号',
           value: 'modelName',
           align: 'center'
         },
         {
-          text: '设备类型名称',
+          text: '设备类型',
           value: 'deviceTypeName',
           align: 'center'
         },
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 805e850..e195efb 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
@@ -232,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 5099a0c..87ce8d2 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -113,9 +113,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -169,12 +169,12 @@
           align: 'center'
         },
         {
-          text: '型号名称',
+          text: '型号',
           value: 'modelName',
           align: 'center'
         },
         {
-          text: '设备类型名称',
+          text: '设备类型',
           value: 'deviceTypeName',
           align: 'center'
         },
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 805e850..e195efb 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
@@ -232,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index f9dabd4..d079f06 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -109,9 +109,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 5099a0c..87ce8d2 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -113,9 +113,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -169,12 +169,12 @@
           align: 'center'
         },
         {
-          text: '型号名称',
+          text: '型号',
           value: 'modelName',
           align: 'center'
         },
         {
-          text: '设备类型名称',
+          text: '设备类型',
           value: 'deviceTypeName',
           align: 'center'
         },
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 805e850..e195efb 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
@@ -232,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index f9dabd4..d079f06 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -109,9 +109,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
index a835d47..0ea149c 100644
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
@@ -13,20 +13,13 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
               clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+              placeholder="请输入告警内容"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,16 +41,23 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
               clearable
-              placeholder="请输入告警内容"
-            />
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -170,9 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update') {
+        console.log(row)
         this.deviceForm = {
           alarmType: row.alarmType,
-          alarmContent: row.deviceType,
+          alarmContent: row.alarmContent,
           devcode: row.id,
           deviceType: row.deviceType.split(',')
         }

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 5099a0c..87ce8d2 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -113,9 +113,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -169,12 +169,12 @@
           align: 'center'
         },
         {
-          text: '型号名称',
+          text: '型号',
           value: 'modelName',
           align: 'center'
         },
         {
-          text: '设备类型名称',
+          text: '设备类型',
           value: 'deviceTypeName',
           align: 'center'
         },
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 805e850..e195efb 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
@@ -232,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index f9dabd4..d079f06 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -109,9 +109,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
index a835d47..0ea149c 100644
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
@@ -13,20 +13,13 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
               clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+              placeholder="请输入告警内容"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,16 +41,23 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
               clearable
-              placeholder="请输入告警内容"
-            />
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -170,9 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update') {
+        console.log(row)
         this.deviceForm = {
           alarmType: row.alarmType,
-          alarmContent: row.deviceType,
+          alarmContent: row.alarmContent,
           devcode: row.id,
           deviceType: row.deviceType.split(',')
         }
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 6cbe81a..f203f26 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,14 +73,12 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-Alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-// 引用封装组件
 import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
-// 接口调用
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
@@ -114,11 +112,6 @@
       ],
       columns: [
         {
-          text: '设备编号',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '告警类型',
           value: 'alarmType',
           align: 'center'
@@ -201,33 +194,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
   .searchBottom{
     border-bottom: 12px solid #ebebeb;
   }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
 </style>

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 5099a0c..87ce8d2 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -113,9 +113,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -169,12 +169,12 @@
           align: 'center'
         },
         {
-          text: '型号名称',
+          text: '型号',
           value: 'modelName',
           align: 'center'
         },
         {
-          text: '设备类型名称',
+          text: '设备类型',
           value: 'deviceTypeName',
           align: 'center'
         },
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 805e850..e195efb 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
@@ -232,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index f9dabd4..d079f06 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -109,9 +109,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
index a835d47..0ea149c 100644
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
@@ -13,20 +13,13 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
               clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+              placeholder="请输入告警内容"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,16 +41,23 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
               clearable
-              placeholder="请输入告警内容"
-            />
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -170,9 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update') {
+        console.log(row)
         this.deviceForm = {
           alarmType: row.alarmType,
-          alarmContent: row.deviceType,
+          alarmContent: row.alarmContent,
           devcode: row.id,
           deviceType: row.deviceType.split(',')
         }
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 6cbe81a..f203f26 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,14 +73,12 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-Alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-// 引用封装组件
 import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
-// 接口调用
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
@@ -114,11 +112,6 @@
       ],
       columns: [
         {
-          text: '设备编号',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '告警类型',
           value: 'alarmType',
           align: 'center'
@@ -201,33 +194,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
   .searchBottom{
     border-bottom: 12px solid #ebebeb;
   }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
 </style>
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
index 40fef65..5d75707 100644
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
@@ -69,7 +69,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织id" prop="deptid">
             <el-input
@@ -170,7 +170,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
           deptid: row.deptid,
           wellType: row.wellType,

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 5099a0c..87ce8d2 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -113,9 +113,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -169,12 +169,12 @@
           align: 'center'
         },
         {
-          text: '型号名称',
+          text: '型号',
           value: 'modelName',
           align: 'center'
         },
         {
-          text: '设备类型名称',
+          text: '设备类型',
           value: 'deviceTypeName',
           align: 'center'
         },
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 805e850..e195efb 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
@@ -232,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index f9dabd4..d079f06 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -109,9 +109,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
index a835d47..0ea149c 100644
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
@@ -13,20 +13,13 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
               clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+              placeholder="请输入告警内容"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,16 +41,23 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
               clearable
-              placeholder="请输入告警内容"
-            />
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -170,9 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update') {
+        console.log(row)
         this.deviceForm = {
           alarmType: row.alarmType,
-          alarmContent: row.deviceType,
+          alarmContent: row.alarmContent,
           devcode: row.id,
           deviceType: row.deviceType.split(',')
         }
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 6cbe81a..f203f26 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,14 +73,12 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-Alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-// 引用封装组件
 import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
-// 接口调用
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
@@ -114,11 +112,6 @@
       ],
       columns: [
         {
-          text: '设备编号',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '告警类型',
           value: 'alarmType',
           align: 'center'
@@ -201,33 +194,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
   .searchBottom{
     border-bottom: 12px solid #ebebeb;
   }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
 </style>
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
index 40fef65..5d75707 100644
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
@@ -69,7 +69,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织id" prop="deptid">
             <el-input
@@ -170,7 +170,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
           deptid: row.deptid,
           wellType: row.wellType,
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
index 30f4f06..738c5b1 100644
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ b/src/views/systemConfig/deptPermission/listDept.vue
@@ -11,11 +11,18 @@
     >
       <!--一般查询条件-->
       <search-item>
-        <el-input
+        <el-select
           v-model="listQuery.deptid"
           placeholder="组织id"
           clearable
-        />
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
       </search-item>
     </search-area>
     <normal-table
@@ -53,9 +60,7 @@
 </template>
 
 <script>
-// 引用封装组件
 import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-// 接口调用
 import { deptList, delDept } from '@/api/systemConfig/deptPermission'
 
 export default {
@@ -70,13 +75,18 @@
         sort: 'id',
         order: 'asc'
       },
-      columns: [
+      deptidList: [
         {
-          text: '组织id',
-          value: 'deptid',
-          align: 'center'
+          label: '3213213',
+          value: '0'
         },
         {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
           text: '组织名称',
           value: 'deptName',
           align: 'center'
@@ -92,12 +102,12 @@
           align: 'center'
         },
         {
-          text: '经度',
+          text: '地图默认中心经度',
           value: 'lng',
           align: 'center'
         },
         {
-          text: '纬度',
+          text: '地图默认中心纬度',
           value: 'lat',
           align: 'center'
         }
@@ -166,33 +176,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
   .searchBottom{
     border-bottom: 12px solid #ebebeb;
   }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
 </style>

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 5099a0c..87ce8d2 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -113,9 +113,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -169,12 +169,12 @@
           align: 'center'
         },
         {
-          text: '型号名称',
+          text: '型号',
           value: 'modelName',
           align: 'center'
         },
         {
-          text: '设备类型名称',
+          text: '设备类型',
           value: 'deviceTypeName',
           align: 'center'
         },
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 805e850..e195efb 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
@@ -232,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index f9dabd4..d079f06 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -109,9 +109,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
index a835d47..0ea149c 100644
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
@@ -13,20 +13,13 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
               clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+              placeholder="请输入告警内容"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,16 +41,23 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
               clearable
-              placeholder="请输入告警内容"
-            />
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -170,9 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update') {
+        console.log(row)
         this.deviceForm = {
           alarmType: row.alarmType,
-          alarmContent: row.deviceType,
+          alarmContent: row.alarmContent,
           devcode: row.id,
           deviceType: row.deviceType.split(',')
         }
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 6cbe81a..f203f26 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,14 +73,12 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-Alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-// 引用封装组件
 import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
-// 接口调用
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
@@ -114,11 +112,6 @@
       ],
       columns: [
         {
-          text: '设备编号',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '告警类型',
           value: 'alarmType',
           align: 'center'
@@ -201,33 +194,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
   .searchBottom{
     border-bottom: 12px solid #ebebeb;
   }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
 </style>
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
index 40fef65..5d75707 100644
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
@@ -69,7 +69,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织id" prop="deptid">
             <el-input
@@ -170,7 +170,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
           deptid: row.deptid,
           wellType: row.wellType,
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
index 30f4f06..738c5b1 100644
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ b/src/views/systemConfig/deptPermission/listDept.vue
@@ -11,11 +11,18 @@
     >
       <!--一般查询条件-->
       <search-item>
-        <el-input
+        <el-select
           v-model="listQuery.deptid"
           placeholder="组织id"
           clearable
-        />
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
       </search-item>
     </search-area>
     <normal-table
@@ -53,9 +60,7 @@
 </template>
 
 <script>
-// 引用封装组件
 import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-// 接口调用
 import { deptList, delDept } from '@/api/systemConfig/deptPermission'
 
 export default {
@@ -70,13 +75,18 @@
         sort: 'id',
         order: 'asc'
       },
-      columns: [
+      deptidList: [
         {
-          text: '组织id',
-          value: 'deptid',
-          align: 'center'
+          label: '3213213',
+          value: '0'
         },
         {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
           text: '组织名称',
           value: 'deptName',
           align: 'center'
@@ -92,12 +102,12 @@
           align: 'center'
         },
         {
-          text: '经度',
+          text: '地图默认中心经度',
           value: 'lng',
           align: 'center'
         },
         {
-          text: '纬度',
+          text: '地图默认中心纬度',
           value: 'lat',
           align: 'center'
         }
@@ -166,33 +176,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
   .searchBottom{
     border-bottom: 12px solid #ebebeb;
   }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
index ab7432e..7ca5297 100644
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
@@ -95,7 +95,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="项目id" prop="devcode">
             <el-input
               v-model="deviceForm.devcode"
@@ -268,7 +268,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
           communication: row.communication.split(','),
           coordinateType: row.coordinateType,
@@ -331,8 +331,17 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
   }
 </style>

diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
index ca0a010..dfc1ac4 100644
--- a/mock/systemConfig/tenantConfig.js
+++ b/mock/systemConfig/tenantConfig.js
@@ -2,7 +2,7 @@
   {
     'tenentId': '4324324234',
     'tenantName': '项目名称一',
-    'communication': '联通移动NB,电信NB',
+    'communication': '联通移动NB,电信NB,联通移动NB,电信NB',
     'coordinateType': 'WGS84,BD09,GCJ02',
     'isJobGenerate': '是',
     'isAppPush': '是',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
index 8594fd0..f2694ca 100644
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -172,9 +172,3 @@
   }
 }
 </script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index bc3d8c2..6972054 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -84,12 +84,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index 394b24c..7e32e6d 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -18,6 +18,7 @@
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
+              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -59,7 +60,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -146,7 +147,7 @@
     // 获取设备类型
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
+        this.deviceTypeList = response.data
       })
     },
     // 重置表单
@@ -169,10 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
+        console.log(row)
         this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
           communication: row.communication.split(','),
           devcode: row.id
         }
@@ -231,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 5099a0c..87ce8d2 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -113,9 +113,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -169,12 +169,12 @@
           align: 'center'
         },
         {
-          text: '型号名称',
+          text: '型号',
           value: 'modelName',
           align: 'center'
         },
         {
-          text: '设备类型名称',
+          text: '设备类型',
           value: 'deviceTypeName',
           align: 'center'
         },
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 805e850..e195efb 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
@@ -232,8 +232,3 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index f9dabd4..d079f06 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -86,12 +86,12 @@
           type="selection"
           width="55"
         />
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           type="index"
           label="序号"
           width="55"
-        />
+        /> -->
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -109,9 +109,9 @@
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
index a835d47..0ea149c 100644
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
@@ -13,20 +13,13 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
               clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
+              placeholder="请输入告警内容"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,16 +41,23 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
               clearable
-              placeholder="请输入告警内容"
-            />
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -170,9 +170,10 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update') {
+        console.log(row)
         this.deviceForm = {
           alarmType: row.alarmType,
-          alarmContent: row.deviceType,
+          alarmContent: row.alarmContent,
           devcode: row.id,
           deviceType: row.deviceType.split(',')
         }
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 6cbe81a..f203f26 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,14 +73,12 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-Alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-// 引用封装组件
 import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
-// 接口调用
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
@@ -114,11 +112,6 @@
       ],
       columns: [
         {
-          text: '设备编号',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '告警类型',
           value: 'alarmType',
           align: 'center'
@@ -201,33 +194,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
   .searchBottom{
     border-bottom: 12px solid #ebebeb;
   }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
 </style>
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
index 40fef65..5d75707 100644
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
@@ -69,7 +69,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :gutter="20">
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织id" prop="deptid">
             <el-input
@@ -170,7 +170,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
           deptid: row.deptid,
           wellType: row.wellType,
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
index 30f4f06..738c5b1 100644
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ b/src/views/systemConfig/deptPermission/listDept.vue
@@ -11,11 +11,18 @@
     >
       <!--一般查询条件-->
       <search-item>
-        <el-input
+        <el-select
           v-model="listQuery.deptid"
           placeholder="组织id"
           clearable
-        />
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
       </search-item>
     </search-area>
     <normal-table
@@ -53,9 +60,7 @@
 </template>
 
 <script>
-// 引用封装组件
 import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-// 接口调用
 import { deptList, delDept } from '@/api/systemConfig/deptPermission'
 
 export default {
@@ -70,13 +75,18 @@
         sort: 'id',
         order: 'asc'
       },
-      columns: [
+      deptidList: [
         {
-          text: '组织id',
-          value: 'deptid',
-          align: 'center'
+          label: '3213213',
+          value: '0'
         },
         {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
           text: '组织名称',
           value: 'deptName',
           align: 'center'
@@ -92,12 +102,12 @@
           align: 'center'
         },
         {
-          text: '经度',
+          text: '地图默认中心经度',
           value: 'lng',
           align: 'center'
         },
         {
-          text: '纬度',
+          text: '地图默认中心纬度',
           value: 'lat',
           align: 'center'
         }
@@ -166,33 +176,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
   .searchBottom{
     border-bottom: 12px solid #ebebeb;
   }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
index ab7432e..7ca5297 100644
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
@@ -95,7 +95,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :span="12">
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
           <el-form-item label="项目id" prop="devcode">
             <el-input
               v-model="deviceForm.devcode"
@@ -268,7 +268,7 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (this.dialogStatus === 'update') {
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
           communication: row.communication.split(','),
           coordinateType: row.coordinateType,
@@ -331,8 +331,17 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
   }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
index 872942d..26ac194 100644
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ b/src/views/systemConfig/tenantConfig/listTenant.vue
@@ -48,14 +48,12 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-Alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-// 引用封装组件
 import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
-// 接口调用
 import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 
 export default {
@@ -72,7 +70,7 @@
       },
       columns: [
         {
-          text: '项目id',
+          text: '编号',
           value: 'tenentId',
           align: 'center'
         },
@@ -110,11 +108,6 @@
           text: '报警推送规则',
           value: 'alarmPushType',
           align: 'center'
-        },
-        {
-          text: '报警推送规则名称',
-          value: 'alarmPushTypeName',
-          align: 'center'
         }
       ], // 显示列
       listLoading: false,
@@ -181,33 +174,7 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
   .searchBottom{
     border-bottom: 12px solid #ebebeb;
   }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
 </style>