Merge remote-tracking branch 'origin/master'

cl

2024-01-29 b623db3030713d83dac4d90c4f71f4312bd7f9ce

 jcdm-ui/src/views/main/da/collectionParamConf/index.vue

@@ -10,56 +10,6 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
<!--          <el-form-item label="参数集编码" prop="parameterSetCode">-->
<!--            <el-input-->
<!--              v-model="queryParams.parameterSetCode"-->
<!--              placeholder="请输入参数集编码"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="参数集名称" prop="parameterSetName">-->
<!--            <el-input-->
<!--              v-model="queryParams.parameterSetName"-->
<!--              placeholder="请输入参数集名称"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="采集参数ID" prop="collectParameterId">-->
<!--            <el-input-->
<!--              v-model="queryParams.collectParameterId"-->
<!--              placeholder="请输入采集参数ID"-->
<!--              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="采集参数类型" prop="collectParameterType">-->
<!--            <el-select v-model="queryParams.collectParameterType" placeholder="请选择采集参数类型" clearable>-->
<!--              <el-option-->
<!--                v-for="dict in dict.type.${dictType}"-->
<!--                :key="dict.value"-->
<!--                :label="dict.label"-->
<!--                :value="dict.value"-->
<!--              />-->
<!--            </el-select>-->
<!--          </el-form-item>-->
          <el-form-item label="产品编码" prop="productCode">
            <el-input
              v-model="queryParams.productCode"
@@ -137,8 +87,7 @@
          </el-table-column>
          <el-table-column label="参数名称" align="center" width="160" prop="collectParameterName">
          </el-table-column>
<!--          <el-table-column label="是否作为对比参数" align="center" prop="contrastParameterFlag">-->
<!--          </el-table-column>-->


          <el-table-column label="采集地址" align="center" width="180" prop="gatherAddress">
          </el-table-column>
@@ -149,8 +98,7 @@
          </el-table-column>
          <el-table-column label="单位" align="center" width="80" prop="collectParameterUnit">
          </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">
@@ -160,14 +108,12 @@

          <el-table-column label="备注" align="center" width="160" 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" width="160" prop="contrastParameterFlag">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.contrastParameterFlag"/>
            </template>
          </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
@@ -202,12 +148,12 @@
    />

    <!-- 添加或修改采集参数配置对话框 -->
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="800px" append-to-body>
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="1000px" append-to-body>
      <span slot="title">
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" inline :model="form" :rules="rules" label-width="120px">
      <el-form ref="form" inline :model="form" :rules="rules"  label-width="200px" >
        <el-form-item label="工序编号" prop="processesCode">
          <el-select style="width: 100%" @change="handleSelectChangeprocessesCode(form.processesCode)" v-model="form.processesCode" placeholder="请选择工序编号">
            <el-option
@@ -230,28 +176,16 @@
        <el-form-item label="采集参数名称" prop="collectParameterName">
          <el-input v-model="form.collectParameterName" placeholder="请输入采集参数名称" />
        </el-form-item>
        <el-form-item label="是否作为对比参数"  prop="contrastParameterFlag" label-width="120">
<!--          <el-select v-model="form.contrastParameterFlag" placeholder="请选择是否作为对比参数">-->
<!--            <el-option-->
<!--              v-for="dict in dict.type.sys_yes_no"-->
<!--              :key="dict.value"-->
<!--              :label="dict.label"-->
<!--              :value="dict.value"-->
<!--            ></el-option>-->
<!--          </el-select>-->
        <el-form-item label="是否作为对比参数"  prop="contrastParameterFlag" >
          <el-select v-model="form.contrastParameterFlag" placeholder="请选择是否作为对比参数">
            <el-option
              v-for="dict in dict.type.sys_yes_no"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>


<!--        <el-form-item label="采集参数类型" prop="collectParameterType">-->
<!--          <el-select v-model="form.collectParameterType" 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-item label="采集参数单位" prop="collectParameterUnit">
          <el-input v-model="form.collectParameterUnit" placeholder="请输入采集参数单位" />
        </el-form-item>
@@ -294,6 +228,7 @@

export default {
  name: "CollectionParamConf",
  dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
  data() {
    return {
      options: [],