From 4574d451284e3d8d23dfabae97f0804cf292c357 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 19 九月 2024 08:27:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-ui/src/views/main/da/collectionParamConf/index.vue |  142 +++++++++++++++++++++++-----------------------
 1 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
index fcd40a7..267319e 100644
--- a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
+++ b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -26,30 +26,30 @@
 <!--              @keyup.enter.native="handleQuery"-->
 <!--            />-->
 <!--          </el-form-item>-->
-<!--          <el-form-item label="閲囬泦鍙傛暟ID" prop="collectParameterId">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.collectParameterId"-->
-<!--              placeholder="璇疯緭鍏ラ噰闆嗗弬鏁癐D"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="閲囬泦鍙傛暟鍚嶇О" prop="collectParameterName">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.collectParameterName"-->
-<!--              placeholder="璇疯緭鍏ラ噰闆嗗弬鏁板悕绉�"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="鏄惁浣滀负瀵规瘮鍙傛暟" prop="contrastParameterFlag">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.contrastParameterFlag"-->
-<!--              placeholder="璇疯緭鍏ユ槸鍚︿綔涓哄姣斿弬鏁�"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
+          <el-form-item label-width="120" label="閲囬泦鍙傛暟ID" prop="collectParameterId">
+            <el-input
+              v-model="queryParams.collectParameterId"
+              placeholder="璇疯緭鍏ラ噰闆嗗弬鏁癐D"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label-width="140" label="閲囬泦鍙傛暟鍚嶇О" prop="collectParameterName">
+            <el-input
+              v-model="queryParams.collectParameterName"
+              placeholder="璇疯緭鍏ラ噰闆嗗弬鏁板悕绉�"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="瀵规瘮鍙傛暟" prop="contrastParameterFlag">
+            <el-input
+              v-model="queryParams.contrastParameterFlag"
+              placeholder="璇疯緭鍏ユ槸鍚︿綔涓哄姣斿弬鏁�"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 <!--          <el-form-item label="閲囬泦鍙傛暟绫诲瀷" prop="collectParameterType">-->
 <!--            <el-select v-model="queryParams.collectParameterType" placeholder="璇烽�夋嫨閲囬泦鍙傛暟绫诲瀷" clearable>-->
 <!--              <el-option-->
@@ -60,14 +60,14 @@
 <!--              />-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
-          <el-form-item label="浜у搧缂栫爜" prop="productCode">
-            <el-input
-              v-model="queryParams.productCode"
-              placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
+<!--          <el-form-item label="浜у搧缂栫爜" prop="productCode">-->
+<!--            <el-input-->
+<!--              v-model="queryParams.productCode"-->
+<!--              placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"-->
+<!--              clearable-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item style="float: right">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -125,64 +125,64 @@
         <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 label="浜у搧缂栫爜" align="center" width="150" prop="productCode">-->
+<!--          </el-table-column>-->
+          <el-table-column label="宸ュ簭缂栧彿" align="center" width="110" prop="processesCode">
           </el-table-column>
-          <el-table-column label="浜у搧鍨嬪彿" align="center" prop="productModel">
+          <el-table-column label="閲囬泦鍙傛暟ID" align="center" width="130" prop="collectParameterId">
           </el-table-column>
-          <el-table-column label="宸ュ簭缂栧彿" align="center" width="80" prop="processesCode">
+          <el-table-column label="閲囬泦鍙傛暟鍚嶇О" width="250" align="center" prop="collectParameterName">
           </el-table-column>
-          <el-table-column label="宸ュ簭鍚嶇О" width="150" align="center" prop="processesName">
-          </el-table-column>
-          <el-table-column label="閲囬泦鍦板潃" align="center" width="180" prop="gatherAddress">
+          <el-table-column label="閲囬泦鍦板潃" align="center" width="300" prop="gatherAddress">
           </el-table-column>
           <el-table-column label="閲囬泦椤哄簭" align="center" width="80" prop="gatherSequence">
           </el-table-column>
-          <el-table-column label="璁惧" width="150" align="center" prop="device">
+          <el-table-column label="鏄惁浣滀负瀵规瘮鍙傛暟" align="center" width="130" prop="contrastParameterFlag">
           </el-table-column>
-          <el-table-column label="椤圭洰" align="center" prop="project">
-          </el-table-column>
+<!--          <el-table-column label="椤圭洰" align="center" prop="project">-->
+<!--          </el-table-column>-->
 <!--          <el-table-column label="鍙傛暟闆嗙紪鐮�" align="center" width="130" prop="parameterSetCode">-->
 <!--          </el-table-column>-->
 <!--          <el-table-column label="鍙傛暟闆嗗悕绉�" align="center" width="160" prop="parameterSetName">-->
 <!--          </el-table-column>-->
-          <el-table-column label="鍙傛暟缂栫爜" align="center" width="200" prop="collectParameterId">
-          </el-table-column>
-          <el-table-column label="鍙傛暟鍚嶇О" align="center" width="200" prop="collectParameterName">
-          </el-table-column>
+<!--          <el-table-column label="鍙傛暟缂栫爜" align="center" width="200" prop="collectParameterId">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="鍙傛暟鍚嶇О" align="center" width="200" prop="collectParameterName">-->
+<!--          </el-table-column>-->
 <!--          <el-table-column label="鏄惁浣滀负瀵规瘮鍙傛暟" align="center" prop="contrastParameterFlag">-->
 <!--          </el-table-column>-->
-          <el-table-column label="鍙傛暟绫诲瀷" align="center" width="130" prop="collectParameterType">
-          </el-table-column>
-          <el-table-column label="鍗曚綅" align="center" width="80" prop="collectParameterUnit">
-          </el-table-column>
-          <el-table-column label="绮惧害" align="center" prop="accuracy">
-          </el-table-column>
-          <el-table-column label="鏁扮粍闀垮害" align="center" prop="arrayLength">
-          </el-table-column>
+<!--          <el-table-column label="鍙傛暟绫诲瀷" align="center" width="130" prop="collectParameterType">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="鍗曚綅" align="center" width="80" prop="collectParameterUnit">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="绮惧害" align="center" prop="accuracy">-->
+<!--          </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">
-          </el-table-column>
-          <el-table-column label="涓嬮檺鍊�" align="center" prop="paramLower">
-          </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">
+<!--          <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="paramCentral">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="閲囬泦棰戠巼" width="107" align="center" prop="acquisitionFrequency">-->
+<!--          </el-table-column>-->
+          <el-table-column label="鐢佃姱鍙�" align="center" prop="keyNum">
           </el-table-column>
           <el-table-column label="鏄惁閲囬泦" align="center" prop="whetherToCollect">
           </el-table-column>
-          <el-table-column label="澶囨敞" :show-overflow-tooltip='true' align="center" width="160" prop="remarks">
+          <el-table-column label="澶囨敞" :show-overflow-tooltip='true' align="center" prop="remarks">
           </el-table-column>
-          <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">
-          </el-table-column>
-          <el-table-column label="鍒涘缓鏃堕棿" align="center" width="160" prop="createTime">
-          </el-table-column>
-          <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">
-          </el-table-column>
-          <el-table-column label="鏇存敼鏃堕棿" align="center" width="160" prop="updateTime">
-          </el-table-column>
+<!--          <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="鍒涘缓鏃堕棿" align="center" width="160" prop="createTime">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="鏇存敼鏃堕棿" align="center" width="160" prop="updateTime">-->
+<!--          </el-table-column>-->
           <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button

--
Gitblit v1.9.3