Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes

cl

2024-01-15 9c21d0b197cee42ab475570f82eba18cd9307e70

Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -46,7 +46,7 @@
        for (BsFormulaChildInfo formulaChildInfo : list) {
            formulaChildInfo.setSort(formulaChildInfo.getStepSort());
            formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
            formulaChildInfo.setImg(formulaChildInfo.getOperationSteps());
            formulaChildInfo.setImg(formulaChildInfo.getPicture());
        }
        return getDataTable(list);
    }

 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java

@@ -58,6 +58,8 @@
    @Excel(name = "更改用户")
    private String updateUser;

    @Excel(name = "网卡地址")
    private String macAddress;
    /** 备注 */
    @Excel(name = "备注")
    private String remarks;
@@ -76,9 +78,15 @@
        this.processesCode = processesCode;
    }

    public String getProcessesCode() 
    public String getProcessesCode()
    {
        return processesCode;
    }
    public void setMacAddress(String macAdress) {this.macAddress = macAdress;}

    public String getMacAddress()
    {
        return macAddress;
    }
    public void setProcessesName(String processesName) 
    {
@@ -176,6 +184,7 @@
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("processesCode", getProcessesCode())
             .append("macAddress", getMacAddress())
            .append("processesName", getProcessesName())
            .append("processesType", getProcessesType())
            .append("ipAddress", getIpAddress())

 jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml

@@ -19,15 +19,17 @@
        <result property="updateUser"    column="update_user"    />
        <result property="updateTime"    column="update_time"    />
        <result property="remarks"    column="remarks"    />
        <result property="macAddress"    column="mac_address"    />
    </resultMap>

    <sql id="selectScStationConfVo">
        select id, processes_code, processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
        select id, processes_code, mac_address,processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
    </sql>

    <select id="selectScStationConfList" parameterType="ScStationConf" resultMap="ScStationConfResult">
        <include refid="selectScStationConfVo"/>
        <where>  
            <if test="macAddress != null  and macAddress != ''"> and mac_adress = #{macAddress}</if>
            <if test="processesCode != null  and processesCode != ''"> and processes_code = #{processesCode}</if>
            <if test="processesName != null  and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if>
            <if test="processesType != null  and processesType != ''"> and processes_type = #{processesType}</if>
@@ -51,6 +53,7 @@
        insert into sc_station_conf
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="processesCode != null">processes_code,</if>
            <if test="macAddress != null">mac_address,</if>
            <if test="processesName != null">processes_name,</if>
            <if test="processesType != null">processes_type,</if>
            <if test="ipAddress != null">ip_address,</if>
@@ -66,6 +69,7 @@
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="processesCode != null">#{processesCode},</if>
            <if test="macAddress != null">#{macAddress},</if>
            <if test="processesName != null">#{processesName},</if>
            <if test="processesType != null">#{processesType},</if>
            <if test="ipAddress != null">#{ipAddress},</if>
@@ -86,6 +90,7 @@
        <trim prefix="SET" suffixOverrides=",">
            <if test="processesCode != null">processes_code = #{processesCode},</if>
            <if test="processesName != null">processes_name = #{processesName},</if>
            <if test="macAddress != null">mac_address = #{macAddress},</if>
            <if test="processesType != null">processes_type = #{processesType},</if>
            <if test="ipAddress != null">ip_address = #{ipAddress},</if>
            <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>

 jcdm-ui/src/views/main/bs/formulaChild/index.vue

@@ -107,7 +107,7 @@
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>

        <el-descriptions class="margin-top" :column="4" :size="size" border>
        <el-descriptions class="margin-top" :column="4" border>
          <el-descriptions-item :span="1">
            <template slot="label">
              <i class="el-icon-user"></i>
@@ -163,13 +163,13 @@
          <el-table-column label="配方编码" width="130" align="center" prop="formulaCode">
          </el-table-column>
          <el-table-column label="图片" :show-overflow-tooltip='true' width="130" align="center" prop="picture">
            <template slot-scope="scope">
              <el-image
                style="width: 100px; height: 100px"
                :src="pjtUrl+scope.row.picture"
                :fit="fit">
              </el-image>
            </template>
<!--            <template slot-scope="scope">-->
<!--              <el-image-->
<!--                style="width: 100px; height: 100px"-->
<!--                :src="pjtUrl+scope.row.picture"-->
<!--                :fit="fit">-->
<!--              </el-image>-->
<!--            </template>-->
          </el-table-column>
          <el-table-column label="备注" width="130" align="center" prop="remarks">
          </el-table-column>
@@ -265,7 +265,22 @@
<!--          <el-input v-model="form.formulaCode" placeholder="请输入配方编码" />-->
<!--        </el-form-item>-->
        <el-form-item label="图片" prop="picture">
          <el-input v-model="form.picture" placeholder="请输入图片" />
<!--          <el-input v-model="form.picture" placeholder="请输入图片" />-->
          <el-upload
            ref="upload"
            :limit="1"
            accept=".jpg, .png"
            :action="upload.url"
            :headers="upload.headers"
            :on-remove="removes"
            :file-list="upload.fileList"
            :on-progress="handleFileUploadProgress"
            :on-success="handleFileSuccess"
            :auto-upload="false">
            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
            <el-button style="margin-left: 10px;" size="small" type="success" :loading="upload.isUploading" @click="submitUpload">上传到服务器</el-button>
            <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
          </el-upload>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
@@ -280,6 +295,7 @@
</template>

<script>
import { getToken } from "@/utils/auth";
import { listFormula} from "@/api/main/bs/formula/formula";
import { listFormulaChild, getFormulaChild, delFormulaChild, addFormulaChild, updateFormulaChild } from "@/api/main/bs/formulaChild/formulaChild";

@@ -287,6 +303,17 @@
  name: "FormulaChild",
  data() {
    return {
      // 上传参数
      upload: {
        // 是否禁用上传
        isUploading: false,
        // 设置上传的请求头部
        headers: { Authorization: "Bearer " + getToken() },
        // 上传的地址
        url: process.env.VUE_APP_BASE_API + "/common/upload",
        // 上传的文件列表
        fileList: []
      },
      pjtUrl: process.env.VUE_APP_BASE_API,
      headerInformationData:{
        formulaCode: "",
@@ -343,6 +370,7 @@
    this.getList();
  },
  methods: {

    /** 工艺流程表头信息 */
    headerInformation() {
      listFormula(this.queryParams).then(response => {
@@ -416,18 +444,45 @@
    handleAdd() {
      this.reset();
      this.open = true;
      this.upload.fileList = [];
      this.titleName = "添加配方配置子信息";
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.upload.fileList = []
      console.log(row)
      if(row.picture!==null && row.picture!==""){
        this.upload.fileList = [{ name: row.spareField1, url: row.picture }];
      }
      this.reset();
      const id = row.id || this.ids
      getFormulaChild(id).then(response => {
        console.log(response.data)
        this.form = response.data;
        this.open = true;
        this.titleName = "修改配方配置子信息";
      });
    },
    // 文件提交处理
    submitUpload() {
      this.$refs.upload.submit();
    },
    // 文件上传中处理
    handleFileUploadProgress(event, file, fileList) {
      this.upload.isUploading = true;
    },
    // 文件上传成功处理
    handleFileSuccess(response, file, fileList) {
      console.log(response)
      this.upload.isUploading = false;
      this.form.picture = response.url;
      this.form.spareField1 = response.originalFilename;
      this.msgSuccess(response.msg);
    },
    removes(){
      this.form.spareField1 = '';
      this.form.picture = '';
    },
    /** 提交按钮 */
    submitForm() {
      this.form.formulaCode = this.formulaCode;

 jcdm-ui/src/views/main/cfkb/Instructions/index.vue

@@ -130,7 +130,7 @@
        address: '上海市普陀区金沙江路 1516 弄'
      }],
      address: '',
      src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
      // src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
      // src: 'file:///D:/img/qt.jpg'

      intervalId: null,
@@ -203,6 +203,7 @@
      listFormulaChild(this.queryParams).then(response => {
        // this.tableData = [];
        this.tableData = response.rows;
        console.log(response.rows)
        this.$nextTick(() => {
          clearInterval(this.intervalId);
          document.getElementById('outerDiv0').style.background = 'yellow'

 jcdm-ui/src/views/main/sc/stationConf/index.vue

@@ -89,6 +89,9 @@
          </el-table-column>
          <el-table-column label="IP地址" align="center" prop="ipAddress">
          </el-table-column>
          <el-table-column label="网卡地址" align="center" prop="macAddress">
          </el-table-column>

          <el-table-column label="备注" align="center" prop="remarks">
          </el-table-column>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
@@ -147,6 +150,9 @@
        <el-form-item label="IP地址" prop="ipAddress">
          <el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
        </el-form-item>
        <el-form-item label="网卡地址" prop="macAddress">
          <el-input v-model="form.macAddress" placeholder="请输入网卡地址" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
@@ -195,6 +201,7 @@
        processesName: null,
        processesType: null,
        ipAddress: null,
        macAddress: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,