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 | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index d8bc62c..bf6e4d7 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -348,7 +348,7 @@
</div>
<div class="component_view">
<component class="com_index" v-for="(com, index) in tabs" :is="com.u" :key="com.k" v-show="com.k == tabActive"
- :ref="`com-${com.k}`">
+ :ref="`com-${com.k}`" :param="param">
</component>
</div>
</div>
@@ -394,7 +394,7 @@
</span>
</el-dialog>
<notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
- <timer></timer>
+ <!-- <timer></timer> -->
</div>
</template>
@@ -432,7 +432,8 @@
query:{},
newMsg:false,
timer:null,
- menuId: 0
+ menuId: 0,
+ param:null,
};
},
created() {
@@ -499,12 +500,33 @@
if (ob.u == "") ob.u = "nullFace"
this.tabs.push(ob);
}
+ if(ob.param){
+ this.param = this.HaveJson(ob.param)
+ this.param.textNum = Math.random(100)
+ }else{
+ this.param = null
+ }
this.$refs['popoverName'].forEach(a=>{
a.doClose()
})
this.saveClick()
},
removeTab(index) {
+ let obj = this.$refs[`com-${this.tabs[index].k}`][0]
+ if(obj.state&&obj.state==1&&this.tabs[index].v=='妫�楠屼换鍔�'&&(obj.version===0||obj.version===1)){
+ this.$confirm('璇风‘璁ゅ綋鍓嶆暟鎹槸鍚﹀叏閮ㄤ繚瀛橈紝鏄惁鍏抽棴褰撳墠椤甸潰锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).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
+ }
this.tabs.splice(index, 1);
let data = this.tabs[this.tabs.length - 1]
this.upTabActive(data.k)
--
Gitblit v1.9.3