From 505237e928b3518483f3a49080a4e0b266bd7e7d Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 11 四月 2024 14:01:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/da/paramCollection/index.vue | 15 +++++++--------
1 files changed, 7 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 a8f4ee1..7e5bf2e 100644
--- a/jcdm-ui/src/views/main/da/paramCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -74,23 +74,22 @@
<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="宸ュ崟缂栧彿" width="150" align="center" prop="workOrderNo"></el-table-column>
-<!-- <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="140" prop="sfcCode" ></el-table-column>-->
- <el-table-column label="浜у搧搴忓垪鍙�" align="center" width="150" prop="productCode"></el-table-column>
+ <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="140" prop="sfcCode" ></el-table-column>
+ <el-table-column label="浜у搧缂栧彿" align="center" width="150" 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>
<!-- <el-table-column label="璁惧缂栧彿" align="center" prop="equipmentNo"></el-table-column>-->
<el-table-column label="鍙傛暟缂栫爜" width="150" align="center" prop="paramCode"></el-table-column>
<el-table-column label="鍙傛暟鍚嶇О" width="150" align="center" prop="paramName"></el-table-column>
- <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="鍙傛暟鍊�" width="160" 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="collectionTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="state"></el-table-column>
- <el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName" width="150" ></el-table-column>
+<!-- <el-table-column label="鐘舵��" align="center" prop="state"></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 fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
@@ -114,7 +113,7 @@
v-hasPermi="['main:paramCollection:remove']"
>鍒犻櫎</el-button>
</template>
- </el-table-column>
+ </el-table-column>-->
</el-table>
<el-empty v-else>
<span slot="description">鏆傛棤鏁版嵁</span>
--
Gitblit v1.9.3