From 65062cbdae525bd0b7e5639a5a149d942e3d1b03 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 15 八月 2024 16:09:21 +0800
Subject: [PATCH] 掰片/识别模块、钢化模块图片算法更改,可视化系统图片动态获取

---
 UI-Project/src/views/UnLoadGlass/loadmachinerack.vue |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 5463263..e72c5e9 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -6,6 +6,9 @@
 import request from "@/utils/request";
 import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
 import {host, WebSocketHost} from '@/utils/constants'
+import PrintFlow from "@/views/UnLoadGlass/PrintFlow.vue";
+import Landingindication from "./Landingindication.vue";
+import Landingindicationtwo from "./Landingindicationtwo.vue";
 
 const router = useRouter()
 const {t} = useI18n()
@@ -146,7 +149,7 @@
       ElMessage.success(response.message);
       dialogFormVisiblea2.value = false;
       if(fullFlowCard.value==workFlowCard.value){
-        fullFlowCard.value=="";
+        fullFlowCard.value="";
       }
     } else if (response.code === 500) {
       // 娓呴櫎澶辫触鐨勯�昏緫
@@ -194,11 +197,10 @@
     selectOptionsa.value = data.engineerIdList[0]
   }
   if (data.autoPrint != null) {
-    autoPrint.value = data.autoPrint;
+    autoPrint.value = data.autoPrint[0];
   }
-  console.log(autoPrint.value)
 
-  tableData.splice(0, tableData.length, ...data.params[0]);
+  
   if (fullFlowCard.value == ""&&autoPrint.value==true) {
     for (let i = 0; i < tableData.length; i++) {
       if (tableData[i].totalQuantity != 0) {
@@ -213,7 +215,9 @@
       }
     }
   }
-
+  if(data.params!=null){
+    tableData.splice(0, tableData.length, ...data.params[0]);
+  }
 
   //  console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
 };
@@ -315,7 +319,7 @@
       "{display:none}@media print{" +
       "@page {" +
       "    size: auto; " +
-      "    margin: 2mm 2mm 0mm 1mm; " +
+      "    margin: 10mm 2mm 10mm 1mm; " +
       "  }body>:not(#" +
       printId +
       "){display:none !important}body>#" +

--
Gitblit v1.8.0