Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
This commit is contained in:
commit
64e3c33ccd
|
@ -1201,8 +1201,6 @@ export default {
|
|||
|
||||
// 重新分析
|
||||
async reProcessing() {
|
||||
this.abc = true
|
||||
this.reprocessingModalVisible = true
|
||||
if (this.isProcessing) {
|
||||
return
|
||||
}
|
||||
|
@ -1222,8 +1220,6 @@ export default {
|
|||
result.DetailedInformation = this.detailedInfomation
|
||||
this.dataProsess(result)
|
||||
} else {
|
||||
this.abc = true
|
||||
this.reprocessingModalVisible = false
|
||||
this.isLoading = false
|
||||
const arr = message.split('\n')
|
||||
this.$warning({
|
||||
|
@ -1444,6 +1440,16 @@ export default {
|
|||
},
|
||||
},
|
||||
watch: {
|
||||
currStep: {
|
||||
handler(val) {
|
||||
console.log('dfad', val)
|
||||
if (val && val == '0') {
|
||||
this.abc = true
|
||||
this.reprocessingModalVisible = true
|
||||
}
|
||||
},
|
||||
immediate: true,
|
||||
},
|
||||
sample: {
|
||||
handler(newVal, oldVal) {
|
||||
console.log('newValnewVal', newVal)
|
||||
|
|
Loading…
Reference in New Issue
Block a user