From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001 From: 朱佳吉 <1527963051@qq.com> Date: 星期四, 09 五月 2024 14:15:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/do/b1-sample/detail.vue | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/components/do/b1-sample/detail.vue b/src/components/do/b1-sample/detail.vue index 5a07876..cd913d4 100644 --- a/src/components/do/b1-sample/detail.vue +++ b/src/components/do/b1-sample/detail.vue @@ -69,7 +69,11 @@ <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip></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="equipValue" label="璁惧" min-width="100" show-overflow-tooltip></el-table-column> + <el-table-column prop="equipName" label="璁惧" min-width="100" show-overflow-tooltip> + <template slot-scope="scope"> + {{handleData(scope.row.equipName)}} + </template> + </el-table-column> <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> @@ -129,6 +133,12 @@ this.histories = histories; this.products = products; }) + }, + handleData(e){ + let info = JSON.parse(e).map(item => { + return item.v; + }).join(',') + return info } } } -- Gitblit v1.9.3