Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-09 24a64475ee9582f0f09f899b7800a4f7101eaa30

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

@@ -1,28 +1,71 @@
<template>
  <div class="app-container">
    <el-card class="box-card">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="产品编码" prop="productCode">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="总成序列号" prop="sfcCode">
        <el-input
          v-model="queryParams.productCode"
          placeholder="请输入产品编码"
          v-model="queryParams.sfcCode"
          placeholder="请输入总成序列号"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="产品名称" prop="productName">
      <el-form-item label="工单编号" prop="workOrderNo">
        <el-input
          v-model="queryParams.productName"
          placeholder="请输入产品名称"
          v-model="queryParams.workOrderNo"
          placeholder="请输入工单编号"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="工序编号" prop="processesCode">
        <el-input
          v-model="queryParams.processesCode"
          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 type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
      <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="100px">
        <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="paramCode">
          <el-input
            v-model="queryParams.paramCode"
            placeholder="请输入参数编码"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="参数类型" prop="type">
          <el-input
            v-model="queryParams.type"
            placeholder="请输入参数类型"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="采集时间" prop="collectionTime">
          <el-date-picker clearable
                          v-model="queryParams.collectionTime"
                          type="date"
                          value-format="yyyy-MM-dd"
                          placeholder="请选择采集时间">
          </el-date-picker>
        </el-form-item>
      </el-form>
    </el-card>
    <el-card style="margin-top: 10px" class="box-card">
    <el-row :gutter="10" class="mb8">
@@ -73,61 +116,27 @@

    <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">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.workOrderNo"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="总成序列号" align="center" width="100" prop="sfcCode">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.sfcCode"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="产品编号" align="center" prop="productCode">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productCode"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="产线编号" align="center" prop="productionLine">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productionLine"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="工位编号" align="center" prop="locationCode">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.locationCode"/>-->
<!--        </template>-->
      <el-table-column label="工序编号" align="center" prop="processesCode">
      </el-table-column>
      <el-table-column label="设备编号" align="center" prop="equipmentNo">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.equipmentNo"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="参数编码" align="center" prop="paramCode">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramCode"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="参数值" align="center" prop="paramValue">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramValue"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="参数上限" align="center" prop="paramUpper">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramUpper"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="参数下限" align="center" prop="paramLower">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramLower"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="标准值" align="center" prop="paramStandard">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramStandard"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="采集时间" align="center" prop="collectionTime" width="180">
        <template slot-scope="scope">
@@ -135,37 +144,27 @@
        </template>
      </el-table-column>
      <el-table-column label="状态" align="center" prop="state">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.state"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="参数名称" align="center" prop="paramName">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramName"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="单位" align="center" prop="unit">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.unit"/>-->
<!--        </template>-->
      </el-table-column>
      <el-table-column label="类型" align="center" prop="type">
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.type"/>-->
<!--        </template>-->
      <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" label="操作" width="200" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            type="success"
            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"
            style="width: 72px"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['main:paramCollection:remove']"
@@ -187,40 +186,40 @@
    />

    <!-- 添加或修改设备产品过程参数采集对话框 -->
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="600px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="工单编号" prop="workOrderNo">
          <el-input v-model="form.workOrderNo" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.workOrderNo"  placeholder="请输入工单编号" />
        </el-form-item>
        <el-form-item label="总成序列号" prop="sfcCode">
          <el-input v-model="form.sfcCode" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.sfcCode"  placeholder="请输入总成序列号" />
        </el-form-item>
        <el-form-item label="产品编号" prop="productCode">
          <el-input v-model="form.productCode" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.productCode"  placeholder="请输入产品编号" />
        </el-form-item>
        <el-form-item label="产线编号" prop="productionLine">
          <el-input v-model="form.productionLine" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.productionLine"  placeholder="请输入产线编号" />
        </el-form-item>
        <el-form-item label="工位编号" prop="locationCode">
          <el-input v-model="form.locationCode" type="textarea" placeholder="请输入内容" />
        <el-form-item label="工序编号" prop="processesCode">
          <el-input v-model="form.processesCode"  placeholder="请输入工序编号" />
        </el-form-item>
        <el-form-item label="设备编号" prop="equipmentNo">
          <el-input v-model="form.equipmentNo" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.equipmentNo"  placeholder="请输入设备编号" />
        </el-form-item>
        <el-form-item label="参数编码" prop="paramCode">
          <el-input v-model="form.paramCode" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.paramCode"  placeholder="请输入参数编码" />
        </el-form-item>
        <el-form-item label="参数值" prop="paramValue">
          <el-input v-model="form.paramValue" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.paramValue"  placeholder="请输入参数值" />
        </el-form-item>
        <el-form-item label="参数上限" prop="paramUpper">
          <el-input v-model="form.paramUpper" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.paramUpper"  placeholder="请输入参数上限" />
        </el-form-item>
        <el-form-item label="参数下限" prop="paramLower">
          <el-input v-model="form.paramLower" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.paramLower"  placeholder="请输入参数下限" />
        </el-form-item>
        <el-form-item label="标准值" prop="paramStandard">
          <el-input v-model="form.paramStandard" type="textarea" placeholder="请输入内容" />
          <el-input v-model="form.paramStandard"  placeholder="请输入标准值" />
        </el-form-item>
        <el-form-item label="采集时间" prop="collectionTime">
          <el-date-picker clearable
@@ -230,18 +229,6 @@
            placeholder="请选择采集时间">
          </el-date-picker>
        </el-form-item>
<!--        <el-form-item label="预留字段1" prop="spareField1">-->
<!--          <el-input v-model="form.spareField1" type="textarea" placeholder="请输入内容" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="预留字段2" prop="spareField2">-->
<!--          <el-input v-model="form.spareField2" type="textarea" placeholder="请输入内容" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="创建用户" prop="createUser">-->
<!--          <el-input v-model="form.createUser" type="textarea" placeholder="请输入内容" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="更改用户" prop="updateUser">-->
<!--          <el-input v-model="form.updateUser" type="textarea" placeholder="请输入内容" />-->
<!--        </el-form-item>-->
        <el-form-item label="状态" prop="state">
          <el-input v-model="form.state" placeholder="请输入状态" />
        </el-form-item>
@@ -251,14 +238,8 @@
        <el-form-item label="单位" prop="unit">
          <el-input v-model="form.unit" placeholder="请输入单位" />
        </el-form-item>
        <el-form-item label="类型" prop="type">
        <el-form-item label="参数类型" prop="type">
          <el-select v-model="form.type" 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>
@@ -291,6 +272,7 @@
      total: 0,
      // 设备产品过程参数采集表格数据
      paramCollectionList: [],
      advancedShowSearch: false,
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -342,6 +324,9 @@
    this.getList();
  },
  methods: {
    advancedQuery(){
      this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
    },
    /** 查询设备产品过程参数采集列表 */
    getList() {
      this.loading = true;