From 6d2e054b221d145036710b1e4e7b3e417dcf07e9 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 13:41:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspection-order.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 796eba5..569d44e 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -204,7 +204,8 @@
</el-dialog>
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
- <Add :active="active" :currentId="currentId" />
+ <Add :active="active" :currentId="currentId" v-if="active<4" />
+ <fiberOpticConfig :currentId="currentId" v-if="active==4" />
</div>
</div>
</template>
@@ -212,10 +213,12 @@
<script>
import ValueTable from '../tool/value-table.vue'
import Add from '../do/b1-ins-order/add.vue'
+ import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
export default {
components: {
ValueTable,
- Add
+ Add,
+ fiberOpticConfig
},
data() {
return {
@@ -426,7 +429,7 @@
},
],
tabIndex: 0,
- active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
+ active: 4, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
currentId: null
}
},
--
Gitblit v1.9.3