Merge remote-tracking branch 'origin/master'

yyt

2024-01-23 c80c6b24a0d76321780d71c2d4249f5144693096

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

@@ -73,9 +73,8 @@

    <el-table v-loading="loading" border :data="paramCollectionList" @selection-change="handleSelectionChange" v-if="paramCollectionList.length > 0">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="主键id" align="center" prop="id" />
      <el-table-column label="工单编号" align="center" prop="workOrderNo"></el-table-column>
      <el-table-column label="总成序列号" align="center" width="100" prop="sfcCode"></el-table-column>
      <el-table-column label="总成序列号" align="center" width="140" prop="sfcCode" ></el-table-column>
      <el-table-column label="产品编号" align="center" prop="productCode"></el-table-column>
      <el-table-column label="产线编号" align="center" prop="productionLine"></el-table-column>
      <el-table-column label="工位编号" align="center" prop="locationCode"></el-table-column>
@@ -84,28 +83,31 @@
      <el-table-column label="参数值" align="center" prop="paramValue"></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="paramStandard"></el-table-column>
      <el-table-column label="采集时间" align="center" prop="collectionTime" width="180">
      <el-table-column label="采集时间" align="center" prop="collectionTime" width="100">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="状态" align="center" prop="state"></el-table-column>
      <el-table-column label="参数名称" align="center" prop="paramName"></el-table-column>
      <el-table-column label="参数名称" align="center" prop="paramName" width="150" ></el-table-column>
      <el-table-column label="单位" align="center" prop="unit"></el-table-column>
      <el-table-column label="类型" align="center" prop="type"></el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
      <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width" >
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            type="success"
            plain
            style="width: 72px"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['main:paramCollection:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            type="danger"
            plain
            style="width: 72px"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['main:paramCollection:remove']"