From a7db410b164a6cfc926370a87e3e97fcb8f5b7d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Thu, 11 Jan 2024 14:17:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E5=8F=8A=EF=BC=8C=E5=8F=8A=E9=BB=98=E8=AE=A4=E5=80=BC=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Modals/AnalyzeInteractiveToolModal/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index 374841c..03e8b58 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -127,6 +127,7 @@ @@ -762,6 +763,7 @@ export default { async getSelPosNuclide(row) { this.model.possibleNuclide = '' this.model.identifiedNuclide = '' + this.model.tolerance = 0.5 if (!row._possible) { this.$set(row, '_loading', true) From b63599ddf64cb8ef740c8c17588e443aaf40ff8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Thu, 11 Jan 2024 15:27:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E8=A6=81=E4=B8=80=E5=91=A8=20=E5=88=87=E6=8D=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8F=B0=E7=AB=99=E5=92=8C=E6=97=A5=E6=9C=9F=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/imsData/met/index.vue | 7 +- .../imsData/stateOfHealth/alerts.vue | 7 +- .../imsData/stateOfHealth/rmssoh.vue | 7 +- src/views/statistics/list.vue | 90 +++++++++++-------- 4 files changed, 66 insertions(+), 45 deletions(-) diff --git a/src/views/statistics/imsData/met/index.vue b/src/views/statistics/imsData/met/index.vue index 3ccea72..1a846e7 100644 --- a/src/views/statistics/imsData/met/index.vue +++ b/src/views/statistics/imsData/met/index.vue @@ -100,6 +100,7 @@ import { compareDate } from '../../commom' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getAction, getFileAction } from '../../../../api/manage' import dateFormat from '../../../../components/jeecg/JEasyCron/format-date' +import moment from 'moment' export default { name: 'menuTree', mixins: [JeecgListMixin], @@ -109,9 +110,9 @@ export default { isImmediate: true, columns, queryParam: { - startTime: dateFormat(new Date(), 'yyyy-MM-dd'), - endTime: dateFormat(new Date(), 'yyyy-MM-dd'), - stationIds: [], + startTime: sessionStorage.getItem('currStartDate') || moment().subtract(6, 'days').format('YYYY-MM-DD'), + endTime: sessionStorage.getItem('currEndDate') || moment().format('YYYY-MM-DD'), + stationIds: sessionStorage.getItem('selectedSta').split(',') || [], }, url: { list: '/webStatistics/findMetPage', diff --git a/src/views/statistics/imsData/stateOfHealth/alerts.vue b/src/views/statistics/imsData/stateOfHealth/alerts.vue index e3f9532..0ae0d36 100644 --- a/src/views/statistics/imsData/stateOfHealth/alerts.vue +++ b/src/views/statistics/imsData/stateOfHealth/alerts.vue @@ -80,6 +80,7 @@ import { compareDate } from '../../commom' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getAction, getFileAction } from '../../../../api/manage' import dateFormat from '../../../../components/jeecg/JEasyCron/format-date' +import moment from 'moment' export default { name: 'menuTree', mixins: [JeecgListMixin], @@ -89,9 +90,9 @@ export default { isImmediate: true, columns, queryParam: { - startTime: dateFormat(new Date(), 'yyyy-MM-dd'), - endTime: dateFormat(new Date(), 'yyyy-MM-dd'), - stationIds: [], + startTime: sessionStorage.getItem('currStartDate') || moment().subtract(6, 'days').format('YYYY-MM-DD'), + endTime: sessionStorage.getItem('currEndDate') || moment().format('YYYY-MM-DD'), + stationIds: sessionStorage.getItem('selectedSta').split(',') || [], }, url: { list: '/webStatistics/findAlertSohPage', diff --git a/src/views/statistics/imsData/stateOfHealth/rmssoh.vue b/src/views/statistics/imsData/stateOfHealth/rmssoh.vue index ff22b61..7ed5aba 100644 --- a/src/views/statistics/imsData/stateOfHealth/rmssoh.vue +++ b/src/views/statistics/imsData/stateOfHealth/rmssoh.vue @@ -78,6 +78,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getAction, getFileAction } from '../../../../api/manage' import dateFormat from '../../../../components/jeecg/JEasyCron/format-date' import FileDetail from '../../fileDetail.vue' +import moment from 'moment' export default { name: 'menuTree', mixins: [JeecgListMixin], @@ -90,9 +91,9 @@ export default { isImmediate: true, columns, queryParam: { - startTime: dateFormat(new Date(), 'yyyy-MM-dd'), - endTime: dateFormat(new Date(), 'yyyy-MM-dd'), - stationIds: [], + startTime: sessionStorage.getItem('currStartDate') || moment().subtract(6, 'days').format('YYYY-MM-DD'), + endTime: sessionStorage.getItem('currEndDate') || moment().format('YYYY-MM-DD'), + stationIds: sessionStorage.getItem('selectedSta').split(',') || [], }, url: { list: '/webStatistics/findSohPage', diff --git a/src/views/statistics/list.vue b/src/views/statistics/list.vue index 7704928..f81ebfe 100644 --- a/src/views/statistics/list.vue +++ b/src/views/statistics/list.vue @@ -44,6 +44,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getAction, getFileAction } from '../../api/manage' import dateFormat from '../../components/jeecg/JEasyCron/format-date' import Detail from './detail.vue' +import moment from 'moment' export default { name: 'menuTree', props: { @@ -76,18 +77,18 @@ export default { components: { Detail, }, - watch: { - fileName: { - handler: function (val) { - if (val === 'QCPHD' || val === 'SPHDF' || val === 'SPHDP') { - this.$nextTick(() => { - this.queryParam.startTime = this.getBeforeDate(6) - }) - } - }, - immediate: true, - }, - }, + // watch: { + // fileName: { + // handler: function (val) { + // // if (val === 'QCPHD' || val === 'SPHDF' || val === 'SPHDP') { + // this.$nextTick(() => { + // this.queryParam.startTime = this.getBeforeDate(6) + // }) + // // } + // }, + // immediate: true, + // }, + // }, data() { return { excelLoading: false, @@ -96,9 +97,9 @@ export default { isDetail: false, queryParam: { dataType: this.dataType, - startTime: dateFormat(new Date(), 'yyyy-MM-dd'), - endTime: dateFormat(new Date(), 'yyyy-MM-dd'), - stationIds: [], + startTime: sessionStorage.getItem('currStartDate') || moment().subtract(6, 'days').format('YYYY-MM-DD'), + endTime: sessionStorage.getItem('currEndDate') || moment().format('YYYY-MM-DD'), + stationIds: sessionStorage.getItem('selectedSta').split(',') || [], spectralQualifie: this.spectralQualifie, }, url: { @@ -185,6 +186,8 @@ export default { this.isDetail = flag }, handleSelectChange(val) { + console.log(val) + window.sessionStorage.setItem('selectedSta', val) let length = this.stationList.length if (val.length === length) { this.allChecked = true @@ -196,35 +199,44 @@ export default { this.allChecked = val if (val) { this.queryParam.stationIds = this.stationList.map((item) => item.value) + window.sessionStorage.setItem('selectedSta', vathis.queryParam.stationIdsl) } else { this.queryParam.stationIds = [] + window.sessionStorage.setItem('selectedSta', []) } }, filterOption(input, option) { return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 }, - // 获取n天前的日期 - getBeforeDate(n) { - var n = n - var d = new Date() - var year = d.getFullYear() - var mon = d.getMonth() + 1 - var day = d.getDate() - if (day <= n) { - if (mon > 1) { - mon = mon - 1 - } else { - year = year - 1 - mon = 12 - } - } - d.setDate(d.getDate() - n) - year = d.getFullYear() - mon = d.getMonth() + 1 - day = d.getDate() - var s = year + '-' + (mon < 10 ? '0' + mon : mon) + '-' + (day < 10 ? '0' + day : day) - return s + handleStartDateChange(date, dateString) { + console.log(date, dateString) + window.sessionStorage.setItem('currStartDate', date) }, + handleEndDateChange(date) { + window.sessionStorage.setItem('currEndDate', date) + }, + // // 获取n天前的日期 + // getBeforeDate(n) { + // var n = n + // var d = new Date() + // var year = d.getFullYear() + // var mon = d.getMonth() + 1 + // var day = d.getDate() + // if (day <= n) { + // if (mon > 1) { + // mon = mon - 1 + // } else { + // year = year - 1 + // mon = 12 + // } + // } + // d.setDate(d.getDate() - n) + // year = d.getFullYear() + // mon = d.getMonth() + 1 + // day = d.getDate() + // var s = year + '-' + (mon < 10 ? '0' + mon : mon) + '-' + (day < 10 ? '0' + day : day) + // return s + // }, }, computed: { formItems() { @@ -278,6 +290,9 @@ export default { width: '200px', }, }, + on: { + change: this.handleStartDateChange, + }, style: { width: 'auto', }, @@ -294,6 +309,9 @@ export default { width: '200px', }, }, + on: { + change: this.handleEndDateChange, + }, style: { width: 'auto', }, From 1cfb91a933eb6f6c4ce65c153955c2cbdd5aba8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Thu, 11 Jan 2024 16:14:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=20=E6=A0=B8=E8=AE=BE=E6=96=BD=E5=92=8C?= =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AE=A4=E4=B8=8D=E8=83=BD=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E7=9A=84=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index 07a503c..bfffec8 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -254,7 +254,7 @@ export default { try { this.isGettingDataList = true const res = await getAction('/jeecg-station-operation/stationOperation/findList') - res.forEach(item => { + res.forEach((item) => { const { stationId, stationName, stationType } = item item._stationId = `${stationId}${stationName}${stationType}` }) @@ -548,7 +548,10 @@ export default { // 地图图标点击 onMarkerClick(stationInfo) { - this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo) + const { stationType } = stationInfo + if (stationType !== 'NRL' && stationType !== 'Nuclear Facility') { + this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo) + } }, /**