From defa824eab2350fd6abfd10abd8f4df94749e336 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 31 七月 2024 11:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-sample/detail.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-sample/detail.vue b/src/components/do/b1-sample/detail.vue
index 938461d..f76f413 100644
--- a/src/components/do/b1-sample/detail.vue
+++ b/src/components/do/b1-sample/detail.vue
@@ -66,12 +66,12 @@
</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="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="equipName" label="璁惧" min-width="100" show-overflow-tooltip>
+ <el-table-column prop="equipValue" label="璁惧" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
- {{handleData(scope.row.equipName)}}
+ {{handleData(scope.row.equipValue)}}
</template>
</el-table-column>
<el-table-column prop="entrustCode" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column>
@@ -135,9 +135,12 @@
})
},
handleData(e){
- let info = JSON.parse(e).map(item => {
+ let info = ''
+ if(e){
+ info = JSON.parse(e).map(item => {
return item.v;
}).join(',')
+ }
return info
}
}
--
Gitblit v1.9.3