From f1916b183ebcff81c64bccae502a63b097c304f5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 18 八月 2024 12:42:16 +0800
Subject: [PATCH] 钢化界面添加显示人工拿走的玻璃信息
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 2aec6e9..0327ee2 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()
@@ -23,6 +26,7 @@
const dialogFormVisible = ref(false);
// 琛ㄥ崟鏁版嵁
const workstationId = ref('');
+const workFlowCard = ref('');
const selectedProjectNoa = ref(null); // 褰撳墠閫変腑鐨勮鑹�
const flowCardId = ref('');
const flowCardOptions = ref('[]');
@@ -35,7 +39,7 @@
const printFlowCardId = ref('')
const printLayer = ref('')
const now = new Date();
-const timeRange = ref([new Date(now.setHours(0, 0, 0, 0)), new Date(now.setHours(23, 59, 59, 999))])
+const timeRange = ref([])
const handleChange = async () => {
console.log("瑙﹀彂寮�鍏�")
@@ -103,7 +107,6 @@
flowCardId: firstPart,
layer: twoPart
});
- console.log(response)
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
console.log('缁戝畾鎴愬姛');
@@ -129,6 +132,7 @@
const handleBindRack2 = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ workFlowCard.value=row.flowCardId;
};
//娓呴櫎鍐呭
const handleclear = async () => {
@@ -143,6 +147,9 @@
console.log('娓呴櫎鎴愬姛');
ElMessage.success(response.message);
dialogFormVisiblea2.value = false;
+ if(fullFlowCard.value==workFlowCard.value){
+ fullFlowCard.value="";
+ }
} else if (response.code === 500) {
// 娓呴櫎澶辫触鐨勯�昏緫
console.log('娓呴櫎澶辫触');
@@ -183,18 +190,17 @@
// 鏇存柊 tableData 鐨勬暟鎹�
if (data.downGlassInfos != null) {
- downGlass.value = data.downGlassInfos[0][1];
+ downGlass.value = data.downGlassInfos[0];
}
if (data.engineerIdList != null) {
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 == "") {
+
+ if (fullFlowCard.value == ""&&autoPrint.value==true) {
for (let i = 0; i < tableData.length; i++) {
if (tableData[i].totalQuantity != 0) {
if (tableData[i].totalQuantity == tableData[i].racksNumber + tableData[i].otherNumber && fullFlowCard.value != tableData[i].flowCardId) {
@@ -208,7 +214,9 @@
}
}
}
-
+ if(data.params!=null){
+ tableData.splice(0, tableData.length, ...data.params[0]);
+ }
// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
};
@@ -285,9 +293,9 @@
dialogTableVisible.value = true;
setTimeout(() => {
printFlowCard(); // 鏇挎崲鎴愪綘瑕佹墽琛岀殑鍑芥暟鍚�
- dialogTableVisible.value = false;
+ //dialogTableVisible.value = false;
}, 1000);
- ;
+
}
@@ -304,19 +312,22 @@
// 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
let style = doc.createElement("style");
+ console.log("style1:"+style.innerHTML)
style.innerHTML =
"body>#" +
printId +
- "{display:none}@media print{" +
+ "{display:none;}@media print{" +
"@page {" +
" size: auto; " +
- " margin: 2mm 2mm 0mm 1mm; " +
+ " margin: 10mm 5mm 10mm 5mm; " +
" }body>:not(#" +
printId +
- "){display:none !important}body>#" +
+ "){display:none !important;}body>#" +
printId +
- "{display:block;padding-top:1px}}";
- //
+ "{display:block;}#" +
+ printId +
+ "{display: block; padding: 0; margin: 0; width: 100%; position: absolute; top: 0; left: 0; height: 100vh; box-sizing: border-box;}} ";
+
content.innerHTML = el.outerHTML;
// // console.log("el.outerHTML", el.outerHTML);
body.appendChild(style);
@@ -330,6 +341,8 @@
body.removeChild(style);
}, 20);
}
+
+
// beforeUnmount(() => {
@@ -392,9 +405,6 @@
<el-option label="5" value="5"></el-option>
<el-option label="6" value="6"></el-option>
<el-option label="7" value="7"></el-option>
- <el-option label="8" value="8"></el-option>
- <el-option label="9" value="9"></el-option>
- <el-option label="10" value="10"></el-option>
</el-select>
<el-select v-model="selectValuesa[1]" filterable :placeholder="$t('basicData.plselectproject')" clearable
@@ -403,7 +413,7 @@
</el-select>
<span class="demonstration">鏃堕棿娈�</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" value-format = "YYYY-MM-DD hh:mm:ss"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
@@ -483,10 +493,7 @@
</template>
</el-dialog>
- <el-dialog id="sizePrintCalrd" v-model="dialogTableVisible" destroy-on-close style="width: 75%;height:75% ">
- <!-- <template #header="{ close, titleId, titleClass }">
- <el-button @click="printFlowCard" >鎵撳嵃</el-button>
- </template> -->
+ <el-dialog id="sizePrintCalrd" v-model="dialogTableVisible" destroy-on-close >
<print-flow id="child" :printFlowCardId="printFlowCardId" :printLayer="printLayer"
style="width: 100%;height: 100%"/>
</el-dialog>
--
Gitblit v1.8.0