修改数据采集

cheng

2024-01-05 acc79075a4751812287b5734eadc25110d1af0d6

修改数据采集

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

@@ -125,36 +125,39 @@
        <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="130" prop="processesCode">
          <el-table-column label="产品编码" align="center" width="150" prop="productCode">
          </el-table-column>
          <el-table-column label="工序编号" align="center" width="80" prop="processesCode">
          </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="采集参数ID" align="center" width="130" prop="collectParameterId">
          <el-table-column label="参数编码" align="center" width="130" prop="collectParameterId">
          </el-table-column>
          <el-table-column label="采集参数名称" align="center" width="160" prop="collectParameterName">
          <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="130" prop="collectParameterType">

          <el-table-column label="采集地址" align="center" width="180" prop="gatherAddress">
          </el-table-column>
          <el-table-column label="采集参数单位" align="center" width="130" prop="collectParameterUnit">
          <el-table-column label="采集顺序" align="center" width="80" prop="gatherSequence">
          </el-table-column>
          <el-table-column label="数据描述" align="center" width="160" prop="Descriptives">

          <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" 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="产品编码" align="center" width="150" prop="productCode">
          </el-table-column>
          <el-table-column label="采集地址" align="center" width="130" prop="gatherAddress">
          </el-table-column>
          <el-table-column label="采集顺序" align="center" width="130" prop="gatherSequence">
          </el-table-column>

          <el-table-column label="备注" align="center" width="160" prop="remarks">
          </el-table-column>
          <el-table-column label="创建用户" align="center" prop="createUser">

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

@@ -83,8 +83,8 @@
      </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="equipmentNo">
      </el-table-column>-->
      <el-table-column label="入站时间" align="center" prop="inboundTime" width="100">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d}') }}</span>
@@ -95,13 +95,13 @@
          <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="入站是否合格" align="center" prop="inRsSign">
<!--      <el-table-column label="入站是否合格" align="center" prop="inRsSign">
      </el-table-column>
      <el-table-column label="入站NG原因" align="center" prop="inMsgSign">
      </el-table-column>-->
      <el-table-column label="是否合格" align="center" prop="outRsSign">
      </el-table-column>
      <el-table-column label="出站是否合格" align="center" prop="outRsSign">
      </el-table-column>
      <el-table-column label="出站NG原因" align="center" prop="outMsgSign">
      <el-table-column label="NG原因" align="center" prop="outMsgSign">
      </el-table-column>
      <el-table-column label="采集时间" align="center" prop="collectionTime" width="180">
        <template slot-scope="scope">
@@ -183,16 +183,16 @@
            placeholder="请选择出站时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="入站是否合格" prop="inRsSign">
<!--        <el-form-item label="入站是否合格" prop="inRsSign">
          <el-input v-model="form.inRsSign" placeholder="请输入入站是否合格" />
        </el-form-item>
        <el-form-item label="入站NG原因" prop="inMsgSign">
          <el-input v-model="form.inMsgSign" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="出站是否合格" prop="outRsSign">
        </el-form-item>-->
        <el-form-item label="是否合格" prop="outRsSign">
          <el-input v-model="form.outRsSign" placeholder="请输入出站是否合格" />
        </el-form-item>
        <el-form-item label="出站NG原因" prop="outMsgSign">
        <el-form-item label="NG原因" prop="outMsgSign">
          <el-input v-model="form.outMsgSign" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="采集时间" prop="collectionTime">