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

fix: 雨量监测系统筛选功能修改

Browse Source
This commit is contained in:
kun 2024-06-25 18:27:01 +08:00
parent 431c08645d
commit a750bd4983
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/views/projectFront/rainfallMonitor/alarmWarning.vue
View File

@ -53,7 +53,13 @@
<div class="table_wrap whiteBlock"> <div class="table_wrap whiteBlock">
<vue-scroll style="height: 88%"> <vue-scroll style="height: 88%">
<el-table class="tables" :data="List"> <el-table class="tables" :data="List">
<!-- 报警名称 --> <el-table-column
:label="$t('message.projectInfo.devName')"
prop="devName"
align="center"
width="150"
>
</el-table-column>
<el-table-column <el-table-column
prop="alarmContent" prop="alarmContent"
label="报警内容" label="报警内容"
@ -172,26 +178,23 @@ export default {
rainDevList({ projectSn: this.$store.state.projectSn }).then((result) => { rainDevList({ projectSn: this.$store.state.projectSn }).then((result) => {
if (result.success) { if (result.success) {
this.deviceIdArr = result.result; this.deviceIdArr = result.result;
if (result.result.length > 0) { // if (result.result.length > 0) {
this.queryInfo.deviceId = result.result[0].devSn; // this.queryInfo.deviceId = result.result[0].devSn;
} // }
console.log("get设备列表", this.deviceIdArr); // console.log("get设备列表", this.deviceIdArr);
} }
}); });
}, },
getList() { getList() {
let timeObj = { let data = {
startTime: this.time ? this.time[0] : "", devSn: this.queryInfo.deviceId,
endTime: this.time ? this.time[1] : "", projectSn: this.$store.state.projectSn,
pageNo: this.pageNo,
pageSize: this.pageSize,
alarmTime_begin: this.time ? this.time[0] : "",
alarmTime_end: this.time ? this.time[1] : "",
}; };
rainAlarmList( rainAlarmList(data).then((result) => {
Object.assign(
this.queryInfo,
this.pagInfo,
{ projectSn: this.$store.state.projectSn },
timeObj
)
).then((result) => {
if (result.success) { if (result.success) {
this.List = result.result.records; this.List = result.result.records;
this.pagInfo.total = result.result.total; this.pagInfo.total = result.result.total;

17
src/views/projectFront/rainfallMonitor/relaTimeData.vue
View File

@ -29,6 +29,7 @@
v-model="valueTime" v-model="valueTime"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
value-format="yyyy-MM-dd"
:start-placeholder="$t('message.projectInfo.start')" :start-placeholder="$t('message.projectInfo.start')"
:end-placeholder="$t('message.projectInfo.end')" :end-placeholder="$t('message.projectInfo.end')"
> >
@ -145,7 +146,7 @@
align="center" align="center"
:label="$t('message.projectInfo.uploadDate')" :label="$t('message.projectInfo.uploadDate')"
width="200" width="200"
prop="updateDate" prop="recordTime"
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -201,10 +202,10 @@ export default {
rainDevList({ projectSn: this.$store.state.projectSn }).then((result) => { rainDevList({ projectSn: this.$store.state.projectSn }).then((result) => {
if (result.success) { if (result.success) {
this.devList = result.result; this.devList = result.result;
if (result.result.length > 0) { // if (result.result.length > 0) {
this.devSn = result.result[0].devSn; // this.devSn = result.result[0].devSn;
} // }
console.log("get设备列表", this.devList); // console.log("get设备列表", this.devList);
} }
}); });
}, },
@ -230,12 +231,12 @@ export default {
}, },
selectDustNoisePageList() { selectDustNoisePageList() {
let data = { let data = {
deviceId: this.devSn, devSn: this.devSn,
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
startTime: this.valueTime ? this.valueTime[0] : "", recordTime_begin: this.valueTime ? this.valueTime[0] : "",
endTime: this.valueTime ? this.valueTime[1] : "", recordTime_end: this.valueTime ? this.valueTime[1] : "",
}; };
rainRecordPageApi(data).then((res) => { rainRecordPageApi(data).then((res) => {
console.log(res); console.log(res);