diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 703fb6c4..51e2a95b 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:30012/' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // 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/store/index.js b/src/store/index.js index a1b90eac..9605f08d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -44,8 +44,8 @@ export default new Vuex.Store({ state: { PAGESIZRS: [10, 20, 30, 50], - UPLOADURL:'http://192.168.34.221:30002/upload/image/',// 郭圣雄 - FILEURL:'http://192.168.34.221:30002/image/',//郭圣雄 + UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 + FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 // BASEURL: baseUrl diff --git a/src/views/projectFront/sewageMonitor/alarmManagement.vue b/src/views/projectFront/sewageMonitor/alarmManagement.vue index e92ea52e..19b1bccf 100644 --- a/src/views/projectFront/sewageMonitor/alarmManagement.vue +++ b/src/views/projectFront/sewageMonitor/alarmManagement.vue @@ -26,8 +26,7 @@ - - + - + @@ -107,32 +111,124 @@ width="667px">
- - + +
+ +
～
+ +
- - + +
+ +
～
+ +
- - + +
+ +
～
+ +
- - + +
+ +
～
+ +
- - + +
+ +
～
+ +
- - + +
+ +
～
+ +
- - + +
+ +
～
+ +
{{ $t("message.deviceManage.cancel") }} - {{ + {{ + $t("message.deviceManage.save") }} + +
+ +
+ + +
+ + +
+ +
～
+ +
+ + +
+ +
～
+ +
+ + +
+ +
～
+ +
+ + +
+ +
～
+ +
+ + +
+ +
～
+ +
+ + +
+ +
～
+ +
+ + +
+ +
～
+ +
+ +
+ {{ + $t("message.deviceManage.cancel") }} + + {{ $t("message.deviceManage.save") }}
@@ -163,6 +259,7 @@ export default { dutyList: [], // 负责人 fileUplodList: [], title: "", + dialogBaoSetShow: false, dialogSetShow: false, dialogShow: false, pagInfo: { @@ -172,13 +269,36 @@ export default { }, List: [], setEditForm: { - phValue: 100, - conductivity: 100, - waterTemperature: 100, - dissolvedOxygen: 100, - turbidityValue: 100, - flowVelocity: 100, - waterLevel: 100 + phValueLowWarn: 0, + phValueHighWarn: 100, + conductivityLowWarn: 0, + conductivityHighWarn: 100, + waterTemperatureLowWarn: 0, + waterTemperatureHighWarn: 100, + dissolvedOxygenLowWarn: 0, + dissolvedOxygenHighWarn: 100, + turbidityValueLowWarn: 0, + turbidityValueHighWarn: 100, + flowVelocityLowWarn: 0, + flowVelocityHighWarn: 100, + waterLevelLowWarn: 0, + waterLevelHighWarn: 100, + }, + setBaoEditForm: { + phValueLowAlarm: 0, + phValueHighAlarm: 100, + conductivityLowAlarm: 0, + conductivityHighAlarm: 100, + waterTemperatureLowAlarm: 0, + waterTemperatureHighAlarm: 100, + dissolvedOxygenLowAlarm: 0, + dissolvedOxygenHighAlarm: 100, + turbidityValueLowAlarm: 0, + turbidityValueHighAlarm: 100, + flowVelocityLowAlarm: 0, + flowVelocityHighAlarm: 100, + waterLevelLowAlarm: 0, + waterLevelHighAlarm: 100, }, addEditForm: { createTime: "", @@ -223,14 +343,26 @@ export default { }; }, methods: { + // 设置报警值 + async setBao(obj) { + const res = await sewageThresholdDetail({ devSn: obj.devSn }) + let initForm = JSON.parse(JSON.stringify(this.setBaoEditForm)) + this.setBaoEditForm = { ...this.setBaoEditForm, ...res.result } + for (let i in initForm) { + if (!this.setBaoEditForm[i]) { + this.setBaoEditForm[i] = 0; + } + } + this.dialogBaoSetShow = true; + }, // 设置阈值 async setYu(obj) { const res = await sewageThresholdDetail({ devSn: obj.devSn }) let initForm = JSON.parse(JSON.stringify(this.setEditForm)) this.setEditForm = { ...this.setEditForm, ...res.result } - for(let i in initForm){ - if(!this.setEditForm[i]){ - this.setEditForm[i] = 100; + for (let i in initForm) { + if (!this.setEditForm[i]) { + this.setEditForm[i] = 0; } } this.dialogSetShow = true; @@ -282,13 +414,19 @@ export default { this.addEditForm = JSON.parse(JSON.stringify(obj)); this.fileUplodList = JSON.parse(obj.image); }, - submitSet() { - let params = JSON.parse(JSON.stringify(this.setEditForm)); + submitSet(title) { + let params; + if(title == '编辑预警值设置'){ + params = JSON.parse(JSON.stringify(this.setEditForm)); + } else if(title == '编辑报警值设置') { + params = JSON.parse(JSON.stringify(this.setBaoEditForm)); + } sewageThresholdEdit(params).then((result) => { if (result.success) { this.$message.success(result.message); this.getList(); this.dialogSetShow = false; + this.dialogBaoSetShow = false; } }); }, @@ -396,8 +534,9 @@ export default { }; +.dialogFormBox { + .form-flex { + .flex(); + justify-content: space-between; + .center-line { + height: 36px; + line-height: 36px; + margin: 0 10px; + } + } + /deep/.el-form-item__content{ + line-height: 0px; + } +}