懒羊羊
2024-03-18 3c2299298cadf242bd85e3a805165c32a70833ac
jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -107,7 +107,7 @@
           <span slot="label"> <a class="el-icon-date"></a>首页</span>
           <el-col :span="24">
             <el-table :cell-style="rowStyle" :data="formulaChildList">
               <el-table-column label="排序" width="60" align="center" prop="stepSort">
               <el-table-column label="排序" width="60" align="center" type="index">
               </el-table-column>
               <el-table-column label="操作内容" :show-overflow-tooltip='true' align="center" prop="operationSteps">
               </el-table-column>
@@ -359,7 +359,7 @@
      },
      content: '',
      activeName: 'first',
      url: "ws://192.168.11.76:8080/websocket/message/",
      url: "ws://192.168.10.21:8080/websocket/message/",
      message: "",
      text_content: "",
      ws: null,
@@ -490,11 +490,11 @@
    },
    /** 查询配方配置子信息列表 */
    getListFormulaChild() {
      this.formulaChildList = []
      this.formulaChildParams.productCode = this.workpieceInformation.productCode
      this.formulaChildParams.processesCode = this.headContent.processesCode
      listFormulaChild(this.formulaChildParams).then(response => {
        this.formulaChildList = response.rows;
        console.log(this.formulaChildList)
      });
    },
@@ -631,32 +631,39 @@
          self.cakeLamp.InPlace = 0;
        } else if (event.data === "OUT") {
          self.cakeLamp.release = 1;
          setTimeout(() => {
            self.cakeLamp.InPlace = 0;
            self.cakeLamp.release = 0;
            self.cakeLamp.startWork = 0;
            self.cakeLamp.scanFinish = 0;
            self.Release();
          }, DELAY_TIME);
          // setTimeout(() => {
          //   self.cakeLamp.InPlace = 0;
          //   self.cakeLamp.release = 0;
          //   self.cakeLamp.startWork = 0;
          //   self.cakeLamp.scanFinish = 0;
          //   self.Release();
          // }, DELAY_TIME);
        } else if (event.data === "TIGHTEN") {
          this.formulaChildList = [];
          self.getListFormulaChild();
        } else if (event.data.includes("[")) {
          // console.log('event.data'+event.data)
          // let eventArr = event.data.split("[")[1].split("]")[0].split(", ");
          // let eventArr1 = event.data.replace('[', '').replace(']', '').trim().split(', ');
          // console.log(eventArr1)
          // console.log(Array.isArray(eventArr))
          let formulaChilds = "";
          self.formulaChildList.forEach((formulaChild) => {
            let operationType = formulaChild.operationType;
          self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
          self.formulaChildList
            .filter((formulaChild) => formulaChild.operationType === '1');
          for (let i = 0; i < self.formulaChildList.length; i++) {
            let formulaChild = self.formulaChildList[i];
            let results = formulaChild.results;
            if(operationType === '1' && (results === '' || results === null || results === 'NG')){
            if (results === '' || results === null || results === 'NG') {
              formulaChilds = formulaChild;
              return; // 使用return代替break
              break;
            }
            // 执行其他操作
          });
          }
          // self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
          // self.formulaChildList.forEach((formulaChild) => {
          //   let operationType = formulaChild.operationType;
          //   let results = formulaChild.results;
          //   if(operationType === '1' && (results === '' || results === null || results === 'NG')){
          //     formulaChilds = formulaChild;
          //     return; // 使用return代替break
          //   }
          //   // 执行其他操作
          // });
          const param = {
            tightenTheArray: event.data,
            paramCode: formulaChilds.paramCode,
@@ -678,19 +685,21 @@
      if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
      else {
        const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
        this.$message('扫码完成'+this.content);
        if(this.headContent.sfcCode !== ''){
          console.log(scanValue)
          this.serialPortMethod(scanValue)
        }else {
          this.headContent.sfcCode = scanValue;
          this.queryParams.productNum = scanValue;
          this.getList()
          // this.getListFormulaChild()
          this.cakeLamp.scanFinish = 1
          this.cakeLamp.startWork = 1
        }
        // if(this.cakeLamp.InPlace=== 1){
          if(this.headContent.sfcCode !== ''){
            console.log(scanValue)
            this.serialPortMethod(scanValue)
          }else {
            this.headContent.sfcCode = scanValue;
            this.queryParams.productNum = scanValue;
            this.getList()
            // this.getListFormulaChild()
            this.cakeLamp.scanFinish = 1
            this.cakeLamp.startWork = 1
          }
        // }else {
        //   this.$message('工件未到位禁止扫码!');
        // }
      }
    },
    clearHistory() {