From 996e3e343760bcfa23b55138f85abd62d6ebfb22 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 25 十二月 2024 09:02:07 +0800
Subject: [PATCH] 报告预览调试

---
 src/components/do/b1-sample/detail.vue |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/do/b1-sample/detail.vue b/src/components/do/b1-sample/detail.vue
index f76f413..92e0658 100644
--- a/src/components/do/b1-sample/detail.vue
+++ b/src/components/do/b1-sample/detail.vue
@@ -66,8 +66,10 @@
 				</el-table-column>
 				<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="100"
 					show-overflow-tooltip></el-table-column>
+        <el-table-column prop="inspectionItemSubclass" label="妫�楠屽瓙椤�" min-width="100"
+					show-overflow-tooltip></el-table-column>
 				<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip v-if="PROJECT=='瑁呭鐢电紗'"></el-table-column>
-				<el-table-column prop="laboratory" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="sonLaboratory" label="绔欑偣" min-min-width="100" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="equipValue" label="璁惧" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -77,10 +79,14 @@
 				<el-table-column prop="entrustCode" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="updateUserName" label="妫�楠屼汉" min-width="100" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="updateTime" label="妫�楠屾椂闂�" min-width="100" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="lastValue" label="妫�楠屽��" min-width="100" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="insResult" label="缁撹" min-width="100">
 					<template slot-scope="scope">
             <el-tag
-              :type="scope.row.insResult==1?'success':'danger'" size="medium">{{scope.row.insResult==1?'鍚堟牸':'涓嶅悎鏍�'}}</el-tag>
+              :type="scope.row.insResult === 1 ? 'success' : (scope.row.insResult === 0 ? 'danger' : (scope.row.insResult === 3 ? 'gray' : 'info'))"
+              size="medium">
+              {{ scope.row.insResult === 1 ? '鍚堟牸' : (scope.row.insResult === 0 ? '涓嶅悎鏍�' : (scope.row.insResult === 3 ? '涓嶅垽瀹�' : '寰呭畾')) }}
+            </el-tag>
 					</template>
 				</el-table-column>
 			</el-table>

--
Gitblit v1.9.3