From d86d6a6dca39eff9cbd9073c9e23e58308864e51 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期二, 23 一月 2024 08:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/da/paramCollection/index.vue | 108 +++++++----------------------------------------------
1 files changed, 15 insertions(+), 93 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/paramCollection/index.vue b/jcdm-ui/src/views/main/da/paramCollection/index.vue
index 223ef78..7721cd3 100644
--- a/jcdm-ui/src/views/main/da/paramCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -74,86 +74,26 @@
<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">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.workOrderNo"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="100" prop="sfcCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.sfcCode"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productCode"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productionLine"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.locationCode"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="璁惧缂栧彿" align="center" prop="equipmentNo">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.equipmentNo"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鍙傛暟缂栫爜" align="center" prop="paramCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramCode"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramValue"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鍙傛暟涓婇檺" align="center" prop="paramUpper">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramUpper"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鍙傛暟涓嬮檺" align="center" prop="paramLower">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramLower"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鏍囧噯鍊�" align="center" prop="paramStandard">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramStandard"/>-->
-<!-- </template>-->
- </el-table-column>
+ <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" 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="鍙傛暟缂栫爜" align="center" prop="paramCode"></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="鏍囧噯鍊�" align="center" prop="paramStandard"></el-table-column>
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="180">
<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">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.state"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramName"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="鍗曚綅" align="center" prop="unit">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.unit"/>-->
-<!-- </template>-->
- </el-table-column>
- <el-table-column label="绫诲瀷" align="center" prop="type">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.type"/>-->
-<!-- </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="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" >
<template slot-scope="scope">
<el-button
@@ -230,18 +170,6 @@
placeholder="璇烽�夋嫨閲囬泦鏃堕棿">
</el-date-picker>
</el-form-item>
-<!-- <el-form-item label="棰勭暀瀛楁1" prop="spareField1">-->
-<!-- <el-input v-model="form.spareField1" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="棰勭暀瀛楁2" prop="spareField2">-->
-<!-- <el-input v-model="form.spareField2" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
-<!-- <el-input v-model="form.createUser" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
-<!-- <el-input v-model="form.updateUser" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
<el-form-item label="鐘舵��" prop="state">
<el-input v-model="form.state" placeholder="璇疯緭鍏ョ姸鎬�" />
</el-form-item>
@@ -253,12 +181,6 @@
</el-form-item>
<el-form-item label="绫诲瀷" prop="type">
<el-select v-model="form.type" placeholder="璇烽�夋嫨绫诲瀷">
-<!-- <el-option-->
-<!-- v-for="dict in dict.type.${dictType}"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="dict.value"-->
-<!-- ></el-option>-->
</el-select>
</el-form-item>
</el-form>
--
Gitblit v1.9.3