From 798db047afc6346e96460f00b6fb30576bcfd328 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 16:01:27 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspection-order.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 245c962..8d285c2 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -77,6 +77,7 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="playOrder(4)">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
</el-col>
</el-row>
@@ -227,7 +228,7 @@
</el-dialog>
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
- <Add :active="active" :currentId="currentId" v-if="active<4" />
+ <Add :active="active" :currentId="currentId" v-show="active<4" />
<fiberOpticConfig :currentId="currentId" v-if="active==4" />
</div>
</div>
--
Gitblit v1.9.3