From a750bd4983b1589667914ef22ee86cdc7dbba568 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 25 Jun 2024 18:27:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E9=9B=A8=E9=87=8F=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rainfallMonitor/alarmWarning.vue | 35 ++++++++++--------- .../rainfallMonitor/relaTimeData.vue | 17 ++++----- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/views/projectFront/rainfallMonitor/alarmWarning.vue b/src/views/projectFront/rainfallMonitor/alarmWarning.vue index 8db86199..25a78d55 100644 --- a/src/views/projectFront/rainfallMonitor/alarmWarning.vue +++ b/src/views/projectFront/rainfallMonitor/alarmWarning.vue @@ -53,7 +53,13 @@
- + + { if (result.success) { this.deviceIdArr = result.result; - if (result.result.length > 0) { - this.queryInfo.deviceId = result.result[0].devSn; - } - console.log("get设备列表", this.deviceIdArr); + // if (result.result.length > 0) { + // this.queryInfo.deviceId = result.result[0].devSn; + // } + // console.log("get设备列表", this.deviceIdArr); } }); }, getList() { - let timeObj = { - startTime: this.time ? this.time[0] : "", - endTime: this.time ? this.time[1] : "", + let data = { + devSn: this.queryInfo.deviceId, + 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( - Object.assign( - this.queryInfo, - this.pagInfo, - { projectSn: this.$store.state.projectSn }, - timeObj - ) - ).then((result) => { + rainAlarmList(data).then((result) => { if (result.success) { this.List = result.result.records; this.pagInfo.total = result.result.total; diff --git a/src/views/projectFront/rainfallMonitor/relaTimeData.vue b/src/views/projectFront/rainfallMonitor/relaTimeData.vue index 2d49a0dd..cd7f1020 100644 --- a/src/views/projectFront/rainfallMonitor/relaTimeData.vue +++ b/src/views/projectFront/rainfallMonitor/relaTimeData.vue @@ -29,6 +29,7 @@ v-model="valueTime" type="daterange" range-separator="-" + value-format="yyyy-MM-dd" :start-placeholder="$t('message.projectInfo.start')" :end-placeholder="$t('message.projectInfo.end')" > @@ -145,7 +146,7 @@ align="center" :label="$t('message.projectInfo.uploadDate')" width="200" - prop="updateDate" + prop="recordTime" > @@ -201,10 +202,10 @@ export default { rainDevList({ projectSn: this.$store.state.projectSn }).then((result) => { if (result.success) { this.devList = result.result; - if (result.result.length > 0) { - this.devSn = result.result[0].devSn; - } - console.log("get设备列表", this.devList); + // if (result.result.length > 0) { + // this.devSn = result.result[0].devSn; + // } + // console.log("get设备列表", this.devList); } }); }, @@ -230,12 +231,12 @@ export default { }, selectDustNoisePageList() { let data = { - deviceId: this.devSn, + devSn: this.devSn, projectSn: this.$store.state.projectSn, pageNo: this.pageNo, pageSize: this.pageSize, - startTime: this.valueTime ? this.valueTime[0] : "", - endTime: this.valueTime ? this.valueTime[1] : "", + recordTime_begin: this.valueTime ? this.valueTime[0] : "", + recordTime_end: this.valueTime ? this.valueTime[1] : "", }; rainRecordPageApi(data).then((res) => { console.log(res); From 61c01a9476db496c9fc120d1e537c11d114444d3 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 26 Jun 2024 15:46:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=8A=B3=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E8=A1=A8=E6=A0=BC=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 ++-- src/components/account.vue | 16 +++++++++++++++- src/store/index.js | 16 ++++++++-------- .../projectFront/laborManage/dataValidation.vue | 2 +- .../laborManage/personModule/administration.vue | 2 +- .../laborManage/personModule/laborComponent.vue | 2 +- src/views/projectFront/laborManage/rosterNew.vue | 2 +- 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 6bc6f760..be21d583 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -172,7 +172,7 @@ if (process.env.NODE_ENV == "development") { // 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:28889/' //郭圣雄本地 - // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 + axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 @@ -185,7 +185,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 diff --git a/src/components/account.vue b/src/components/account.vue index 68085a4e..11bd4a37 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -201,13 +201,16 @@