admin
2024-07-18 0aaabac24ac4ebc2fe3e54c56e95f250ea238d5b
jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -332,7 +332,7 @@
  addParamCollection,
  addTighteningParameters,
  saveCampaignTimeParameters,
  replaceAssemblyCode, checkRecordDataDone,
  replaceAssemblyCode, checkRecordDataDone, enterWeighing,
} from "@/api/main/da/paramCollection/paramCollection";
export default {
@@ -350,6 +350,8 @@
        pageSize: 10,
        productCode: null,
        processesCode: null,
        artificialNgFlag: null,
        sfcBarcode: null,
      },
      // 配方配置子信息表格数据
      formulaChildList: [],
@@ -392,8 +394,8 @@
      content: '',
      activeName: 'first',
      // url: "ws://192.168.2.248:8080/websocket/message/",
      // url: "ws://10.103.210.248:8080/websocket/message/",
      url: "ws://192.168.2.76:8080/websocket/message/",
      url: "ws://10.103.210.248:8080/websocket/message/",
      // url: "ws://192.168.2.76:8080/websocket/message/",
      message: "",
      text_content: "",
      ws: null,
@@ -424,6 +426,7 @@
      originalArray: [],
      yzSfcFlag: 1,
      endYz: false,
      artificialNgFlag: null,
    }
  },
  beforeDestroy() {
@@ -533,6 +536,11 @@
      // this.formulaChildList = []
      this.formulaChildParams.productCode = this.workpieceInformation.productCode
      this.formulaChildParams.processesCode = this.headContent.processesCode
      console.log(this.artificialNgFlag)
      if(this.artificialNgFlag !== null){
        this.formulaChildParams.artificialNgFlag = this.artificialNgFlag
        this.formulaChildParams.sfcBarcode = this.headContent.sfcCode
      }
      console.log(this.formulaChildParams)
      noPageListFormulaChild(this.formulaChildParams).then(response => {
        this.formulaChildList = response.rows;
@@ -573,6 +581,8 @@
      this.headContent.sfcCode = '';
      this.headContent.yzSfcCode = '';
      this.headContent.cardCode = '';
      this.formulaChildParams.artificialNgFlag = null
      this.formulaChildParams.sfcBarcode = null
    },
    changeMenu(tab, event) {
      console.log(tab, event);
@@ -609,6 +619,7 @@
        this.workpieceInformation.productModel = rowsData.productModel;
        this.workpieceInformation.productName = rowsData.productName;
        this.headContent.cardCode = rowsData.trolleyYard;
        this.artificialNgFlag = rowsData.artificialNgFlag;
      });
      this.getListFormulaChild()
      // this.addOverStationCollection()
@@ -702,12 +713,18 @@
        } else if (event.data === "NG") {
          //给plc发下线信号
          //清除数据
          this.$confirm('<span style="font-size: 20px;color: red">拧紧超过三次该产品NG下线,请确认!</span>', '通知', {
          self.$confirm('拧紧三次NG,请确认下线!!!', '消息', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            showCancelButton: false,
            type: 'warning'
          }).then(() => {
            self.ngFunction();
          })
            this.$message({
              type: 'success',
              message: '确认成功!'
            });
          });
        } else if (event.data === "OUT") {
          self.cakeLamp.release = 1;
@@ -736,6 +753,14 @@
            formulaChildEntity: self.formulaChildList[formulaChildIndex]
          }
          // if(param.locationCode === 'POP430'){
          //   let enterWeighingparam = {
          //     sfcCode: param.productBarcode,
          //   }
          //   enterWeighing(enterWeighingparam).then(response => {
          //   });
          // }
          console.log("进入最终方法")
          self.endSaveData(param)
        } else if (event.data.includes("[")) {