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-10-12 17:29:23 +08:00
commit 64e3c33ccd

View File

@ -1201,8 +1201,6 @@ export default {
// //
async reProcessing() { async reProcessing() {
this.abc = true
this.reprocessingModalVisible = true
if (this.isProcessing) { if (this.isProcessing) {
return return
} }
@ -1222,8 +1220,6 @@ export default {
result.DetailedInformation = this.detailedInfomation result.DetailedInformation = this.detailedInfomation
this.dataProsess(result) this.dataProsess(result)
} else { } else {
this.abc = true
this.reprocessingModalVisible = false
this.isLoading = false this.isLoading = false
const arr = message.split('\n') const arr = message.split('\n')
this.$warning({ this.$warning({
@ -1444,6 +1440,16 @@ export default {
}, },
}, },
watch: { watch: {
currStep: {
handler(val) {
console.log('dfad', val)
if (val && val == '0') {
this.abc = true
this.reprocessingModalVisible = true
}
},
immediate: true,
},
sample: { sample: {
handler(newVal, oldVal) { handler(newVal, oldVal) {
console.log('newValnewVal', newVal) console.log('newValnewVal', newVal)