Merge remote-tracking branch 'origin/master'

懒羊羊

2024-04-11 505237e928b3518483f3a49080a4e0b266bd7e7d

 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");
    },