diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/overview/components/selectDate.vue b/src/views/overview/components/selectDate.vue new file mode 100644 index 0000000..4e4a069 --- /dev/null +++ b/src/views/overview/components/selectDate.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/overview/components/selectDate.vue b/src/views/overview/components/selectDate.vue new file mode 100644 index 0000000..4e4a069 --- /dev/null +++ b/src/views/overview/components/selectDate.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/overview/components/tempData.vue b/src/views/overview/components/tempData.vue new file mode 100644 index 0000000..f1c0048 --- /dev/null +++ b/src/views/overview/components/tempData.vue @@ -0,0 +1,56 @@ + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/overview/components/selectDate.vue b/src/views/overview/components/selectDate.vue new file mode 100644 index 0000000..4e4a069 --- /dev/null +++ b/src/views/overview/components/selectDate.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/overview/components/tempData.vue b/src/views/overview/components/tempData.vue new file mode 100644 index 0000000..f1c0048 --- /dev/null +++ b/src/views/overview/components/tempData.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/overview/overview_kkj.vue b/src/views/overview/overview_kkj.vue new file mode 100644 index 0000000..1f48bc1 --- /dev/null +++ b/src/views/overview/overview_kkj.vue @@ -0,0 +1,576 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/overview/components/selectDate.vue b/src/views/overview/components/selectDate.vue new file mode 100644 index 0000000..4e4a069 --- /dev/null +++ b/src/views/overview/components/selectDate.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/overview/components/tempData.vue b/src/views/overview/components/tempData.vue new file mode 100644 index 0000000..f1c0048 --- /dev/null +++ b/src/views/overview/components/tempData.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/overview/overview_kkj.vue b/src/views/overview/overview_kkj.vue new file mode 100644 index 0000000..1f48bc1 --- /dev/null +++ b/src/views/overview/overview_kkj.vue @@ -0,0 +1,576 @@ + + + + + diff --git a/src/views/systemConfig/manufacturer/editManufacturer.vue b/src/views/systemConfig/manufacturer/editManufacturer.vue new file mode 100644 index 0000000..d8c4628 --- /dev/null +++ b/src/views/systemConfig/manufacturer/editManufacturer.vue @@ -0,0 +1,144 @@ + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/overview/components/selectDate.vue b/src/views/overview/components/selectDate.vue new file mode 100644 index 0000000..4e4a069 --- /dev/null +++ b/src/views/overview/components/selectDate.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/overview/components/tempData.vue b/src/views/overview/components/tempData.vue new file mode 100644 index 0000000..f1c0048 --- /dev/null +++ b/src/views/overview/components/tempData.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/overview/overview_kkj.vue b/src/views/overview/overview_kkj.vue new file mode 100644 index 0000000..1f48bc1 --- /dev/null +++ b/src/views/overview/overview_kkj.vue @@ -0,0 +1,576 @@ + + + + + diff --git a/src/views/systemConfig/manufacturer/editManufacturer.vue b/src/views/systemConfig/manufacturer/editManufacturer.vue new file mode 100644 index 0000000..d8c4628 --- /dev/null +++ b/src/views/systemConfig/manufacturer/editManufacturer.vue @@ -0,0 +1,144 @@ + + + + diff --git a/src/views/systemConfig/manufacturer/manufacturer.vue b/src/views/systemConfig/manufacturer/manufacturer.vue new file mode 100644 index 0000000..794716f --- /dev/null +++ b/src/views/systemConfig/manufacturer/manufacturer.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/overview/components/selectDate.vue b/src/views/overview/components/selectDate.vue new file mode 100644 index 0000000..4e4a069 --- /dev/null +++ b/src/views/overview/components/selectDate.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/overview/components/tempData.vue b/src/views/overview/components/tempData.vue new file mode 100644 index 0000000..f1c0048 --- /dev/null +++ b/src/views/overview/components/tempData.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/overview/overview_kkj.vue b/src/views/overview/overview_kkj.vue new file mode 100644 index 0000000..1f48bc1 --- /dev/null +++ b/src/views/overview/overview_kkj.vue @@ -0,0 +1,576 @@ + + + + + diff --git a/src/views/systemConfig/manufacturer/editManufacturer.vue b/src/views/systemConfig/manufacturer/editManufacturer.vue new file mode 100644 index 0000000..d8c4628 --- /dev/null +++ b/src/views/systemConfig/manufacturer/editManufacturer.vue @@ -0,0 +1,144 @@ + + + + diff --git a/src/views/systemConfig/manufacturer/manufacturer.vue b/src/views/systemConfig/manufacturer/manufacturer.vue new file mode 100644 index 0000000..794716f --- /dev/null +++ b/src/views/systemConfig/manufacturer/manufacturer.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/src/views/wellManage/ListKkj.vue b/src/views/wellManage/ListKkj.vue new file mode 100644 index 0000000..a50aea4 --- /dev/null +++ b/src/views/wellManage/ListKkj.vue @@ -0,0 +1,299 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/overview/components/selectDate.vue b/src/views/overview/components/selectDate.vue new file mode 100644 index 0000000..4e4a069 --- /dev/null +++ b/src/views/overview/components/selectDate.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/overview/components/tempData.vue b/src/views/overview/components/tempData.vue new file mode 100644 index 0000000..f1c0048 --- /dev/null +++ b/src/views/overview/components/tempData.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/overview/overview_kkj.vue b/src/views/overview/overview_kkj.vue new file mode 100644 index 0000000..1f48bc1 --- /dev/null +++ b/src/views/overview/overview_kkj.vue @@ -0,0 +1,576 @@ + + + + + diff --git a/src/views/systemConfig/manufacturer/editManufacturer.vue b/src/views/systemConfig/manufacturer/editManufacturer.vue new file mode 100644 index 0000000..d8c4628 --- /dev/null +++ b/src/views/systemConfig/manufacturer/editManufacturer.vue @@ -0,0 +1,144 @@ + + + + diff --git a/src/views/systemConfig/manufacturer/manufacturer.vue b/src/views/systemConfig/manufacturer/manufacturer.vue new file mode 100644 index 0000000..794716f --- /dev/null +++ b/src/views/systemConfig/manufacturer/manufacturer.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/src/views/wellManage/ListKkj.vue b/src/views/wellManage/ListKkj.vue new file mode 100644 index 0000000..a50aea4 --- /dev/null +++ b/src/views/wellManage/ListKkj.vue @@ -0,0 +1,299 @@ + + + + + diff --git a/src/views/wellManage/components/detailKkj.vue b/src/views/wellManage/components/detailKkj.vue new file mode 100644 index 0000000..d221938 --- /dev/null +++ b/src/views/wellManage/components/detailKkj.vue @@ -0,0 +1,387 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/overview/components/selectDate.vue b/src/views/overview/components/selectDate.vue new file mode 100644 index 0000000..4e4a069 --- /dev/null +++ b/src/views/overview/components/selectDate.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/overview/components/tempData.vue b/src/views/overview/components/tempData.vue new file mode 100644 index 0000000..f1c0048 --- /dev/null +++ b/src/views/overview/components/tempData.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/overview/overview_kkj.vue b/src/views/overview/overview_kkj.vue new file mode 100644 index 0000000..1f48bc1 --- /dev/null +++ b/src/views/overview/overview_kkj.vue @@ -0,0 +1,576 @@ + + + + + diff --git a/src/views/systemConfig/manufacturer/editManufacturer.vue b/src/views/systemConfig/manufacturer/editManufacturer.vue new file mode 100644 index 0000000..d8c4628 --- /dev/null +++ b/src/views/systemConfig/manufacturer/editManufacturer.vue @@ -0,0 +1,144 @@ + + + + diff --git a/src/views/systemConfig/manufacturer/manufacturer.vue b/src/views/systemConfig/manufacturer/manufacturer.vue new file mode 100644 index 0000000..794716f --- /dev/null +++ b/src/views/systemConfig/manufacturer/manufacturer.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/src/views/wellManage/ListKkj.vue b/src/views/wellManage/ListKkj.vue new file mode 100644 index 0000000..a50aea4 --- /dev/null +++ b/src/views/wellManage/ListKkj.vue @@ -0,0 +1,299 @@ + + + + + diff --git a/src/views/wellManage/components/detailKkj.vue b/src/views/wellManage/components/detailKkj.vue new file mode 100644 index 0000000..d221938 --- /dev/null +++ b/src/views/wellManage/components/detailKkj.vue @@ -0,0 +1,387 @@ + + + + + diff --git a/src/views/wellManage/components/editKkj.vue b/src/views/wellManage/components/editKkj.vue new file mode 100644 index 0000000..37352fe --- /dev/null +++ b/src/views/wellManage/components/editKkj.vue @@ -0,0 +1,284 @@ + + + + + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..687e92b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/package.json b/package.json index c141bef..2f279d0 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@jiaminghi/charts": "^0.2.18", "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", @@ -30,6 +31,7 @@ "node-polyfill-webpack-plugin": "^2.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", + "qs": "^6.12.1", "uppercamelcase": "^3.0.0", "v-charts": "^1.19.0", "v-viewer": "^1.6.4", @@ -53,6 +55,7 @@ "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^8.0.3", "html-webpack-plugin": "^5.5.0", + "path-to-regexp": "2.4.0", "sass": "^1.32.12", "sass-loader": "^8.0.2", "svg-sprite-loader": "^6.0.9", diff --git a/public/config/project.config.json b/public/config/project.config.json index d34ef9b..ef20e23 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11638/", - "wsUrl": "ws://111.198.10.15:11638/websocket/", + "baseUrl": "http://111.198.10.15:11640/", + "wsUrl": "ws://111.198.10.15:11640/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", diff --git a/src/api/device/device.js b/src/api/device/device.js index e48db8d..f4f9531 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -100,3 +100,73 @@ params }) } + +// 设备查询 +export function getDeviceListKkj(params) { + return request({ + url: 'kkj/devicelistPage', + method: 'get', + params + }) +} + +// 删除设备 +export function delDeviceKkj(ids) { + return request({ + url: 'kkj/devBatchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportDeviceKkj(params) { + return request({ + url: 'kkj/devExport', + method: 'get', + timeout: 120000, + params, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// 添加设备 +export function addDeviceKkj(params) { + return request({ + url: 'kkj/devAdd', + method: 'post', + params + }) +} +// 修改设备 +export function updateDeviceKkj(params) { + return request({ + url: 'kkj/devUpdate', + method: 'post', + params + }) +} + +export function getKkjDetail(kkjCode) { + return request({ + url: 'kkj/detail', + method: 'get', + params: { + kkjCode: kkjCode + } + }) +} + +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2f5292c..49eebf7 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -105,3 +105,41 @@ } }) } +// 获取仓库列表 +export function getWarehouseList(params) { + return request({ + url: 'overview/warehouseList', + method: 'get', + params + }) +} +// 开孔机详情，即历史位置 +export function getHistoryKkj(params) { + return request({ + url: 'overview/kkjDetail', + method: 'get', + params + }) +} +export function getKkj(params) { + return request({ + url: 'overview/kkjList', + method: 'get', + params + }) +} +export function getKkjAlarm(params) { + return request({ + url: 'alarm/kkjRecords', + method: 'get', + params + }) +} +// / 数据统计接口 +export function getStaticData(params) { + return request({ + url: 'data/list', + method: 'get', + params + }) +} diff --git a/src/api/systemConfig/manufacturer.js b/src/api/systemConfig/manufacturer.js new file mode 100644 index 0000000..f3acb72 --- /dev/null +++ b/src/api/systemConfig/manufacturer.js @@ -0,0 +1,64 @@ +/** + * 厂商管理接口 + */ +import request from '@/utils/request' +import qs from 'qs' +// 厂商查询 +export function getManufacturerList(pid) { + return request({ + url: 'busManufacturer/list', + method: 'get', + params: { + pid: pid + } + }) +} +// 厂商查询 +export function getManufacturerListPage(params) { + return request({ + url: 'busManufacturer/listPage', + method: 'get', + params + }) +} + +// 添加厂商 +export function addManufacturer(params) { + return request({ + url: 'busManufacturer/add', + method: 'post', + params + }) +} +// 修改厂商机构 +export function updateManufacturer(params) { + return request({ + url: 'busManufacturer/update', + method: 'post', + params + }) +} +// 删除厂商机构 +export function delManufacturer(id) { + return request({ + url: 'busManufacturer/delete', + method: 'post', + params: { + id: id + } + }) +} + +// 删除井 +export function delManufacturers(ids) { + return request({ + url: 'busManufacturer/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} diff --git a/src/api/well/well.js b/src/api/well/well.js index 654a13d..7f8d131 100644 --- a/src/api/well/well.js +++ b/src/api/well/well.js @@ -208,3 +208,66 @@ params }) } + +// 井查询 +export function getKkjList(params) { + return request({ + url: 'kkj/listPage', + method: 'get', + params + }) +} + +// 删除井 +export function delKkj(ids) { + return request({ + url: 'kkj/batchDelete', + method: 'post', + params: { + ids: ids + }, + paramsSerializer: params => { + return qs.stringify(params, { indices: false }) + } + }) +} + +// 批量导出 +export function batchExportKkj(params, config) { + return request({ + url: 'kkj/export', + method: 'get', + timeout: 120000, + params, + ...config, + responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob + }) +} + +// // 获取某井内监控数据 +// export function watchDataByWell(id) { +// return request({ +// url: 'well/watchDataByWell', +// method: 'get', +// params: { +// id: id +// } +// }) +// } + +export function addKkj(params) { + return request({ + url: 'kkj/add', + method: 'post', + params + }) +} + +// 修改井 +export function updateKkj(params) { + return request({ + url: 'kkj/update', + method: 'post', + params + }) +} diff --git a/src/assets/overview/ck-alarm.png b/src/assets/overview/ck-alarm.png new file mode 100644 index 0000000..f11acf8 --- /dev/null +++ b/src/assets/overview/ck-alarm.png Binary files differ diff --git a/src/assets/overview/ck.png b/src/assets/overview/ck.png new file mode 100644 index 0000000..5f39ea8 --- /dev/null +++ b/src/assets/overview/ck.png Binary files differ diff --git a/src/assets/overview/position.png b/src/assets/overview/position.png new file mode 100644 index 0000000..740a072 --- /dev/null +++ b/src/assets/overview/position.png Binary files differ diff --git a/src/assets/overview/position2.png b/src/assets/overview/position2.png new file mode 100644 index 0000000..d98d30c --- /dev/null +++ b/src/assets/overview/position2.png Binary files differ diff --git a/src/components/DeptSelect/DeptSingle.vue b/src/components/DeptSelect/DeptSingle.vue new file mode 100644 index 0000000..d8950e4 --- /dev/null +++ b/src/components/DeptSelect/DeptSingle.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/main.js b/src/main.js index eb0b815..14eb9e9 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,17 @@ // // 引入动画 // import animated from 'animate.css' // Vue.use(animated) - +// 引入高德地图 +// import VueAMap from 'vue-amap' +// Vue.use(VueAMap) +// VueAMap.initAMapApiLoader({ +// key: 'b6c27a2051691fcb386543c800356e05', // key +// plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'CircleEditor', 'MarkerClusterer'], // 插件 +// // uiVersion: '1.1', // ui组件库版本号 +// // v: '1.4.4' // sdk版本 +// // v: '1.4.15', // 我也不知道为什么要写这个，不写项目会报错，而且我随便写的，跟我下载的版本对应不了 +// // uiVersion: '1.0.11' +// }) Vue.config.productionTip = false // 引入v-charts diff --git a/src/router/modules/config.js b/src/router/modules/config.js index eccd5c6..717ca64 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -41,6 +41,12 @@ name: 'TenantConfig', component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'), meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } - } + }, + { + path: '/manufacturer', + name: 'Manufacturer', + component: () => import('@/views/systemConfig/manufacturer/manufacturer'), + meta: { title: '厂商管理', icon: 'function', permission: ['/manufacturer'] } + }, ] }] diff --git a/src/router/modules/well.js b/src/router/modules/well.js index ee36377..5f199e4 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -56,6 +56,24 @@ ] }, { + path: '/Kkj', + component: Layout, + redirect: '/Kkj', + meta: { + title: '开孔机设备总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/kkj']// 权限名称 + }, + children: [ + { + path: '/kkj', + component: () => import('@/views/overview/overview_kkj'), // 章丘zq + name: 'kkj', + meta: { title: '开孔机设备总览', icon: 'icon-globe', permission: ['/overview/kkj'] } + } + ] + }, + { path: 'alarmManage', component: Layout, redirect: '/alarmNow', @@ -129,7 +147,7 @@ { path: '/wellList', name: 'WellList', - component: () => import('@/views/wellManage/listWell'), + component: () => import('@/views/wellManage/list'), meta: { title: '点位列表', icon: 'icon-config', keepAlive: true, permission: ['/well/list'] } }, { @@ -173,7 +191,7 @@ { path: '/deviceList', name: 'DeviceList', - component: () => import('@/views/deviceManage/listDevice'), + component: () => import('@/views/deviceManage/list'), meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] } }, { diff --git a/src/views/deviceManage/components/editDeviceKkj.vue b/src/views/deviceManage/components/editDeviceKkj.vue new file mode 100644 index 0000000..b7b972e --- /dev/null +++ b/src/views/deviceManage/components/editDeviceKkj.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/deviceManage/components/historyLoc.vue b/src/views/deviceManage/components/historyLoc.vue new file mode 100644 index 0000000..de5769c --- /dev/null +++ b/src/views/deviceManage/components/historyLoc.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/deviceManage/list.vue b/src/views/deviceManage/list.vue new file mode 100644 index 0000000..0204d63 --- /dev/null +++ b/src/views/deviceManage/list.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/deviceManage/listDeviceKkj.vue b/src/views/deviceManage/listDeviceKkj.vue new file mode 100644 index 0000000..9779635 --- /dev/null +++ b/src/views/deviceManage/listDeviceKkj.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/overview/components/selectDate.vue b/src/views/overview/components/selectDate.vue new file mode 100644 index 0000000..4e4a069 --- /dev/null +++ b/src/views/overview/components/selectDate.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/views/overview/components/tempData.vue b/src/views/overview/components/tempData.vue new file mode 100644 index 0000000..f1c0048 --- /dev/null +++ b/src/views/overview/components/tempData.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/overview/overview_kkj.vue b/src/views/overview/overview_kkj.vue new file mode 100644 index 0000000..1f48bc1 --- /dev/null +++ b/src/views/overview/overview_kkj.vue @@ -0,0 +1,576 @@ + + + + + diff --git a/src/views/systemConfig/manufacturer/editManufacturer.vue b/src/views/systemConfig/manufacturer/editManufacturer.vue new file mode 100644 index 0000000..d8c4628 --- /dev/null +++ b/src/views/systemConfig/manufacturer/editManufacturer.vue @@ -0,0 +1,144 @@ + + + + diff --git a/src/views/systemConfig/manufacturer/manufacturer.vue b/src/views/systemConfig/manufacturer/manufacturer.vue new file mode 100644 index 0000000..794716f --- /dev/null +++ b/src/views/systemConfig/manufacturer/manufacturer.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/src/views/wellManage/ListKkj.vue b/src/views/wellManage/ListKkj.vue new file mode 100644 index 0000000..a50aea4 --- /dev/null +++ b/src/views/wellManage/ListKkj.vue @@ -0,0 +1,299 @@ + + + + + diff --git a/src/views/wellManage/components/detailKkj.vue b/src/views/wellManage/components/detailKkj.vue new file mode 100644 index 0000000..d221938 --- /dev/null +++ b/src/views/wellManage/components/detailKkj.vue @@ -0,0 +1,387 @@ + + + + + diff --git a/src/views/wellManage/components/editKkj.vue b/src/views/wellManage/components/editKkj.vue new file mode 100644 index 0000000..37352fe --- /dev/null +++ b/src/views/wellManage/components/editKkj.vue @@ -0,0 +1,284 @@ + + + + + diff --git a/src/views/wellManage/list.vue b/src/views/wellManage/list.vue new file mode 100644 index 0000000..38bb2df --- /dev/null +++ b/src/views/wellManage/list.vue @@ -0,0 +1,63 @@ + + + + +