From 3427eb80cd70e8be1ad8caac14c37c88a4edc5e0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 15 七月 2024 16:21:47 +0800
Subject: [PATCH] 完善大屏显示页面，调整所有页面的适配样式，调整大理片笼的分页显示及笼子信息
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 82 ++++++++++++-----------------------------
1 files changed, 24 insertions(+), 58 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index d3f31ba..181d2ad 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -1,10 +1,8 @@
<script setup>
import {Search} from "@element-plus/icons-vue";
import {reactive, onMounted, onBeforeUnmount} from "vue";
-
import {useRouter} from "vue-router"
const router = useRouter()
-
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
@@ -39,7 +37,6 @@
fetchFlowCardId();
dialogFormVisiblea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
-
//鑾峰彇娴佺▼鍗″彿
const fetchFlowCardId = async () => {
try {
@@ -59,7 +56,6 @@
}
};
//纭
-
const handleConfirm = async () => {
try {
const firstPart = flowCardId.value.split('|')[0].trim(); //
@@ -68,9 +64,7 @@
workstationId: workstationId.value,
flowCardId: firstPart,
layer:twoPart
-
});
-
console.log(response)
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
@@ -88,16 +82,12 @@
console.error(error);
}
};
-
-
const updatePageData = () => {
// 鍋囪浣犵殑椤甸潰涓婃湁涓�涓悕涓� tableData 鐨� Vue 缁勪欢
// 浣犲彲浠ョ洿鎺ユ洿鏂� tableData 鐨勬暟鎹�
fetchTableData()
// 浣跨敤 $forceUpdate() 寮哄埗鏇存柊缁勪欢
-
};
-
const handleBindRack2 = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
@@ -129,8 +119,6 @@
dialogFormVisiblea2.value = false;
}
};
-
-
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
const fetchTableData = async () => {
try {
@@ -151,52 +139,38 @@
ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
-
-
const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
-
// 鏇存柊 tableData 鐨勬暟鎹�
-
tableData.splice(0, tableData.length, ...data.params[0]);
// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
-
};
-
// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
-
onMounted(() => {
fetchFlowCardId();
fetchTableData(); // 鑾峰彇鏁版嵁
initializeWebSocket(socketUrl, handleMessage);
});
-
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
});
-
// beforeUnmount(() => {
// closeWebSocket();
// });
-
-
// setInterval(fetchTableData, 2000)
-
-
</script>
-
<template>
- <div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading">
+ <div style="height: 500px;">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 200px;">
<el-table height="100%" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="workstationId" align="center" :label="$t('reportWork.lowerbit')" min-width="80" />
<el-table-column prop="workstationId" align="center" :label="$t('reportWork.shelfnumber')" min-width="120" />
- <el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="120" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="150" />
<el-table-column prop="totalquantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" />
<el-table-column prop="racksnumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
<el-table-column prop="layer" align="center" label="灞傛暟" min-width="120" />
@@ -222,7 +196,22 @@
</el-table>
</div>
</el-card>
-
+
+ <!-- workstationId: '1',
+ workstationId: '1005',
+ flowCardId: '183.6',
+ totalquantity: '1991',
+ racksnumber:"1",
+ work_state: '寰呰瘑鍒�', -->
+ <div style="display: flex;" class="awatch">
+ <div id="main-body">
+ <Landingindication></Landingindication>
+ </div>
+ <div id="main-bodya">
+ <Landingindicationtwo></Landingindicationtwo>
+ </div>
+ </div>
+ </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;">
@@ -248,12 +237,7 @@
</div>
</template>
</el-dialog>
-
-
-
-
<el-dialog v-model="dialogFormVisiblea2" top="21vh" width="30%" :title="$t('reportWork.clearglass')">
-
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handleclear">
@@ -263,26 +247,8 @@
</div>
</template>
</el-dialog>
-
-
- <!-- workstationId: '1',
- workstationId: '1005',
- flowCardId: '183.6',
- totalquantity: '1991',
- racksnumber:"1",
- work_state: '寰呰瘑鍒�', -->
- </div>
- <div style="display: flex;">
- <div id="main-body">
- <Landingindication></Landingindication>
- </div>
- <div id="main-bodya">
- <Landingindicationtwo></Landingindicationtwo>
- </div></div>
</template>
-
<style scoped>
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
@@ -298,15 +264,15 @@
background-color: #337ecc;
margin-left: 28%;
}
-#awatch{
- height: 450px;
+.awatch{
+ max-width: 100%;
}
#main-body{
- margin-top: -20px;
- margin-left: 200px;
+ margin-top: -40px;
+ margin-left: 150px;
}
#main-bodya{
- margin-top: -10px;
+ margin-top: -40px;
margin-left: 100px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0