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/collectionParamConf/index.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
index 866cb8b..a88cc5a 100644
--- a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
+++ b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -125,8 +125,10 @@
<el-table border v-loading="loading" :data="collectionParamConfList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="涓婚敭id" align="center" prop="id" />-->
-<!-- <el-table-column label="浜у搧缂栫爜" align="center" width="150" prop="productCode">-->
-<!-- </el-table-column>-->
+ <el-table-column label="浜у搧缂栫爜" align="center" width="150" prop="productCode">
+ </el-table-column>
+ <el-table-column label="浜у搧鍨嬪彿" align="center" prop="productModel">
+ </el-table-column>
<el-table-column label="宸ュ簭缂栧彿" align="center" width="80" prop="processesCode">
</el-table-column>
<el-table-column label="宸ュ簭鍚嶇О" width="150" align="center" prop="processesName">
@@ -157,8 +159,6 @@
</el-table-column>
<el-table-column label="鏁扮粍闀垮害" align="center" prop="arrayLength">
</el-table-column>
-
-
<!-- <el-table-column label="鏁版嵁鎻忚堪" align="center" width="160" prop="Descriptives">
</el-table-column>-->
<el-table-column label="涓婇檺鍊�" align="center" prop="paramUpper">
@@ -167,9 +167,6 @@
</el-table-column>
<el-table-column label="涓績鍊�" align="center" prop="paramCentral">
</el-table-column>
-
-
-
<el-table-column label="閲囬泦棰戠巼" width="107" align="center" prop="acquisitionFrequency">
</el-table-column>
<el-table-column label="涓氬姟闇�姹傞儴闂�" width="155" align="center" prop="demandDepartment">
@@ -417,7 +414,9 @@
acquisitionFrequency: null,
demandDepartment: null,
whetherToCollect: null,
- defaultValue: null
+ defaultValue: null,
+ productModel: null
+
};
this.resetForm("form");
},
--
Gitblit v1.9.3