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

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 2eb93c8..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -7,7 +7,7 @@
 // 设备型号名称
 export function getDevice(params) {
   return request({
-    url: 'device/model',
+    url: 'device/type',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceModels/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceModelsId: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 2eb93c8..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -7,7 +7,7 @@
 // 设备型号名称
 export function getDevice(params) {
   return request({
-    url: 'device/model',
+    url: 'device/type',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceModels/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceModelsId: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/api/well/well.js b/src/api/well/well.js
index c7beaa8..51aa8a0 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 通讯方式
+export function communicationType(params) {
+  return request({
+    url: '/sys/dict/code/communicationType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加井
 export function addWell(params) {
   return request({

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 2eb93c8..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -7,7 +7,7 @@
 // 设备型号名称
 export function getDevice(params) {
   return request({
-    url: 'device/model',
+    url: 'device/type',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceModels/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceModelsId: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/api/well/well.js b/src/api/well/well.js
index c7beaa8..51aa8a0 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 通讯方式
+export function communicationType(params) {
+  return request({
+    url: '/sys/dict/code/communicationType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加井
 export function addWell(params) {
   return request({
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
index 0ca37b4..fb76377 100644
--- a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -13,12 +13,21 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
             <el-select
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
-              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -29,17 +38,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
@@ -50,27 +48,17 @@
               multiple
               placeholder="请选择通信方式"
               :disabled="dialogStatus === 'detail' ? true : false"
+              @change="selectChange"
             >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
-                :label="item.label"
+                :label="item.name"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -89,6 +77,7 @@
 </template>
 
 <script>
+import { communicationType } from '@/api/well/well'
 import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'EditDeviceModel',
@@ -97,43 +86,23 @@
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
       deviceTypeList: [],
+      commuList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
         create: '新增',
         detail: '详情'
       },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
       // 表单内容
       deviceForm: {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: [],
-        devcode: ''
+        communication: []
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '型号编号不能为空', trigger: ['blur', 'change'] }],
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
@@ -142,9 +111,20 @@
   },
   created() {
     this.fetchDeviceType()
+    this.fetchcommunType()
   },
   methods: {
-    // 获取设备类型
+    selectChange() {
+      console.log(this.deviceForm.communication)
+    },
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
+      })
+    },
+    // 获取设备型号
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
         this.deviceTypeList = response.data
@@ -153,15 +133,15 @@
     // 重置表单
     resetForm() {
       this.deviceForm = {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: '',
-        devcode: ''
+        communication: ''
       }
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
+      console.log(row, '========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -170,12 +150,11 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
         this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
+          modelName: row.modelName,
+          deviceType: row.deviceType,
           communication: row.communication.split(','),
-          devcode: row.id
+          id: row.id
         }
       }
     },
@@ -205,7 +184,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
           this.deviceForm.communication = this.deviceForm.communication.toString()
           addDeviceModel(this.deviceForm).then(response => {

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 2eb93c8..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -7,7 +7,7 @@
 // 设备型号名称
 export function getDevice(params) {
   return request({
-    url: 'device/model',
+    url: 'device/type',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceModels/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceModelsId: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/api/well/well.js b/src/api/well/well.js
index c7beaa8..51aa8a0 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 通讯方式
+export function communicationType(params) {
+  return request({
+    url: '/sys/dict/code/communicationType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加井
 export function addWell(params) {
   return request({
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
index 0ca37b4..fb76377 100644
--- a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -13,12 +13,21 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
             <el-select
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
-              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -29,17 +38,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
@@ -50,27 +48,17 @@
               multiple
               placeholder="请选择通信方式"
               :disabled="dialogStatus === 'detail' ? true : false"
+              @change="selectChange"
             >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
-                :label="item.label"
+                :label="item.name"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -89,6 +77,7 @@
 </template>
 
 <script>
+import { communicationType } from '@/api/well/well'
 import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'EditDeviceModel',
@@ -97,43 +86,23 @@
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
       deviceTypeList: [],
+      commuList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
         create: '新增',
         detail: '详情'
       },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
       // 表单内容
       deviceForm: {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: [],
-        devcode: ''
+        communication: []
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '型号编号不能为空', trigger: ['blur', 'change'] }],
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
@@ -142,9 +111,20 @@
   },
   created() {
     this.fetchDeviceType()
+    this.fetchcommunType()
   },
   methods: {
-    // 获取设备类型
+    selectChange() {
+      console.log(this.deviceForm.communication)
+    },
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
+      })
+    },
+    // 获取设备型号
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
         this.deviceTypeList = response.data
@@ -153,15 +133,15 @@
     // 重置表单
     resetForm() {
       this.deviceForm = {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: '',
-        devcode: ''
+        communication: ''
       }
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
+      console.log(row, '========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -170,12 +150,11 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
         this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
+          modelName: row.modelName,
+          deviceType: row.deviceType,
           communication: row.communication.split(','),
-          devcode: row.id
+          id: row.id
         }
       }
     },
@@ -205,7 +184,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
           this.deviceForm.communication = this.deviceForm.communication.toString()
           addDeviceModel(this.deviceForm).then(response => {
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index d572c38..83a4c59 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -3,19 +3,12 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-select
+        <el-input
           v-model="listQuery.modelName"
-          placeholder="设备型号"
+          placeholder="请输入设备型号"
           size="small"
           clearable
-        >
-          <el-option
-            v-for="item in deviceModelList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -110,7 +103,7 @@
 
 <script>
 import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
-import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
+import { getDeviceModelList, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
@@ -155,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -166,18 +159,16 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
@@ -191,12 +182,6 @@
       this.listQuery.offset = val
       this.fetchData()
     },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
-    },
     // 查询数据
     search() {
       this.fetchData(false)

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 2eb93c8..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -7,7 +7,7 @@
 // 设备型号名称
 export function getDevice(params) {
   return request({
-    url: 'device/model',
+    url: 'device/type',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceModels/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceModelsId: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/api/well/well.js b/src/api/well/well.js
index c7beaa8..51aa8a0 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 通讯方式
+export function communicationType(params) {
+  return request({
+    url: '/sys/dict/code/communicationType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加井
 export function addWell(params) {
   return request({
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
index 0ca37b4..fb76377 100644
--- a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -13,12 +13,21 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
             <el-select
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
-              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -29,17 +38,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
@@ -50,27 +48,17 @@
               multiple
               placeholder="请选择通信方式"
               :disabled="dialogStatus === 'detail' ? true : false"
+              @change="selectChange"
             >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
-                :label="item.label"
+                :label="item.name"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -89,6 +77,7 @@
 </template>
 
 <script>
+import { communicationType } from '@/api/well/well'
 import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'EditDeviceModel',
@@ -97,43 +86,23 @@
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
       deviceTypeList: [],
+      commuList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
         create: '新增',
         detail: '详情'
       },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
       // 表单内容
       deviceForm: {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: [],
-        devcode: ''
+        communication: []
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '型号编号不能为空', trigger: ['blur', 'change'] }],
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
@@ -142,9 +111,20 @@
   },
   created() {
     this.fetchDeviceType()
+    this.fetchcommunType()
   },
   methods: {
-    // 获取设备类型
+    selectChange() {
+      console.log(this.deviceForm.communication)
+    },
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
+      })
+    },
+    // 获取设备型号
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
         this.deviceTypeList = response.data
@@ -153,15 +133,15 @@
     // 重置表单
     resetForm() {
       this.deviceForm = {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: '',
-        devcode: ''
+        communication: ''
       }
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
+      console.log(row, '========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -170,12 +150,11 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
         this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
+          modelName: row.modelName,
+          deviceType: row.deviceType,
           communication: row.communication.split(','),
-          devcode: row.id
+          id: row.id
         }
       }
     },
@@ -205,7 +184,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
           this.deviceForm.communication = this.deviceForm.communication.toString()
           addDeviceModel(this.deviceForm).then(response => {
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index d572c38..83a4c59 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -3,19 +3,12 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-select
+        <el-input
           v-model="listQuery.modelName"
-          placeholder="设备型号"
+          placeholder="请输入设备型号"
           size="small"
           clearable
-        >
-          <el-option
-            v-for="item in deviceModelList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -110,7 +103,7 @@
 
 <script>
 import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
-import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
+import { getDeviceModelList, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
@@ -155,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -166,18 +159,16 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
@@ -191,12 +182,6 @@
       this.listQuery.offset = val
       this.fetchData()
     },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
-    },
     // 查询数据
     search() {
       this.fetchData(false)
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index 94b8d64..7887a7c 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -8,14 +8,14 @@
       ref="dataForm"
       :rules="rules"
       :model="deviceForm"
-      label-width="100px"
+      label-width="200px"
       label-well-code="right"
     >
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item prop="id">
             <span slot="label">
-              设备编号
+              设备类型编号
               <el-tooltip content="自增设备编号不能超过100" placement="top">
                 <i class="el-icon-warning-outline" />
               </el-tooltip>
@@ -51,19 +51,12 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="typeName">
-            <el-select
+            <el-input
               v-model="deviceForm.typeName"
+              size="small"
               clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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">
@@ -108,13 +101,12 @@
 </template>
 
 <script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+import { updateDeviceType, addDeviceType } from '@/api/device/deviceType'
 export default {
   name: 'EditDeviceType',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
       dialogStatus: '', // 对话框类型：create,update,detail
       // 对话框标题
       textMap: {
@@ -151,16 +143,7 @@
       }
     }
   },
-  created() {
-    this.fetchDeviceType()
-  },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 重置表单
     resetForm() {
       this.deviceForm = {

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 2eb93c8..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -7,7 +7,7 @@
 // 设备型号名称
 export function getDevice(params) {
   return request({
-    url: 'device/model',
+    url: 'device/type',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceModels/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceModelsId: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/api/well/well.js b/src/api/well/well.js
index c7beaa8..51aa8a0 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 通讯方式
+export function communicationType(params) {
+  return request({
+    url: '/sys/dict/code/communicationType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加井
 export function addWell(params) {
   return request({
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
index 0ca37b4..fb76377 100644
--- a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -13,12 +13,21 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
             <el-select
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
-              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -29,17 +38,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
@@ -50,27 +48,17 @@
               multiple
               placeholder="请选择通信方式"
               :disabled="dialogStatus === 'detail' ? true : false"
+              @change="selectChange"
             >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
-                :label="item.label"
+                :label="item.name"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -89,6 +77,7 @@
 </template>
 
 <script>
+import { communicationType } from '@/api/well/well'
 import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'EditDeviceModel',
@@ -97,43 +86,23 @@
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
       deviceTypeList: [],
+      commuList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
         create: '新增',
         detail: '详情'
       },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
       // 表单内容
       deviceForm: {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: [],
-        devcode: ''
+        communication: []
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '型号编号不能为空', trigger: ['blur', 'change'] }],
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
@@ -142,9 +111,20 @@
   },
   created() {
     this.fetchDeviceType()
+    this.fetchcommunType()
   },
   methods: {
-    // 获取设备类型
+    selectChange() {
+      console.log(this.deviceForm.communication)
+    },
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
+      })
+    },
+    // 获取设备型号
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
         this.deviceTypeList = response.data
@@ -153,15 +133,15 @@
     // 重置表单
     resetForm() {
       this.deviceForm = {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: '',
-        devcode: ''
+        communication: ''
       }
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
+      console.log(row, '========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -170,12 +150,11 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
         this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
+          modelName: row.modelName,
+          deviceType: row.deviceType,
           communication: row.communication.split(','),
-          devcode: row.id
+          id: row.id
         }
       }
     },
@@ -205,7 +184,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
           this.deviceForm.communication = this.deviceForm.communication.toString()
           addDeviceModel(this.deviceForm).then(response => {
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index d572c38..83a4c59 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -3,19 +3,12 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-select
+        <el-input
           v-model="listQuery.modelName"
-          placeholder="设备型号"
+          placeholder="请输入设备型号"
           size="small"
           clearable
-        >
-          <el-option
-            v-for="item in deviceModelList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -110,7 +103,7 @@
 
 <script>
 import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
-import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
+import { getDeviceModelList, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
@@ -155,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -166,18 +159,16 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
@@ -191,12 +182,6 @@
       this.listQuery.offset = val
       this.fetchData()
     },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
-    },
     // 查询数据
     search() {
       this.fetchData(false)
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index 94b8d64..7887a7c 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -8,14 +8,14 @@
       ref="dataForm"
       :rules="rules"
       :model="deviceForm"
-      label-width="100px"
+      label-width="200px"
       label-well-code="right"
     >
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item prop="id">
             <span slot="label">
-              设备编号
+              设备类型编号
               <el-tooltip content="自增设备编号不能超过100" placement="top">
                 <i class="el-icon-warning-outline" />
               </el-tooltip>
@@ -51,19 +51,12 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="typeName">
-            <el-select
+            <el-input
               v-model="deviceForm.typeName"
+              size="small"
               clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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">
@@ -108,13 +101,12 @@
 </template>
 
 <script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+import { updateDeviceType, addDeviceType } from '@/api/device/deviceType'
 export default {
   name: 'EditDeviceType',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
       dialogStatus: '', // 对话框类型：create,update,detail
       // 对话框标题
       textMap: {
@@ -151,16 +143,7 @@
       }
     }
   },
-  created() {
-    this.fetchDeviceType()
-  },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index f13326c..3782ba9 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -3,19 +3,12 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-select
+        <el-input
           v-model="listQuery.deviceType"
           size="small"
-          placeholder="设备类型"
           clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+          placeholder="请输入设备类型"
+        />
       </search-item>
       <search-item>
         <el-select
@@ -121,7 +114,7 @@
 
 <script>
 import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
-import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
+import { getDeviceTypeList, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
@@ -129,7 +122,6 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         isValid: '',
         offset: 1,
         limit: 20,
@@ -176,13 +168,11 @@
       total: 0, // 数据总数
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceTypeList: [], // 设备类型列表
       listLoading: true, // 加载动画
       dialogShow: false // 是否显示对话框
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
@@ -196,12 +186,6 @@
       this.listQuery.offset = val
       this.fetchData()
     },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 查询数据
     search() {
       this.fetchData(false)

diff --git a/public/config/project.config.json b/public/config/project.config.json
index f986319..1b2796d 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -2,7 +2,7 @@
   "title": "管网运行监测系统",
   "subtitle": "",
   "theme":"blue",
-  "baseUrl": "http://111.198.10.15:11309/",
+  "baseUrl": "https://38911d91v5.zicp.fun/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "refreshType":"websocket",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 2eb93c8..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -7,7 +7,7 @@
 // 设备型号名称
 export function getDevice(params) {
   return request({
-    url: 'device/model',
+    url: 'device/type',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceModels/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceModelsId: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })
diff --git a/src/api/well/well.js b/src/api/well/well.js
index c7beaa8..51aa8a0 100644
--- a/src/api/well/well.js
+++ b/src/api/well/well.js
@@ -32,6 +32,15 @@
   })
 }
 
+// 通讯方式
+export function communicationType(params) {
+  return request({
+    url: '/sys/dict/code/communicationType',
+    method: 'get',
+    params
+  })
+}
+
 // 添加井
 export function addWell(params) {
   return request({
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
index 0ca37b4..fb76377 100644
--- a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -13,12 +13,21 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
             <el-select
               v-model="deviceForm.deviceType"
               placeholder="请选择设备类型"
               clearable
-              :disabled="dialogStatus === 'create' ? false : true"
             >
               <el-option
                 v-for="item in deviceTypeList"
@@ -29,17 +38,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
@@ -50,27 +48,17 @@
               multiple
               placeholder="请选择通信方式"
               :disabled="dialogStatus === 'detail' ? true : false"
+              @change="selectChange"
             >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
-                :label="item.label"
+                :label="item.name"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -89,6 +77,7 @@
 </template>
 
 <script>
+import { communicationType } from '@/api/well/well'
 import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'EditDeviceModel',
@@ -97,43 +86,23 @@
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
       deviceTypeList: [],
+      commuList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
         create: '新增',
         detail: '详情'
       },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
       // 表单内容
       deviceForm: {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: [],
-        devcode: ''
+        communication: []
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '型号编号不能为空', trigger: ['blur', 'change'] }],
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
@@ -142,9 +111,20 @@
   },
   created() {
     this.fetchDeviceType()
+    this.fetchcommunType()
   },
   methods: {
-    // 获取设备类型
+    selectChange() {
+      console.log(this.deviceForm.communication)
+    },
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
+      })
+    },
+    // 获取设备型号
     fetchDeviceType() {
       getDevice(this.listQuery).then(response => {
         this.deviceTypeList = response.data
@@ -153,15 +133,15 @@
     // 重置表单
     resetForm() {
       this.deviceForm = {
+        id: '',
         modelName: '',
         deviceType: '',
-        communication: '',
-        devcode: ''
+        communication: ''
       }
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
+      console.log(row, '========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -170,12 +150,11 @@
           this.$refs['dataForm'].clearValidate()
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
         this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
+          modelName: row.modelName,
+          deviceType: row.deviceType,
           communication: row.communication.split(','),
-          devcode: row.id
+          id: row.id
         }
       }
     },
@@ -205,7 +184,6 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
           this.deviceForm.communication = this.deviceForm.communication.toString()
           addDeviceModel(this.deviceForm).then(response => {
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index d572c38..83a4c59 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -3,19 +3,12 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-select
+        <el-input
           v-model="listQuery.modelName"
-          placeholder="设备型号"
+          placeholder="请输入设备型号"
           size="small"
           clearable
-        >
-          <el-option
-            v-for="item in deviceModelList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -110,7 +103,7 @@
 
 <script>
 import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
-import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
+import { getDeviceModelList, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
@@ -155,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -166,18 +159,16 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
@@ -191,12 +182,6 @@
       this.listQuery.offset = val
       this.fetchData()
     },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
-    },
     // 查询数据
     search() {
       this.fetchData(false)
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index 94b8d64..7887a7c 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -8,14 +8,14 @@
       ref="dataForm"
       :rules="rules"
       :model="deviceForm"
-      label-width="100px"
+      label-width="200px"
       label-well-code="right"
     >
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item prop="id">
             <span slot="label">
-              设备编号
+              设备类型编号
               <el-tooltip content="自增设备编号不能超过100" placement="top">
                 <i class="el-icon-warning-outline" />
               </el-tooltip>
@@ -51,19 +51,12 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备类型" prop="typeName">
-            <el-select
+            <el-input
               v-model="deviceForm.typeName"
+              size="small"
               clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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">
@@ -108,13 +101,12 @@
 </template>
 
 <script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+import { updateDeviceType, addDeviceType } from '@/api/device/deviceType'
 export default {
   name: 'EditDeviceType',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
       dialogStatus: '', // 对话框类型：create,update,detail
       // 对话框标题
       textMap: {
@@ -151,16 +143,7 @@
       }
     }
   },
-  created() {
-    this.fetchDeviceType()
-  },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index f13326c..3782ba9 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -3,19 +3,12 @@
     <!--筛选条件-->
     <search-area size="small" @search="search">
       <search-item>
-        <el-select
+        <el-input
           v-model="listQuery.deviceType"
           size="small"
-          placeholder="设备类型"
           clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+          placeholder="请输入设备类型"
+        />
       </search-item>
       <search-item>
         <el-select
@@ -121,7 +114,7 @@
 
 <script>
 import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
-import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
+import { getDeviceTypeList, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
@@ -129,7 +122,6 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         isValid: '',
         offset: 1,
         limit: 20,
@@ -176,13 +168,11 @@
       total: 0, // 数据总数
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceTypeList: [], // 设备类型列表
       listLoading: true, // 加载动画
       dialogShow: false // 是否显示对话框
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
@@ -196,12 +186,6 @@
       this.listQuery.offset = val
       this.fetchData()
     },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 查询数据
     search() {
       this.fetchData(false)
diff --git a/src/views/wellManage/detailMapLonLat.vue b/src/views/wellManage/detailMapLonLat.vue
index 981c3f5..89d14ac 100644
--- a/src/views/wellManage/detailMapLonLat.vue
+++ b/src/views/wellManage/detailMapLonLat.vue
@@ -11,7 +11,7 @@
           :center="center"
           :zoom="zoom"
           :base-layer="baseLayer"
-          :style="{height:(bodyHeight-200)+'px'}"
+          :style="{height:(bodyHeight-400)+'px'}"
           vid="choose-position"
           class="map-demo"
           @ready="mapReady"
@@ -62,11 +62,15 @@
 import { mapGetters } from 'vuex'
 import AMapContainer from '@/components/Amap/AMapContainer'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import { toSize } from '@/components/Amap/utils/convert-helper'
 export default {
   name: 'DetailMapLonLat',
   components: { AMapContainer },
   data() {
     return {
+      searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
+      searchResultSize: [24, 30],
+      locationMarker: '',
       postionlatlon: '',
       postionForm: {
         longitude: '', // 经度
@@ -117,6 +121,20 @@
         _this.postionForm.longitude = e.lnglat.lng
         _this.postionForm.latitude = e.lnglat.lat
         _this.postionlatlon = e.lnglat.lng + ',' + e.lnglat.lat
+
+        const { searchResultIcon, searchResultSize } = this
+        const icon = new window.AMap.Icon({
+          size: toSize(searchResultSize), // 图标尺寸
+          image: searchResultIcon, // Icon的图像
+          imageSize: toSize(searchResultSize) // 根据所设置的大小拉伸或压缩图片
+        })
+        this.locationMarker = new window.AMap.Marker({
+          icon: icon,
+          position: [117.05887, 39.561801],
+          draggable: true,
+          cursor: 'move'
+        })
+        this.locationMarker.setMap(this.map)
       })
     },
     initDialog(val) {