Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

This commit is contained in:
xiaoguangbin 2023-11-02 10:25:19 +08:00
commit 04c9092b76

View File

@ -114,6 +114,7 @@ export default {
return { return {
queryParam: { queryParam: {
menuTypes: 'G,B', menuTypes: 'G,B',
sampleType: 'P',
startDate: moment().add(-7, 'd').format('YYYY-MM-DD'), startDate: moment().add(-7, 'd').format('YYYY-MM-DD'),
endDate: moment().format('YYYY-MM-DD'), endDate: moment().format('YYYY-MM-DD'),
dbName: 'auto', dbName: 'auto',
@ -323,7 +324,16 @@ export default {
value: 'G', value: 'G',
}, },
] ]
this.sampleTypeOption = event == 'B' ? arr_B : event == 'G' ? arr_G : arr_A if (event == 'B') {
this.sampleTypeOption = arr_B
this.queryParam.sampleType = 'B'
} else if (event == 'G') {
this.sampleTypeOption = arr_G
this.queryParam.sampleType = 'P'
} else {
this.sampleTypeOption = arr_A
this.queryParam.sampleType = 'P'
}
this.getStationAndDetectorList(event) this.getStationAndDetectorList(event)
}, },
}, },