diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: ids
     },
     paramsSerializer: params => {
       return qs.stringify(params, { indices: false })

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: 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/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: 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/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: 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 6a0a8b9..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显示-->
@@ -90,13 +83,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -107,9 +114,11 @@
         modelName: '',
         communication: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      total: 0, // 数据总数
       commuList: [
         {
           label: 'LORA',
@@ -139,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -150,36 +159,43 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceModelList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response)
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: 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 6a0a8b9..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显示-->
@@ -90,13 +83,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -107,9 +114,11 @@
         modelName: '',
         communication: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      total: 0, // 数据总数
       commuList: [
         {
           label: 'LORA',
@@ -139,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -150,36 +159,43 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceModelList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response)
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index c05674f..7887a7c 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -8,25 +8,26 @@
       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 label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
+          <el-form-item prop="id">
+            <span slot="label">
+              设备类型编号
+              <el-tooltip content="自增设备编号不能超过100" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
+            <el-input
+              v-model.trim="deviceForm.id"
+              maxlength="3"
+              type="text"
+              placeholder="请输入设备编号"
               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>
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -47,15 +48,25 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
+          <el-form-item label="设备类型" prop="typeName">
             <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
+              v-model="deviceForm.typeName"
+              size="small"
               clearable
+              placeholder="请输入设备类型"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
         </el-col>
@@ -72,17 +83,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -101,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: {
@@ -128,6 +127,7 @@
       ],
       // 表单内容
       deviceForm: {
+        id: '',
         devcode: '',
         typeName: '',
         typeDescription: '',
@@ -136,26 +136,18 @@
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
         watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
-  created() {
-    this.fetchDeviceType()
-  },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
-        devcode: '',
+        id: '',
         typeName: '',
         typeDescription: '',
         valid: '',
@@ -164,6 +156,7 @@
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
+      console.log(row, ' ==========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -173,7 +166,7 @@
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
-          devcode: row.id,
+          id: row.id,
           typeName: row.typeName,
           typeDescription: row.typeDescription,
           valid: row.valid,

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: 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 6a0a8b9..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显示-->
@@ -90,13 +83,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -107,9 +114,11 @@
         modelName: '',
         communication: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      total: 0, // 数据总数
       commuList: [
         {
           label: 'LORA',
@@ -139,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -150,36 +159,43 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceModelList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response)
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index c05674f..7887a7c 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -8,25 +8,26 @@
       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 label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
+          <el-form-item prop="id">
+            <span slot="label">
+              设备类型编号
+              <el-tooltip content="自增设备编号不能超过100" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
+            <el-input
+              v-model.trim="deviceForm.id"
+              maxlength="3"
+              type="text"
+              placeholder="请输入设备编号"
               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>
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -47,15 +48,25 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
+          <el-form-item label="设备类型" prop="typeName">
             <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
+              v-model="deviceForm.typeName"
+              size="small"
               clearable
+              placeholder="请输入设备类型"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
         </el-col>
@@ -72,17 +83,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -101,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: {
@@ -128,6 +127,7 @@
       ],
       // 表单内容
       deviceForm: {
+        id: '',
         devcode: '',
         typeName: '',
         typeDescription: '',
@@ -136,26 +136,18 @@
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
         watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
-  created() {
-    this.fetchDeviceType()
-  },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
-        devcode: '',
+        id: '',
         typeName: '',
         typeDescription: '',
         valid: '',
@@ -164,6 +156,7 @@
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
+      console.log(row, ' ==========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -173,7 +166,7 @@
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
-          devcode: row.id,
+          id: row.id,
           typeName: row.typeName,
           typeDescription: row.typeDescription,
           valid: row.valid,
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 8724510..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
@@ -101,13 +94,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -115,9 +122,9 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         isValid: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
@@ -158,33 +165,41 @@
           align: 'center'
         }
       ], // 显示列
+      total: 0, // 数据总数
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceTypeList: [], // 设备类型列表
       listLoading: true, // 加载动画
       dialogShow: false // 是否显示对话框
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceTypeList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response, '======response')
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: 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 6a0a8b9..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显示-->
@@ -90,13 +83,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -107,9 +114,11 @@
         modelName: '',
         communication: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      total: 0, // 数据总数
       commuList: [
         {
           label: 'LORA',
@@ -139,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -150,36 +159,43 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceModelList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response)
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index c05674f..7887a7c 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -8,25 +8,26 @@
       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 label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
+          <el-form-item prop="id">
+            <span slot="label">
+              设备类型编号
+              <el-tooltip content="自增设备编号不能超过100" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
+            <el-input
+              v-model.trim="deviceForm.id"
+              maxlength="3"
+              type="text"
+              placeholder="请输入设备编号"
               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>
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -47,15 +48,25 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
+          <el-form-item label="设备类型" prop="typeName">
             <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
+              v-model="deviceForm.typeName"
+              size="small"
               clearable
+              placeholder="请输入设备类型"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
         </el-col>
@@ -72,17 +83,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -101,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: {
@@ -128,6 +127,7 @@
       ],
       // 表单内容
       deviceForm: {
+        id: '',
         devcode: '',
         typeName: '',
         typeDescription: '',
@@ -136,26 +136,18 @@
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
         watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
-  created() {
-    this.fetchDeviceType()
-  },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
-        devcode: '',
+        id: '',
         typeName: '',
         typeDescription: '',
         valid: '',
@@ -164,6 +156,7 @@
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
+      console.log(row, ' ==========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -173,7 +166,7 @@
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
-          devcode: row.id,
+          id: row.id,
           typeName: row.typeName,
           typeDescription: row.typeDescription,
           valid: row.valid,
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 8724510..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
@@ -101,13 +94,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -115,9 +122,9 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         isValid: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
@@ -158,33 +165,41 @@
           align: 'center'
         }
       ], // 显示列
+      total: 0, // 数据总数
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceTypeList: [], // 设备类型列表
       listLoading: true, // 加载动画
       dialogShow: false // 是否显示对话框
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceTypeList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response, '======response')
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index d92669b..aa8e734 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -208,7 +208,7 @@
     // 获取工单详情
     getJobInfo: function(jobId) {
       this.loading = true
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       getJobInfo(jobId).then(response => {
         this.loading = false
         if (response.code === 200) {

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: 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 6a0a8b9..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显示-->
@@ -90,13 +83,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -107,9 +114,11 @@
         modelName: '',
         communication: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      total: 0, // 数据总数
       commuList: [
         {
           label: 'LORA',
@@ -139,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -150,36 +159,43 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceModelList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response)
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index c05674f..7887a7c 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -8,25 +8,26 @@
       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 label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
+          <el-form-item prop="id">
+            <span slot="label">
+              设备类型编号
+              <el-tooltip content="自增设备编号不能超过100" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
+            <el-input
+              v-model.trim="deviceForm.id"
+              maxlength="3"
+              type="text"
+              placeholder="请输入设备编号"
               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>
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -47,15 +48,25 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
+          <el-form-item label="设备类型" prop="typeName">
             <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
+              v-model="deviceForm.typeName"
+              size="small"
               clearable
+              placeholder="请输入设备类型"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
         </el-col>
@@ -72,17 +83,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -101,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: {
@@ -128,6 +127,7 @@
       ],
       // 表单内容
       deviceForm: {
+        id: '',
         devcode: '',
         typeName: '',
         typeDescription: '',
@@ -136,26 +136,18 @@
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
         watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
-  created() {
-    this.fetchDeviceType()
-  },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
-        devcode: '',
+        id: '',
         typeName: '',
         typeDescription: '',
         valid: '',
@@ -164,6 +156,7 @@
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
+      console.log(row, ' ==========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -173,7 +166,7 @@
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
-          devcode: row.id,
+          id: row.id,
           typeName: row.typeName,
           typeDescription: row.typeDescription,
           valid: row.valid,
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 8724510..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
@@ -101,13 +94,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -115,9 +122,9 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         isValid: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
@@ -158,33 +165,41 @@
           align: 'center'
         }
       ], // 显示列
+      total: 0, // 数据总数
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceTypeList: [], // 设备类型列表
       listLoading: true, // 加载动画
       dialogShow: false // 是否显示对话框
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceTypeList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response, '======response')
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index d92669b..aa8e734 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -208,7 +208,7 @@
     // 获取工单详情
     getJobInfo: function(jobId) {
       this.loading = true
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       getJobInfo(jobId).then(response => {
         this.loading = false
         if (response.code === 200) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 143a7b6..3a733b5 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -248,7 +248,7 @@
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
+      uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -460,7 +460,7 @@
     // 图片上传
     uploadFile(file) {
       console.log('uploadFile:' + file.file.name)
-      // const base_url = process.env.BASE_API + '/static/'
+      // const base_url = this.baseConfig.baseUrl + '/static/'
       Uploadimg(file).then(res => {
         if (res.code === 200) {
           this.fileList.push({ name: file.file.name, url: res.data })
@@ -521,7 +521,7 @@
     },
     handleSuccess(response, file, fileList) {
       console.log('handleSuccess')
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       if (response.code === 200) {
         this.fileList.push({ name: file.file.name, url: base_url + response.data })
         this.handleChange()

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: 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 6a0a8b9..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显示-->
@@ -90,13 +83,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -107,9 +114,11 @@
         modelName: '',
         communication: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      total: 0, // 数据总数
       commuList: [
         {
           label: 'LORA',
@@ -139,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -150,36 +159,43 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceModelList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response)
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index c05674f..7887a7c 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -8,25 +8,26 @@
       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 label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
+          <el-form-item prop="id">
+            <span slot="label">
+              设备类型编号
+              <el-tooltip content="自增设备编号不能超过100" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
+            <el-input
+              v-model.trim="deviceForm.id"
+              maxlength="3"
+              type="text"
+              placeholder="请输入设备编号"
               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>
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -47,15 +48,25 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
+          <el-form-item label="设备类型" prop="typeName">
             <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
+              v-model="deviceForm.typeName"
+              size="small"
               clearable
+              placeholder="请输入设备类型"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
         </el-col>
@@ -72,17 +83,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -101,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: {
@@ -128,6 +127,7 @@
       ],
       // 表单内容
       deviceForm: {
+        id: '',
         devcode: '',
         typeName: '',
         typeDescription: '',
@@ -136,26 +136,18 @@
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
         watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
-  created() {
-    this.fetchDeviceType()
-  },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
-        devcode: '',
+        id: '',
         typeName: '',
         typeDescription: '',
         valid: '',
@@ -164,6 +156,7 @@
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
+      console.log(row, ' ==========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -173,7 +166,7 @@
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
-          devcode: row.id,
+          id: row.id,
           typeName: row.typeName,
           typeDescription: row.typeDescription,
           valid: row.valid,
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 8724510..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
@@ -101,13 +94,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -115,9 +122,9 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         isValid: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
@@ -158,33 +165,41 @@
           align: 'center'
         }
       ], // 显示列
+      total: 0, // 数据总数
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceTypeList: [], // 设备类型列表
       listLoading: true, // 加载动画
       dialogShow: false // 是否显示对话框
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceTypeList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response, '======response')
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index d92669b..aa8e734 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -208,7 +208,7 @@
     // 获取工单详情
     getJobInfo: function(jobId) {
       this.loading = true
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       getJobInfo(jobId).then(response => {
         this.loading = false
         if (response.code === 200) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 143a7b6..3a733b5 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -248,7 +248,7 @@
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
+      uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -460,7 +460,7 @@
     // 图片上传
     uploadFile(file) {
       console.log('uploadFile:' + file.file.name)
-      // const base_url = process.env.BASE_API + '/static/'
+      // const base_url = this.baseConfig.baseUrl + '/static/'
       Uploadimg(file).then(res => {
         if (res.code === 200) {
           this.fileList.push({ name: file.file.name, url: res.data })
@@ -521,7 +521,7 @@
     },
     handleSuccess(response, file, fileList) {
       console.log('handleSuccess')
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       if (response.code === 200) {
         this.fileList.push({ name: file.file.name, url: base_url + response.data })
         this.handleChange()
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) {

diff --git a/mock/deviceManage/deviceModels.js b/mock/deviceManage/deviceModels.js
index 12ecabb..84882eb 100644
--- a/mock/deviceManage/deviceModels.js
+++ b/mock/deviceManage/deviceModels.js
@@ -40,29 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '3G,4G'
-  },
-  {
-    'id': '112343243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '4G'
-  },
-  {
-    'id': '119983243249864',
-    'modelName': '井盖状态检测仪',
-    'deviceType': '设备类型主键',
-    'deviceTypeName': '检测井盖状态',
-    'communication': '联通移动NB'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -76,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceModels/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 69e9100..84882eb 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -40,22 +40,6 @@
     'value': '19'
   }
 ]
-const deviceTableList = [
-  {
-    'id': '112343243242341',
-    'typeName': '井盖状态检测仪',
-    'typeDescription': '检测井盖状态',
-    'valid': '是',
-    'watchType': '监控检测井盖状态'
-  },
-  {
-    'id': '112343243242986',
-    'typeName': '有害气体检测仪',
-    'typeDescription': '检测气体类型',
-    'valid': '否',
-    'watchType': '监控气体类型'
-  }
-]
 module.exports = [
   // mock get all routes form server
   {
@@ -69,17 +53,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/deviceType/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deviceTableList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/package.json b/package.json
index 5f6a084..f534952 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
+    "copy-webpack-plugin": "^6.0.3",
     "animate.css": "^4.1.1",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
diff --git a/src/api/device/deviceModel.js b/src/api/device/deviceModel.js
index 8554973..1064968 100644
--- a/src/api/device/deviceModel.js
+++ b/src/api/device/deviceModel.js
@@ -1,5 +1,5 @@
 /**
- * 设备管理接口
+ * 设备型号管理接口
  */
 import request from '@/utils/request'
 import qs from 'qs'
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceModelList(params) {
   return request({
-    url: 'deviceModels/list',
+    url: 'deviceModels/listPage',
     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/device/deviceType.js b/src/api/device/deviceType.js
index 5345faa..7274ede 100644
--- a/src/api/device/deviceType.js
+++ b/src/api/device/deviceType.js
@@ -16,7 +16,7 @@
 // 设备查询
 export function getDeviceTypeList(params) {
   return request({
-    url: 'deviceType/list',
+    url: 'deviceType/listPage',
     method: 'get',
     params
   })
@@ -44,7 +44,7 @@
     url: 'deviceType/delete',
     method: 'post',
     params: {
-      ids: ids
+      deviceTypeId: 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 6a0a8b9..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显示-->
@@ -90,13 +83,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -107,9 +114,11 @@
         modelName: '',
         communication: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
+      total: 0, // 数据总数
       commuList: [
         {
           label: 'LORA',
@@ -139,7 +148,7 @@
           align: 'center'
         },
         {
-          text: '型号',
+          text: '设备型号',
           value: 'modelName',
           align: 'center'
         },
@@ -150,36 +159,43 @@
         },
         {
           text: '通信方式',
-          value: 'communication',
+          value: 'communNameGroup',
           align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceModelList: [], // 设备类型列表
       listLoading: true // 加载动画
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceModelList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceModelList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response)
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
index c05674f..7887a7c 100644
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -8,25 +8,26 @@
       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 label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
+          <el-form-item prop="id">
+            <span slot="label">
+              设备类型编号
+              <el-tooltip content="自增设备编号不能超过100" placement="top">
+                <i class="el-icon-warning-outline" />
+              </el-tooltip>
+            </span>
+            <el-input
+              v-model.trim="deviceForm.id"
+              maxlength="3"
+              type="text"
+              placeholder="请输入设备编号"
               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>
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -47,15 +48,25 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+      <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
+          <el-form-item label="设备类型" prop="typeName">
             <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
+              v-model="deviceForm.typeName"
+              size="small"
               clearable
+              placeholder="请输入设备类型"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
         </el-col>
@@ -72,17 +83,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <div
@@ -101,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: {
@@ -128,6 +127,7 @@
       ],
       // 表单内容
       deviceForm: {
+        id: '',
         devcode: '',
         typeName: '',
         typeDescription: '',
@@ -136,26 +136,18 @@
       },
       // 表单校验规则
       rules: {
+        id: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
         valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
         watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
-  created() {
-    this.fetchDeviceType()
-  },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
-        devcode: '',
+        id: '',
         typeName: '',
         typeDescription: '',
         valid: '',
@@ -164,6 +156,7 @@
     },
     // 父子组件通信
     initDialog(dialogStatus, row = null) {
+      console.log(row, ' ==========')
       this.dialogFormVisible = true
       this.dialogStatus = dialogStatus
       if (this.dialogStatus === 'create') {
@@ -173,7 +166,7 @@
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
-          devcode: row.id,
+          id: row.id,
           typeName: row.typeName,
           typeDescription: row.typeDescription,
           valid: row.valid,
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 8724510..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
@@ -101,13 +94,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
     <edit-device ref="editDevice" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <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',
@@ -115,9 +122,9 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         isValid: '',
         offset: 1,
+        limit: 20,
         sort: 'id',
         order: 'asc'
       }, // 查询条件
@@ -158,33 +165,41 @@
           align: 'center'
         }
       ], // 显示列
+      total: 0, // 数据总数
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      deviceTypeList: [], // 设备类型列表
       listLoading: true, // 加载动画
       dialogShow: false // 是否显示对话框
     }
   },
   created() {
-    this.fetchDeviceType()
     this.fetchData()
   },
   methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
     },
     // 查询数据
     search() {
       this.fetchData(false)
     },
     // 数据列表
-    fetchData() {
+    fetchData(isNowPage = true) {
       this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
       getDeviceTypeList(this.listQuery).then(response => {
-        this.list = response.data
+        console.log(response, '======response')
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
         this.listLoading = false
       })
     },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index d92669b..aa8e734 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -208,7 +208,7 @@
     // 获取工单详情
     getJobInfo: function(jobId) {
       this.loading = true
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       getJobInfo(jobId).then(response => {
         this.loading = false
         if (response.code === 200) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 143a7b6..3a733b5 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -248,7 +248,7 @@
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      uploadPath: process.env.BASE_API + '/imageUpload', // 图片上传路径
+      uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -460,7 +460,7 @@
     // 图片上传
     uploadFile(file) {
       console.log('uploadFile:' + file.file.name)
-      // const base_url = process.env.BASE_API + '/static/'
+      // const base_url = this.baseConfig.baseUrl + '/static/'
       Uploadimg(file).then(res => {
         if (res.code === 200) {
           this.fileList.push({ name: file.file.name, url: res.data })
@@ -521,7 +521,7 @@
     },
     handleSuccess(response, file, fileList) {
       console.log('handleSuccess')
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       if (response.code === 200) {
         this.fileList.push({ name: file.file.name, url: base_url + response.data })
         this.handleChange()
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) {
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 3aed2b7..a5e4778 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -396,7 +396,7 @@
         this.loading = false
       }
       // 处理图片
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       const urls = row.photos.split(';')
       for (const url of urls) {
         if (url) {
@@ -510,7 +510,7 @@
     },
     uploadFile(file) {
       console.log('uploadFile:' + file.file.name)
-      const base_url = process.env.BASE_API + '/static/'
+      const base_url = this.baseConfig.baseUrl + '/static/'
       Uploadimg(file).then(res => {
         if (res.code === 200) {
           this.imageList.push({ name: file.file.name, url: base_url + res.data })