diff --git a/src/views/energy/base/energyQuantityRealtime/index.vue b/src/views/energy/base/energyQuantityRealtime/index.vue index fd101a3e..3c96905d 100644 --- a/src/views/energy/base/energyQuantityRealtime/index.vue +++ b/src/views/energy/base/energyQuantityRealtime/index.vue @@ -63,7 +63,7 @@ const tableProps = [ } ] export default { - name: "EnergyPlc", + name: "EnergyQuantityRealtime", data() { return { formConfig: [ @@ -125,10 +125,34 @@ export default { window.addEventListener('resize', () => { this.tableH = this.tableHeight(260) }) + if (location.href.indexOf('?') > 0) { + let arr = location.href.split('?')[1].split('&') + this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]] + } else { + this.formConfig[1].defaultSelect = [Date.now() - 7*24*3600000, Date.now()] + } + this.queryParams.startTime = this.formConfig[1].defaultSelect[0] + this.queryParams.endTime = this.formConfig[1].defaultSelect[1] this.getList(); this.getTypeList() }, + watch: { + $route: 'initData' + }, methods: { + initData(to) { + if (to.name === 'EnergyQuantityRealtime') { + if (location.href.indexOf('?') > 0) { + let arr = location.href.split('?')[1].split('&') + this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]] + } else { + this.formConfig[1].defaultSelect = [Date.now() - 7*24*3600000, Date.now()] + } + this.queryParams.startTime = this.formConfig[1].defaultSelect[0] + this.queryParams.endTime = this.formConfig[1].defaultSelect[1] + this.getList() + } + }, buttonClick(val) { this.queryParams.pageNo = 1; this.queryParams.energyTypeId = val.energyTypeId diff --git a/src/views/energy/monitoring/energyReportSearch/index.vue b/src/views/energy/monitoring/energyReportSearch/index.vue index d10f444a..93e2c6cf 100644 --- a/src/views/energy/monitoring/energyReportSearch/index.vue +++ b/src/views/energy/monitoring/energyReportSearch/index.vue @@ -80,8 +80,7 @@ export default { param: 'timeVal', defaultSelect: [], width: 350, - clearable: false, - required:true + clearable: false }, { type: 'button', @@ -122,35 +121,11 @@ export default { this.tableH = this.tableHeight(260) this.isFold = this.searchBarWidth('energyReportSearchBox', 1180) }) - if (location.href.indexOf('?') > 0) { - let arr = location.href.split('?')[1].split('&') - this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]] - } else { - this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()] - } - this.queryParams.startTime = this.formConfig[2].defaultSelect[0] - this.queryParams.endTime = this.formConfig[2].defaultSelect[1] this.getList() this.getTypeList() this.isFold = this.searchBarWidth('energyReportSearchBox', 1180) }, - watch: { - $route: 'initData' - }, methods: { - initData(to) { - if (to.name === 'EnergyReportSearch') { - if (location.href.indexOf('?') > 0) { - let arr = location.href.split('?')[1].split('&') - this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]] - } else { - this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()] - } - this.queryParams.startTime = this.formConfig[2].defaultSelect[0] - this.queryParams.endTime = this.formConfig[2].defaultSelect[1] - this.getList() - } - }, getTypeList() { getEnergyTypeListAll().then((res) => { this.formConfig[1].selectOptions = res.data || [] diff --git a/src/views/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue index 61389315..e4156796 100644 --- a/src/views/group/base/groupTeamScheduling/index.vue +++ b/src/views/group/base/groupTeamScheduling/index.vue @@ -290,7 +290,8 @@ export default { break; case '2': // 能源 this.$router.push({ - path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime + // path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime + path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime }) break; default: