From db62427fff2a624197bd7b258c673731ab8620ae Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 13 Dec 2023 17:56:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B4=B5=E9=98=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=20-=20=E6=B1=A1=E6=B0=B4=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/sewageMonitor.js | 31 + src/assets/js/http.js | 2 +- src/router/index.js | 8 - src/store/index.js | 22 +- .../sewageMonitor/alarmManagement.vue | 348 ++++------ .../sewageMonitor/devManagement.vue | 481 ++++++------- .../sewageMonitor/monitorData.vue | 643 ++++++++---------- .../sewageMonitor/thresholdSet.vue | 405 ----------- 8 files changed, 707 insertions(+), 1233 deletions(-) create mode 100644 src/assets/js/api/sewageMonitor.js delete mode 100644 src/views/projectFront/sewageMonitor/thresholdSet.vue diff --git a/src/assets/js/api/sewageMonitor.js b/src/assets/js/api/sewageMonitor.js new file mode 100644 index 00000000..0ae14d2f --- /dev/null +++ b/src/assets/js/api/sewageMonitor.js @@ -0,0 +1,31 @@ +/** + * api接口统一管理 + */ + import {post, get} from '../http' + + //污水监测 —— 设备信息 + export const sewageDevAdd = data => post('xmgl/sewageDev/add', data);//添加 + export const sewageDevEdit = data => post('xmgl/sewageDev/edit', data);//编辑 + export const sewageDevDelete = data => post('xmgl/sewageDev/delete', data);//删除 + export const sewageDevPage = data => get('xmgl/sewageDev/page', data); //查询分页列表数据 + export const sewageDevList = data => get('xmgl/sewageDev/list', data); //查询列表数据 + + // 获取负责人 + export const getCrewListDataApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data); // 查询 所有整改人员 + + + // 污水监测 —— 监测数据 + export const sewageDataPage = data => get('xmgl/sewageData/dev/data', data); //查询列表数据 + export const sewageMonitorDataPage = data => get('xmgl/sewageData/page', data); //查询监测记录数据 + export const sewageMonitorDataExport = data => post('xmgl/sewageData/exportXls', data); //导出监测记录数据 + + //污水监测 —— 告警管理 + export const sewageAlarmEdit = data => post('xmgl/sewageAlarm/edit', data);//编辑 + export const sewageAlarmDelete = data => post('xmgl/sewageAlarm/delete', data);//删除 + export const sewageAlarmPage = data => get('xmgl/sewageAlarm/page', data); //查询分页列表数据 + + //污水监测 —— 阈值管理 + export const sewageThresholdEdit = data => post('xmgl/sewageWarnThreshold/edit', data);//编辑 + export const sewageThresholdDetail = data => get('xmgl/sewageWarnThreshold/queryByDevSn', data);//根据devSn查询 + + diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 1b7d1ce4..703fb6c4 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:30002/' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:30012/' //郭圣雄本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 diff --git a/src/router/index.js b/src/router/index.js index bd220fe0..e3960970 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2229,14 +2229,6 @@ const routes2 = [ "@/views/projectFront/sewageMonitor/alarmManagement.vue", ], resolve), }, - { - path: "/project/sewageMonitor/thresholdSet", - name: "污水监测-阈值设置", - component: (resolve) => - require([ - "@/views/projectFront/sewageMonitor/thresholdSet.vue", - ], resolve), - }, // 智能张拉 { path: "/project/intelligentTension/devManagement", diff --git a/src/store/index.js b/src/store/index.js index 0ba1e36d..a1b90eac 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -44,19 +44,19 @@ export default new Vuex.Store({ state: { PAGESIZRS: [10, 20, 30, 50], - // UPLOADURL:'http://192.168.34.221:30001/upload/image/',// 郭圣雄 - // FILEURL:'http://192.168.34.221:30001/image/',//郭圣雄 + UPLOADURL:'http://192.168.34.221:30002/upload/image/',// 郭圣雄 + FILEURL:'http://192.168.34.221:30002/image/',//郭圣雄 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 - BASEURL: baseUrl - ? baseUrl - : window.location.protocol + "//" + window.location.host + "/", //正式环境 - UPLOADURL: - window.location.protocol + - "//" + - window.location.host + - "/upload/image", //正式环境 - FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + // BASEURL: baseUrl + // ? baseUrl + // : window.location.protocol + "//" + window.location.host + "/", //正式环境 + // UPLOADURL: + // window.location.protocol + + // "//" + + // window.location.host + + // "/upload/image", //正式环境 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/projectFront/sewageMonitor/alarmManagement.vue b/src/views/projectFront/sewageMonitor/alarmManagement.vue index ae9a59cb..e92ea52e 100644 --- a/src/views/projectFront/sewageMonitor/alarmManagement.vue +++ b/src/views/projectFront/sewageMonitor/alarmManagement.vue @@ -4,56 +4,43 @@ - + + + + - - + + + {{ $t('message.energyManage.waybill.query') }} {{ $t('message.deviceManage.refresh') }} - 新增
- - - - - - - - - - - + - +
- - - + + + + 已处置 + 误报忽略 + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + :on-remove="(file, fileList) => handleRemove(file, fileList)">
- {{ $t('message.deviceManage.cancel') }} + {{ + $t('message.deviceManage.cancel') }} - {{ $t('message.deviceManage.save') }} + {{ + $t('message.deviceManage.save') }}
@@ -143,23 +91,21 @@ diff --git a/src/views/projectFront/sewageMonitor/devManagement.vue b/src/views/projectFront/sewageMonitor/devManagement.vue index ae9a59cb..9e42b85e 100644 --- a/src/views/projectFront/sewageMonitor/devManagement.vue +++ b/src/views/projectFront/sewageMonitor/devManagement.vue @@ -4,53 +4,39 @@ - - - - + - {{ $t('message.energyManage.waybill.query') }} - {{ $t('message.deviceManage.refresh') }} + {{ + $t("message.energyManage.waybill.query") + }} + {{ + $t("message.deviceManage.refresh") + }} 新增
- - + - - - - - - + + + + + - - + + - +
- - - + + + - - + + - - - - - - - - - - - + + + + - - - + + - - - + + :on-remove="(file, fileList) => handleRemove(file, fileList)"> + + +
- {{ $t('message.deviceManage.cancel') }} + {{ + $t("message.deviceManage.cancel") }} - {{ $t('message.deviceManage.save') }} + {{ + $t("message.deviceManage.save") }} + +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ {{ + $t("message.deviceManage.cancel") }} + + {{ + $t("message.deviceManage.save") }}
@@ -143,259 +143,270 @@ diff --git a/src/views/projectFront/sewageMonitor/thresholdSet.vue b/src/views/projectFront/sewageMonitor/thresholdSet.vue deleted file mode 100644 index ae9a59cb..00000000 --- a/src/views/projectFront/sewageMonitor/thresholdSet.vue +++ /dev/null @@ -1,405 +0,0 @@ - - -