From 4a5f2a21686b42761cccb4c64a6fcaaf778f071a Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 08 五月 2024 19:50:48 +0800
Subject: [PATCH] -

---
 jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue |   49 ++++++++++---------------------------------------
 1 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
index 66292a4..5c077d1 100644
--- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -43,34 +43,7 @@
                </el-table-column>
              </el-table>
            </el-col>
-<!--           <el-col :span="14">-->
-<!--             <el-image style="height: 520px;width: 100%" :src="imgSrc"></el-image>-->
-<!--           </el-col>-->
          </el-tab-pane>
-<!--         <el-tab-pane name="second">-->
-<!--           <span slot="label"> <b class="el-icon-date"></b>鐗╂枡BOM</span>-->
-<!--           <el-empty>-->
-<!--             <span slot="description">鏆傛棤鏁版嵁</span>-->
-<!--           </el-empty>-->
-<!--         </el-tab-pane>-->
-<!--         <el-tab-pane name="third">-->
-<!--           <span slot="label"> <b class="el-icon-date"></b>閲囬泦娓呭崟</span>-->
-<!--           <el-empty>-->
-<!--             <span slot="description">鏆傛棤鏁版嵁</span>-->
-<!--           </el-empty>-->
-<!--         </el-tab-pane>-->
-<!--         <el-tab-pane name="fourth">-->
-<!--           <span slot="label"> <b class="el-icon-date"></b>瀹夌伅鐘舵��</span>-->
-<!--           <el-empty>-->
-<!--             <span slot="description">鏆傛棤鏁版嵁</span>-->
-<!--           </el-empty>-->
-<!--         </el-tab-pane>-->
-<!--         <el-tab-pane name="fifth">-->
-<!--           <span slot="label"> <b class="el-icon-date"></b>宸ヨ壓閰嶆柟</span>-->
-<!--           <el-empty>-->
-<!--             <span slot="description">鏆傛棤鏁版嵁</span>-->
-<!--           </el-empty>-->
-<!--         </el-tab-pane>-->
        </el-tabs>
      </el-col>
    </el-row>
@@ -233,7 +206,7 @@
   addParamCollection,
   addTighteningParameters,
   saveCampaignTimeParameters,
-  replaceAssemblyCode,
+  replaceAssemblyCode, yzAddBasicParameters,
 } from "@/api/main/da/paramCollection/paramCollection";
 
 export default {
@@ -288,7 +261,7 @@
       },
       content: '',
       activeName: 'first',
-      url: "ws://192.168.2.248:8080/websocket/message/",
+      url: "ws://192.168.2.76:8080/websocket/message/",
       message: "",
       text_content: "",
       ws: null,
@@ -369,6 +342,7 @@
         });
       }
     },
+
     Release(){
       // this.$message('portsList锛�'+this.portsList.length);
       if(this.btnType === "danger"){
@@ -433,23 +407,23 @@
     /** 鏌ヨ宸ュ崟鍒楄〃 */
     async getList() {
       this.getListFormulaChild()
-      // this.addOverStationCollection()
+      this.addOverStationCollection()
     },
 
     /** 鍏ョ珯澧炲姞杩囩珯閲囬泦璁板綍 **/
     addOverStationCollection(){
       this.passingStationForm = {
         id: null,
-        workOrderNo: this.workpieceInformation.workOrderNo,
-        productCode: this.workpieceInformation.productCode,
+        // workOrderNo: this.workpieceInformation.workOrderNo,
+        productCode: "1P102S",
         locationCode: this.headContent.processesCode,
-        model: this.workpieceInformation.productModel,
+        // model: this.workpieceInformation.productModel,
         productBarcode: this.headContent.sfcCode,
         sfcCode: this.headContent.sfcCode,
         inboundTime: new Date()
       }
       addPassingStationCollection(this.passingStationForm).then(response => {});
-      addBasicParameters(this.passingStationForm).then(response => {});
+      yzAddBasicParameters(this.passingStationForm).then(response => {});
     },
     exit() {
       if (this.ws) {
@@ -535,16 +509,13 @@
           const param = {
             tightenTheArray: event.data,
             paramCode: formulaChilds.paramCode,
-            workOrderNo: self.workpieceInformation.workOrderNo,
-            productCode: self.workpieceInformation.productCode,
+            // workOrderNo: self.workpieceInformation.workOrderNo,
+            productCode: "1P102S",
             locationCode: self.headContent.processesCode,
             productBarcode: self.headContent.sfcCode,
           }
           addTighteningParameters(param).then(response => {});
           yzUpdateTighteningFormula(param).then(response => {
-          //   self.getListFormulaChild()
-          // }).catch(error =>{
-          //   self.getListFormulaChild()
             console.log(response.msg)
             if(response.msg === "1"){
                 self.getListFormulaChild()

--
Gitblit v1.9.3