From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 121 ++++------------------------------------
1 files changed, 13 insertions(+), 108 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index a5b99a4..a0d68df 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -6,7 +6,6 @@
import request from "@/utils/request";
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {host, WebSocketHost} from '@/utils/constants'
-
const router = useRouter()
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
@@ -15,25 +14,19 @@
const autoPrint = ref(false)
const takeGlass = ref([])
const scanGlass = ref([])
-
-
const dialogFormVisiblea = ref(false)
const dialogFormVisiblea2 = ref(false)
const dialogFormVisibleaDownGlass = ref(false)
const dialogFormVisibleaDownGlasss = ref(false)
-// 鏁版嵁
const loading = ref(false);
-// 寮规鏄剧ず鎺у埗
const dialogFormVisible = ref(false);
-// 琛ㄥ崟鏁版嵁
const workstationId = ref('');
const workFlowCard = ref('');
-const selectedProjectNoa = ref(null); // 褰撳墠閫変腑鐨勮鑹�
+const selectedProjectNoa = ref(null);
const flowCardId = ref('');
const flowCardOptions = ref('[]');
const tableData = reactive([]);
const downGlass = ref([]);
-
const selectValuesa = reactive({});
const selectOptionsa = ref([]);
const dialogTableVisible = ref(false)
@@ -44,25 +37,21 @@
const now = new Date();
const timeRange = ref([])
const browser = ref(false)
-
const handleChange = async () => {
console.log("瑙﹀彂寮�鍏�")
try {
const body = {
- flag: autoPrint.value, // 浣跨敤 ganghua.value 鑾峰彇褰撳墠寮�鍏崇殑鐘舵��
+ flag: autoPrint.value,
};
-
var url = "/unLoadGlass/downWorkStation/autoPrint?flag=" + autoPrint.value;
const response = await request.post(url)
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
autoPrint.value = response.data
} else {
ElMessage.error(response.message);
}
} catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -75,9 +64,7 @@
browser.value = false
}
}
-
const handleInputChangea = (value, rowId) => {
- // 鏇存柊瀵瑰簲琛岀殑 select 鍊�
selectValuesa[rowId] = value;
};
// 鏂规硶
@@ -85,11 +72,10 @@
// 澶勭悊琛ㄦ牸琛岄�夋嫨浜嬩欢
};
const handleBindRack = (row) => {
- workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
+ workstationId.value = row.workstationId;
flowCardId.value = row.flowCardId;
- // 鍙戣捣鎺ュ彛璇锋眰鑾峰彇娴佺▼鍗″彿
fetchFlowCardId();
- dialogFormVisiblea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ dialogFormVisiblea.value = true;
};
//鑾峰彇娴佺▼鍗″彿
const fetchFlowCardId = async () => {
@@ -97,7 +83,6 @@
const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
console.log(response)
if (response.code === 200) {
-
flowCardOptions.value = response.data.filter(item => item !== null)
.map(item => ({ flowcard_id: item.flow_card_id }));
console.log(flowCardOptions.value);
@@ -120,30 +105,22 @@
layer: twoPart
});
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
- console.log('缁戝畾鎴愬姛');
-
ElMessage.success(response.message);
updatePageData();
dialogFormVisiblea.value = false;
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
} catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
};
const updatePageData = () => {
- // 鍋囪浣犵殑椤甸潰涓婃湁涓�涓悕涓� tableData 鐨� Vue 缁勪欢
- // 浣犲彲浠ョ洿鎺ユ洿鏂� tableData 鐨勬暟鎹�
fetchTableData()
- // 浣跨敤 $forceUpdate() 寮哄埗鏇存柊缁勪欢
};
const handleBindRack2 = (row) => {
- workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
- dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ workstationId.value = row.workstationId;
+ dialogFormVisiblea2.value = true;
workFlowCard.value = row.flowCardId;
};
//娓呴櫎鍐呭
@@ -152,25 +129,17 @@
const response = await request.post('unLoadGlass/downWorkStation/clear', {
workstationId: workstationId.value,
});
-
-
if (response.code === 200) {
- // 娓呴櫎鎴愬姛鐨勯�昏緫
- console.log('娓呴櫎鎴愬姛');
ElMessage.success(response.message);
dialogFormVisiblea2.value = false;
if (fullFlowCard.value == workFlowCard.value) {
fullFlowCard.value = "";
}
} else if (response.code === 500) {
- // 娓呴櫎澶辫触鐨勯�昏緫
- console.log('娓呴櫎澶辫触');
- console.log(response.message); // 鎵撳嵃鏈嶅姟鍣ㄨ繑鍥炵殑閿欒淇℃伅
ElMessage.error(response.message);
dialogFormVisiblea2.value = false;
}
} catch (error) {
- // console.log(error);
ElMessage.error("娓呴櫎澶辫触");
dialogFormVisiblea2.value = false;
}
@@ -178,29 +147,19 @@
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
const fetchTableData = async () => {
try {
- // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
const response = await request.get('unLoadGlass/downWorkStation/getone');
-
- // 妫�鏌ュ搷搴旂姸鎬�
if (response.code === 200) {
- // 鏇存柊琛ㄦ牸鏁版嵁
- console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
tableData.splice(0, tableData.length, ...response.data);
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
} catch (error) {
- // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
-
- // 鏇存柊 tableData 鐨勬暟鎹�
if (data.downGlassInfos != null) {
downGlass.value = data.downGlassInfos[0];
}
@@ -211,17 +170,13 @@
autoPrint.value = data.autoPrint[0];
}
if (data.takeGlass != null) {
-
takeGlass.value = data.takeGlass[0];
- // takeGlass.value 鏄竴涓┖瀵硅薄
let width = takeGlass.value.width;
let height = takeGlass.value.height;
if (width < height) {
takeGlass.value.width = height;
takeGlass.value.height = width;
}
-
-
}
if (data.scanGlass != null) {
scanGlass.value = data.scanGlass[0];
@@ -235,7 +190,6 @@
open1(scanGlass);
}
}
-
//鑷姩鎵撳嵃
if (fullFlowCard.value == "" && autoPrint.value == true && browser.value == true) {
for (let i = 0; i < tableData.length; i++) {
@@ -254,10 +208,7 @@
if (data.params != null) {
tableData.splice(0, tableData.length, ...data.params[0]);
}
-
- // console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
};
-// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
onMounted(() => {
confirmBrowser();//鑾峰彇娴忚鍣�
fetchFlowCardId();
@@ -273,42 +224,28 @@
console.log("鍏抽棴浜�")
closeWebSocket();
});
-
-
const getTagType = (status) => {
return status === 1 ? 'success' : 'danger';
- // 鏍规嵁鐘舵�佸�煎喅瀹氭爣绛剧被鍨嬶紝杩欓噷鍋囪鐘舵�佷负1鏃朵负鎴愬姛锛堢豢鑹诧級锛屽惁鍒欎负澶辫触锛堢孩鑹诧級
}
-
const toggleStatus = (row) => {
// 鍒囨崲鏂欐灦鐘舵�佺殑閫昏緫
row.enableState = 1 - row.enableState; // Toggle between 0 and 1
// 姝ゅ鍙互娣诲姞淇濆瓨鐘舵�佺殑閫昏緫锛屾瘮濡傝皟鐢� API 鏇存柊鏁版嵁
updateRowStatus(row);
};
-
const updateRowStatus = async (row) => {
try {
- // 鍋囪浣犵殑鍚庣 API 鎺ユ敹 PUT 璇锋眰锛屽苟涓旈渶瑕佷紶閫� row.id 鍜� row.enableState 鍙傛暟
-
-
const response = await request.post('unLoadGlass/downWorkStation/updateDownWorkstation', {
enableState: row.enableState,
id: row.id
-
-
});
console.log('Updated row status:', response.data);
- // 鍙互鏍规嵁鍚庣杩斿洖鐨勬暟鎹繘琛岃繘涓�姝ュ鐞嗭紝姣斿鏇存柊鏈湴鐘舵�佺瓑
} catch (error) {
console.error('Error updating row status:', error);
- // 澶勭悊閿欒鎯呭喌锛屾瘮濡傛彁绀虹敤鎴锋洿鏂板け璐�
}
};
-
// 鏌ヨ鏁版嵁
const selectDownGlassData = async () => {
-
const response = await request.post("/unLoadGlass/downGlassInfo/setDownGlassInfoRequest", {
workStationId: selectValuesa[0],
engineerId: selectValuesa[1],
@@ -320,12 +257,8 @@
} else {
ElMessage.error(response.message);
}
-
}
-
-
const open = async (row) => {
-
printFlowCardId.value = row.flowCardId;
printLayer.value = row.layer
dialogTableVisible.value = true;
@@ -335,7 +268,6 @@
}, 2000);
}
const open1 = async (row) => {
-
printFlowCardId.value = row.flowCardId;
printLayer.value = row.layer
printGlassId.value = row.glassId
@@ -345,20 +277,16 @@
//dialogTableVisible1.value = false;
}, 1000);
}
-
const printFlowCard = () => {
// 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
let el = document.getElementById("child");
let doc = document;
let body = doc.body || doc.getElementsByTagName("body")[0];
let printId = "print-" + Date.now();
-
// 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
let content = doc.createElement("div");
content.id = printId;
-
// alert(/Chrome/.test(userAgent) && !/Edge/.test(userAgent));
-
// 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
let style = doc.createElement("style");
console.log("style1:" + style.innerHTML)
@@ -376,11 +304,9 @@
"{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);
-
// 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
// 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
body.appendChild(content);
@@ -390,18 +316,15 @@
body.removeChild(style);
}, 20);
}
-
const printFlowCard1 = () => {
// 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
let el = document.getElementById("printFlowCard");
let doc = document;
let body = doc.body || doc.getElementsByTagName("body")[0];
let printId = "print-" + Date.now();
-
// 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
let content = doc.createElement("div");
content.id = printId;
-
// 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
let style = doc.createElement("style");
style.innerHTML =
@@ -420,7 +343,6 @@
content.innerHTML = el.outerHTML;
// // console.log("el.outerHTML", el.outerHTML);
body.appendChild(style);
-
// 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
// 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
body.appendChild(content);
@@ -430,8 +352,6 @@
body.removeChild(style);
}, 20);
}
-
-
// beforeUnmount(() => {
// closeWebSocket();
// });
@@ -481,13 +401,12 @@
<el-button @click="open(scope.row)" :disabled="scope.row.flowCardId == null">{{ $t('reportWork.processcard') }}</el-button>
<el-button @click="open1(scope.row)" :disabled="scope.row.flowCardId == null">{{ $t('reportWork.printlabels') }}</el-button>
</template>
-
</el-table-column>
</el-table>
-
</div>
<el-dialog v-model="dialogFormVisibleaDownGlass" top="2vh" width="97%" :title="$t('reportWork.information')">
- <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('reportWork.cstation')" clearable>
+ <div style="margin-bottom: 10px;margin-top: -20px;">
+ <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('reportWork.cstation')" clearable style="margin-top: -6px;">
<el-option :label="$t('reportWork.all')" value="0"></el-option>
<el-option label="1" value="1"></el-option>
<el-option label="2" value="2"></el-option>
@@ -497,21 +416,19 @@
<el-option label="6" value="6"></el-option>
<el-option label="7" value="7"></el-option>
</el-select>
-
- <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('basicData.plselectproject')" clearable
+ <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('basicData.plselectproject')" clearable style="margin-left: 10px;margin-top: -6px;"
@input="handleInputChangea($event, row.id)">
<el-option v-for="item in selectOptionsa" :key="item" :label="item" :value="item" />
</el-select>
-
- <span class="demonstration">{{ $t('reportWork.timeperiod') }}</span>
+ <span style="margin-left: 10px;margin-top: 15px;" class="demonstration">{{ $t('reportWork.timeperiod') }}</span>
<el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
- value-format="YYYY-MM-DD hh:mm:ss" :end-placeholder="$t('reportmanage.endtime')">
+ value-format="YYYY-MM-DD hh:mm:ss" :end-placeholder="$t('reportmanage.endtime')" style="margin-left: 10px;">
</el-date-picker>
-
- <el-button type="primary" style="margin-left: 10px;" @click="selectDownGlassData()">{{
+ <el-button type="primary" style="margin-left: 10px;margin-top: -6px;" @click="selectDownGlassData()">{{
$t('reportmanage.inquire')
}}
</el-button>
+ </div>
<el-table height="200px" ref="table" @selection-change="handleSelectionChange" :data="downGlass"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="workStationId" align="center" :label="$t('reportWork.stationnumber')" min-width="80" />
@@ -532,7 +449,6 @@
style="display: flex; justify-content: center; align-items: center; width:800px; height: 800px;position: relative;">
<div
:style="{ width: takeGlass.width + 'px', height: takeGlass.height + 'px', backgroundColor: '#e1f3d8', transform: 'scale(' + 800 / (takeGlass.width > takeGlass.height ? takeGlass.width : takeGlass.height) + ')' }">
-
</div>
<div style="font-size: 50px; text-align: center;position: absolute;top:0px;left:170px;">
<div>{{ $t('reportWork.glassmation') }}</div>
@@ -548,7 +464,6 @@
style="display: flex; justify-content: center; align-items: center; width: 800px; height: 800px;position: relative;">
<div
:style="{ width: scanGlass.width + 'px', height: scanGlass.height + 'px', backgroundColor: '#e1f3d8', transform: 'scale(' + 800 / (scanGlass.width > scanGlass.height ? scanGlass.width : scanGlass.height) + ')' }">
-
</div>
<div style="font-size: 50px; text-align: center;position: absolute;top:0px;left:200px;">
<div>{{ $t('reportWork.barcodescanner') }}</div>
@@ -558,7 +473,6 @@
<div>{{ scanGlass.glassId }}</div>
<div>{{ scanGlass.width }}</div>
<div>{{ scanGlass.height }}</div>
-
</div>
</el-card>
</div>
@@ -579,7 +493,6 @@
</div>
</div>
</el-card>
-
</div>
<el-dialog v-model="dialogFormVisiblea" top="21vh" width="40%" :title="$t('reportWork.bindingshelves')">
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
@@ -599,7 +512,6 @@
</div>
<template #footer>
<div id="dialog-footer">
-
<el-button type="primary" @click="handleConfirm">
{{ $t('reportWork.sure') }}
</el-button>
@@ -634,19 +546,16 @@
line-height: 20px;
margin-left: 100px;
}
-
#dta {
display: block;
float: left;
line-height: 20px;
margin-left: 80%;
}
-
#dialog-footer {
text-align: center;
margin-top: -15px;
}
-
#message {
text-align: center;
align-items: center;
@@ -656,21 +565,17 @@
background-color: #337ecc;
margin-left: 28%;
}
-
.awatch {
max-width: 100%;
}
-
#main-body {
margin-top: -40px;
margin-left: 150px;
}
-
#main-bodya {
margin-top: -40px;
margin-left: 100px;
}
-
:deep(#sizePrintCalrd .el-dialog__body) {
height: 85%;
width: 100%;
--
Gitblit v1.8.0