From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/view/index.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index 5a8417f..bf6e4d7 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -394,7 +394,7 @@
</span>
</el-dialog>
<notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
- <timer></timer>
+ <!-- <timer></timer> -->
</div>
</template>
@@ -518,10 +518,12 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
- }).then(() => {
- this.tabs.splice(index, 1);
- let data = this.tabs[this.tabs.length - 1]
- this.upTabActive(data.k)
+ }).then( async () => {
+ if(await obj.$refs.Inspection.$refs.CircuitParameters.saveAll()){
+ this.tabs.splice(index, 1);
+ let data = this.tabs[this.tabs.length - 1]
+ this.upTabActive(data.k)
+ }
})
return
}
--
Gitblit v1.9.3