From eb70334a4635b1c704d9e68469a6117cdc6e7251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Mon, 15 Jan 2024 17:17:11 +0800 Subject: [PATCH] =?UTF-8?q?arr=20=20=20rrr=20=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/JeecgListMixin.js | 2 +- .../statistics/imsProducts/arr/index.vue | 32 ++++++++++++------ .../statistics/imsProducts/rrr/index.vue | 33 ++++++++++++------- 3 files changed, 45 insertions(+), 22 deletions(-) diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js index 8144917..ccda7d3 100644 --- a/src/mixins/JeecgListMixin.js +++ b/src/mixins/JeecgListMixin.js @@ -55,7 +55,7 @@ export const JeecgListMixin = { created() { if (!this.disableMixinCreated) { console.log(' -- mixin created -- ') - // this.loadData(); + this.loadData(); //初始化字典配置 在自己页面定义 this.initDictConfig(); } diff --git a/src/views/statistics/imsProducts/arr/index.vue b/src/views/statistics/imsProducts/arr/index.vue index 6fee30b..7567157 100644 --- a/src/views/statistics/imsProducts/arr/index.vue +++ b/src/views/statistics/imsProducts/arr/index.vue @@ -81,13 +81,13 @@ const columns = [ title: 'Analyst', align: 'left', dataIndex: 'analyst', - } + }, ] import { compareDate } from '../../commom' 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], @@ -100,9 +100,14 @@ export default { isImmediate: true, columns, queryParam: { - startTime: dateFormat(new Date(), 'yyyy-MM-dd'), - endTime: dateFormat(new Date(), 'yyyy-MM-dd'), + startTime: sessionStorage.getItem('currStartDate') + ? sessionStorage.getItem('currStartDate') + : moment().subtract(6, 'days').format('YYYY-MM-DD'), + endTime: sessionStorage.getItem('currEndDate') + ? sessionStorage.getItem('currEndDate') + : moment().format('YYYY-MM-DD'), stationIds: [], + qualifie: undefined, }, url: { list: '/radionuclide/findAutoPage', @@ -119,7 +124,7 @@ export default { } }, created() { - this.queryParam.startTime = this.getBeforeDate(9) + // this.queryParam.startTime = this.getBeforeDate(9) this.findStationList() }, methods: { @@ -192,8 +197,11 @@ export default { if (res.result.length > 0) { this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId })) // 进入页面自动查询 - this.queryParam.stationIds = this.stationList.map((item) => item.value) - this.allChecked = true + let arr = sessionStorage.getItem('selectedSta') ? sessionStorage.getItem('selectedSta').split(',') : [] + this.queryParam.stationIds = arr.map((item) => Number(item)) + this.queryParam.qualifie = sessionStorage.getItem('qualifie') + ? sessionStorage.getItem('qualifie') + : undefined this.searchQueryData() } else { this.stationList = [] @@ -220,8 +228,9 @@ export default { this.queryParam.stationIds = [] } }, - handleQualifieChange(val){ + handleQualifieChange(val) { this.queryParam.qualifie = val + sessionStorage.setItem('qualifie', val) }, getBeforeDate(n) { var n = n @@ -327,7 +336,10 @@ export default { props: { allowClear: true, placeholder: 'Select qualifie', - options: [{label: 'FULL', value: "FULL"}, {label: 'PREL', value: "PREL"}], + options: [ + { label: 'FULL', value: 'FULL' }, + { label: 'PREL', value: 'PREL' }, + ], style: { width: '200px', }, @@ -338,7 +350,7 @@ export default { style: { width: 'auto', }, - } + }, ] }, }, diff --git a/src/views/statistics/imsProducts/rrr/index.vue b/src/views/statistics/imsProducts/rrr/index.vue index 751c936..0ac6009 100644 --- a/src/views/statistics/imsProducts/rrr/index.vue +++ b/src/views/statistics/imsProducts/rrr/index.vue @@ -81,13 +81,13 @@ const columns = [ title: 'Analyst', align: 'left', dataIndex: 'analyst', - } + }, ] import { compareDate } from '../../commom' 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], @@ -100,10 +100,14 @@ export default { isImmediate: true, columns, queryParam: { - startTime: dateFormat(new Date(), 'yyyy-MM-dd'), - endTime: dateFormat(new Date(), 'yyyy-MM-dd'), + startTime: sessionStorage.getItem('currStartDate') + ? sessionStorage.getItem('currStartDate') + : moment().subtract(6, 'days').format('YYYY-MM-DD'), + endTime: sessionStorage.getItem('currEndDate') + ? sessionStorage.getItem('currEndDate') + : moment().format('YYYY-MM-DD'), stationIds: [], - qualifie: '' + qualifie: undefined, }, url: { list: '/radionuclide/findReviewedPage', @@ -120,7 +124,7 @@ export default { } }, created() { - this.queryParam.startTime = this.getBeforeDate(9) + // this.queryParam.startTime = this.getBeforeDate(9) this.findStationList() }, methods: { @@ -193,8 +197,11 @@ export default { if (res.result.length > 0) { this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId })) // 进入页面自动查询 - this.queryParam.stationIds = this.stationList.map((item) => item.value) - this.allChecked = true + let arr = sessionStorage.getItem('selectedSta') ? sessionStorage.getItem('selectedSta').split(',') : [] + this.queryParam.stationIds = arr.map((item) => Number(item)) + this.queryParam.qualifie = sessionStorage.getItem('qualifie') + ? sessionStorage.getItem('qualifie') + : undefined this.searchQueryData() } else { this.stationList = [] @@ -220,8 +227,9 @@ export default { this.queryParam.stationIds = [] } }, - handleQualifieChange(val){ + handleQualifieChange(val) { this.queryParam.qualifie = val + sessionStorage.setItem('qualifie', val) }, getBeforeDate(n) { var n = n @@ -327,7 +335,10 @@ export default { props: { allowClear: true, placeholder: 'Select qualifie', - options: [{label: 'FULL', value: "FULL"}, {label: 'PREL', value: "PREL"}], + options: [ + { label: 'FULL', value: 'FULL' }, + { label: 'PREL', value: 'PREL' }, + ], style: { width: '200px', }, @@ -338,7 +349,7 @@ export default { style: { width: 'auto', }, - } + }, ] }, },