admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 污水监测BUG修改

Browse Source
This commit is contained in:
kun 2023-12-15 10:40:14 +08:00
parent db62427fff
commit 2fd8632e18
4 changed files with 187 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/http.js
View File

@ -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/' //嘉兴王江泾公用码头

4
src/store/index.js
View File

@ -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

3
src/views/projectFront/sewageMonitor/alarmManagement.vue
View File

@ -26,8 +26,7 @@
<el-table-column prop="monitorParam" align="center" label="监测参数"></el-table-column>
<el-table-column prop="alarmDetail" align="center" label="告警详情"></el-table-column>
<el-table-column prop="monitorValue" align="center" label="监测值"></el-table-column>
<el-table-column prop="beginTime" align="center" label="开始时间"></el-table-column>
<el-table-column prop="endTime" align="center" label="结束时间"></el-table-column>
<el-table-column prop="alarmTime" align="center" label="报警时间"></el-table-column>
<el-table-column prop="joinPartyDeclaration" align="center" label="状态">
<template slot-scope="scope">
<div>

220
src/views/projectFront/sewageMonitor/devManagement.vue
View File

@ -34,7 +34,7 @@
</template>
</el-table-column>
<el-table-column prop="remark" align="center" label="备注"></el-table-column>
<el-table-column label="操作" align="center" width="300px">
<el-table-column label="操作" align="center" width="400px">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="edit(scope.row)" class="operationText">
@ -49,6 +49,10 @@
<img src="@/assets/images/yu.png" width="15px" height="15px" />
<span style="white-space: nowrap;">预警值设置</span>
</div>
<div @click="setBao(scope.row)" class="operationText">
<img src="@/assets/images/bao.png" width="15px" height="15px" />
<span style="white-space: nowrap;">报警值设置</span>
</div>
</div>
</template>
</el-table-column>
@ -107,32 +111,124 @@
width="667px">
<div class="dialog_content">
<el-form size="medium" ref="setEditForm" :model="setEditForm" label-width="120px" class="dialogFormBox">
<el-form-item label="PH值" prop="phValue">
<el-input v-model="setEditForm.phValue" placeholder="请输入"></el-input>
<el-form-item label="PH值">
<div class="form-flex">
<el-input v-model="setEditForm.phValueLowWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setEditForm.phValueHighWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="电导率(μS/cm)" prop="conductivity">
<el-input v-model="setEditForm.conductivity" placeholder="请输入"></el-input>
<el-form-item label="电导率(μS/cm)">
<div class="form-flex">
<el-input v-model="setEditForm.conductivityLowWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setEditForm.conductivityHighWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="水温(℃)" prop="waterTemperature">
<el-input v-model="setEditForm.waterTemperature" placeholder="请输入"></el-input>
<el-form-item label="水温(℃)">
<div class="form-flex">
<el-input v-model="setEditForm.waterTemperatureLowWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setEditForm.waterTemperatureHighWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="溶解氧(mg/L)" prop="dissolvedOxygen">
<el-input v-model="setEditForm.dissolvedOxygen" placeholder="请输入"></el-input>
<el-form-item label="溶解氧(mg/L)">
<div class="form-flex">
<el-input v-model="setEditForm.dissolvedOxygenLowWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setEditForm.dissolvedOxygenHighWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="浊度值(NTU)" prop="turbidityValue">
<el-input v-model="setEditForm.turbidityValue" placeholder="请输入"></el-input>
<el-form-item label="浊度值(NTU)">
<div class="form-flex">
<el-input v-model="setEditForm.turbidityValueLowWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setEditForm.turbidityValueHighWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="流速(m/s)" prop="flowVelocity">
<el-input v-model="setEditForm.flowVelocity" placeholder="请输入"></el-input>
<el-form-item label="流速(m/s)">
<div class="form-flex">
<el-input v-model="setEditForm.flowVelocityLowWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setEditForm.flowVelocityHighWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="水位(m)" prop="waterLevel">
<el-input v-model="setEditForm.waterLevel" placeholder="请输入"></el-input>
<el-form-item label="水位(m)">
<div class="form-flex">
<el-input v-model="setEditForm.waterLevelLowWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setEditForm.waterLevelHighWarn" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<div class="dialog-footer">
<el-button class="cancleBtn" @click="dialogSetShow = false" icon="el-icon-circle-close" size="medium">{{
$t("message.deviceManage.cancel") }}
</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="submitSet" size="medium">{{
<el-button type="primary" icon="el-icon-circle-check" @click="submitSet('编辑预警值设置')" size="me'dium">{{
$t("message.deviceManage.save") }}
</el-button>
</div>
</el-form>
</div>
</el-dialog>
<el-dialog :modal-append-to-body="false" @close="dialogBaoSetShow = false" title="编辑报警值设置" :visible.sync="dialogBaoSetShow"
width="667px">
<div class="dialog_content">
<el-form size="medium" ref="setBaoEditForm" :model="setBaoEditForm" label-width="120px" class="dialogFormBox">
<el-form-item label="PH值">
<div class="form-flex">
<el-input v-model="setBaoEditForm.phValueLowAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setBaoEditForm.phValueHighAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="电导率(μS/cm)">
<div class="form-flex">
<el-input v-model="setBaoEditForm.conductivityLowAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setBaoEditForm.conductivityHighAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="水温(℃)">
<div class="form-flex">
<el-input v-model="setBaoEditForm.waterTemperatureLowAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setBaoEditForm.waterTemperatureHighAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="溶解氧(mg/L)">
<div class="form-flex">
<el-input v-model="setBaoEditForm.dissolvedOxygenLowAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setBaoEditForm.dissolvedOxygenHighAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="浊度值(NTU)">
<div class="form-flex">
<el-input v-model="setBaoEditForm.turbidityValueLowAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setBaoEditForm.turbidityValueHighAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="流速(m/s)">
<div class="form-flex">
<el-input v-model="setBaoEditForm.flowVelocityLowAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setBaoEditForm.flowVelocityHighAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<el-form-item label="水位(m)">
<div class="form-flex">
<el-input v-model="setBaoEditForm.waterLevelLowAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<div class="center-line">～</div>
<el-input v-model="setBaoEditForm.waterLevelHighAlarm" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</div>
</el-form-item>
<div class="dialog-footer">
<el-button class="cancleBtn" @click="dialogBaoSetShow = false" icon="el-icon-circle-close" size="medium">{{
$t("message.deviceManage.cancel") }}
</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="submitSet('编辑报警值设置')" size="medium">{{
$t("message.deviceManage.save") }}
</el-button>
</div>
@ -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 {
};
</script>
<style lang="less" scoped>
.tables2 {
min-height: auto;
.flex {
display: flex;
align-items: center;
}
.devImage {
@ -407,10 +546,17 @@ export default {
}
}
.textStyle {
width: 140px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
.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;
}
}</style>