From c80c6b24a0d76321780d71c2d4249f5144693096 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期二, 23 一月 2024 11:16:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/da/paramCollection/index.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/paramCollection/index.vue b/jcdm-ui/src/views/main/da/paramCollection/index.vue
index 7721cd3..f997702 100644
--- a/jcdm-ui/src/views/main/da/paramCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -73,9 +73,8 @@
<el-table v-loading="loading" border :data="paramCollectionList" @selection-change="handleSelectionChange" v-if="paramCollectionList.length > 0">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭id" align="center" prop="id" />
<el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo"></el-table-column>
- <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="100" prop="sfcCode"></el-table-column>
+ <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="140" prop="sfcCode" ></el-table-column>
<el-table-column label="浜у搧缂栧彿" align="center" prop="productCode"></el-table-column>
<el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine"></el-table-column>
<el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode"></el-table-column>
@@ -84,28 +83,31 @@
<el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue"></el-table-column>
<el-table-column label="鍙傛暟涓婇檺" align="center" prop="paramUpper"></el-table-column>
<el-table-column label="鍙傛暟涓嬮檺" align="center" prop="paramLower"></el-table-column>
- <el-table-column label="鏍囧噯鍊�" align="center" prop="paramStandard"></el-table-column>
- <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="180">
+ <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="鐘舵��" align="center" prop="state"></el-table-column>
- <el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName"></el-table-column>
+ <el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName" width="150" ></el-table-column>
<el-table-column label="鍗曚綅" align="center" prop="unit"></el-table-column>
<el-table-column label="绫诲瀷" align="center" prop="type"></el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
+ <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope">
<el-button
size="mini"
- type="text"
+ type="success"
+ plain
+ style="width: 72px"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['main:paramCollection:edit']"
>淇敼</el-button>
<el-button
size="mini"
- type="text"
+ type="danger"
+ plain
+ style="width: 72px"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['main:paramCollection:remove']"
--
Gitblit v1.9.3