From db1c4a8dd11613ab14606bcf64504fd1662d1031 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 28 十月 2024 15:07:55 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 1c8dcce..c2bf51b 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -918,7 +918,6 @@
<script>
import ValueTable from '../../tool/value-table.vue'
- import Circuit from './circuit.vue'
import file from '../../../util/file'
import excelFunction from '../../../util/excelFountion'
import CircuitParameters1 from './circuit-parameters1.vue'
@@ -930,7 +929,6 @@
props: ['sonLaboratory', 'orderId', 'state','inspectorList','version','orderStateId','isLook','num1','noBack'],
components: {
ValueTable,
- Circuit,
CircuitParameters1,
CircuitParameters2,
filePreview,
--
Gitblit v1.9.3