From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突
---
src/views/technology/document/teststandard.vue | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/views/technology/document/teststandard.vue b/src/views/technology/document/teststandard.vue
index 8b3d2bc..61b085a 100644
--- a/src/views/technology/document/teststandard.vue
+++ b/src/views/technology/document/teststandard.vue
@@ -51,7 +51,7 @@
width="50"
/>
<el-table-column label="鍙傛暟缂栧彿" prop="code" align="center" />
- <el-table-column label="鍙傛暟椤�" prop="parameterItem" align="center" />
+ <el-table-column label="鍙傛暟椤�" prop="parameterItem" align="center"/>
<el-table-column
label="瑕佹眰鍊�"
prop="referenceValue"
@@ -59,38 +59,46 @@
width="120px"
>
<template slot-scope="scope">
+ <el-tooltip class="item" effect="dark" :content="scope.row.referenceValue" >
<el-input
v-model="scope.row.referenceValue"
placeholder="鍊�"
:disabled="!editable"
></el-input>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column label="鍗曚綅" prop="unit" align="center" width="120px">
<template slot-scope="scope">
+ <el-tooltip class="item" effect="dark" :content="scope.row.unit" >
<el-input
v-model="scope.row.unit"
placeholder="鍗曚綅"
:disabled="!editable"
></el-input>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column label="娴嬭瘯鏂规硶" prop="method" align="center">
<template slot-scope="scope">
+ <el-tooltip class="item" effect="dark" :content="scope.row.method" >
<el-input
v-model="scope.row.method"
placeholder=""
:disabled="!editable"
></el-input>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column label="娴嬭瘯鐩殑" prop="purpose" align="center">
<template slot-scope="scope">
+ <el-tooltip class="item" effect="dark" :content="scope.row.purpose" >
<el-input
v-model="scope.row.purpose"
placeholder=""
:disabled="!editable"
></el-input>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" fixed="right">
--
Gitblit v1.9.3