Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-15 7f1dbf4296013a4b15fbc2748de072f7c7ad4388

 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">
@@ -135,8 +138,8 @@
          <el-select style="width: 100%" @change="handleSelectChangeprocessesCode(form.processesCode)" v-model="form.processesCode" placeholder="请选择工序编号">
            <el-option
              v-for="item in options"
              :key="item.index"
              :label="item.processesName"
              :key="item.processesCode"
              :label="item.processesCode"
              :value="item.processesCode">
            </el-option>
          </el-select>
@@ -146,6 +149,9 @@
        </el-form-item>
        <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="请输入备注" />
@@ -195,6 +201,7 @@
        processesName: null,
        processesType: null,
        ipAddress: null,
        macAddress: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,
@@ -206,7 +213,17 @@
      processesCodeQueryParams:{
        pageNum: 1,
        pageSize: 10,
        processesCodes: null,
        processesCode: null,
        processesName: null,
        processesType: null,
        ipAddress: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,
        spareField4: null,
        createUser: null,
        updateUser: null,
        remarks: null
      },
      // 表单参数
      form: {},
@@ -225,8 +242,8 @@
  methods: {

    handleSelectChangeprocessesCode(selectedOption) {
      this.processesCodeQueryParams.processesCodes = selectedOption;
      listProcesses(this.queryParams).then(response => {
      this.processesCodeQueryParams.processesCode = selectedOption;
      listProcesses(this.processesCodeQueryParams).then(response => {
        this.form.processesName = response.rows[0].processesName;
      });
    },