From a8c1dd008f9a096cb01774f17a8bceda5aafed88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 二月 2025 15:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 289 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 156 insertions(+), 133 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 1a8d2e1..d669cbc 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -1,31 +1,55 @@
<script setup>
-import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
-import {useRouter} from "vue-router"
-import {host, WebSocketHost} from '@/utils/constants'
+import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from "vue";
+import { useRouter } from "vue-router"
+import { host, WebSocketHost } from '@/utils/constants'
import request from "@/utils/request"
-import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import dayjs from 'dayjs';
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {useI18n} from 'vue-i18n'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useI18n } from 'vue-i18n'
const router = useRouter()
const blinda = ref(false)
const blindb = ref(false)
-const {t} = useI18n()
+const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
-const tableData = ref([])
-const timeRange = ref([])
+
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
+const rawGlassStorageDetailList = ref([])
+const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/largenScreen`;
const handleMessage = (data) => {
- tableData.value = data.edgTasks[0]
+ rawGlassStorageDetailList.value = data.rawGlassStorageDetailList[0]
};
-const handleBinda = async (row) => {
+
+let socket1 = null;
+const edgOneTasks = ref([])
+const edgTwoTasks = ref([])
+const engineeringOne = ref([])
+const engineeringTow = ref([])
+const socketUrl1 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreen`;
+const handleMessage1 = (data) => {
+ edgOneTasks.value = data.edgOneTasks[0];
+ edgTwoTasks.value = data.edgTwoTasks[0];
+ engineeringOne.value = data.engineeringOne[0];
+ engineeringTow.value = data.engineeringTow[0];
+};
+
+let socket2 = null;
+const temperingTaskType = ref([])
+const temperingGlassInfoList = ref([])
+const socketUrl2 = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/largenScreen`;
+const handleMessage2 = (data) => {
+ temperingTaskType.value = data.temperingTaskType[0];
+ temperingGlassInfoList.value = data.temperingGlassInfoList[0];
+};
+
+
+const handleBinda = async (row) => {
blinda.value = true;
await fetchFlowCardId(row.orderId);
-};
+};
const fetchFlowCardId = async (orderId) => {
- try {
- const response = await request.post('/loadGlass/order/order/selectOrderdetail',{
+ try {
+ const response = await request.post('/loadGlass/order/order/selectOrderdetail', {
orderId: orderId
})
if (response.code == 200) {
@@ -35,32 +59,36 @@
} else {
ElMessage.error(response.message);
}
-}
-catch (error) {
+ }
+ catch (error) {
console.error(error);
}
}
// 鐐瑰嚮涓嬫柟寮圭獥
- const handlehistorical = (row) => {
+const handlehistorical = (row) => {
blindb.value = true;
historical()
};
// 鍦ㄧ粍浠舵寕杞芥椂璁剧疆榛樿鏃堕棿鑼冨洿
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ socket1 = initializeWebSocket(socketUrl1, handleMessage1);
+ socket2 = initializeWebSocket(socketUrl2, handleMessage2);
const endTime = dayjs().startOf('minute'); // 褰撳墠鏃堕棿锛岀簿纭埌鍒嗛挓
const startTime = endTime.subtract(1, 'day').startOf('minute'); // 褰撳墠鏃堕棿鐨勫墠涓�澶╋紝绮剧‘鍒板垎閽�
// 璁剧疆鏃堕棿鑼冨洿涓� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]
- timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
+ // timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
});
// onMounted(() => {
// socket = initializeWebSocket(socketUrl, handleMessage);
// });
- onUnmounted(() => {
- if (socket) {
- closeWebSocket(socket);
- }
- });
+onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ closeWebSocket(socket1);
+ closeWebSocket(socket2);
+ }
+});
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
@@ -68,43 +96,36 @@
</script>
<template>
<div style="height: 500px;">
-<div class="awatch">
- <img src="../../assets/screen.png" alt="Screen" style="max-width: 48%; max-height: 100%; margin-top: 50px; float: left; position: relative;" />
- <div
- class="clickable-area"
- @click="handlehistorical"
- style="position: relative; width: 175px; height: 240px; top: 570px; left: 310px;"
- ></div>
+ <div class="awatch">
+ <img src="../../assets/screen.png" alt="Screen"
+ style="max-width: 48%; max-height: 100%; margin-top: 50px; float: left; position: relative;" />
+ <div class="clickable-area" @click="handlehistorical"
+ style="position: relative; width: 175px; height: 240px; top: 570px; left: 310px;"></div>
</div>
<div style="height: 190px;width: 48%;float: right;">
- <el-table height="500" ref="table"
- @selection-change="handleSelectionChange"
- :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table height="500" ref="table" @selection-change="handleSelectionChange" :data="tableDatac"
+ :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="orderId" align="center" :label="$t('large.orderId')" min-width="50" />
- <el-table-column prop="customerName" align="center" :show-overflow-tooltip="true" :label="$t('large.customerName')" min-width="90" />
+ <el-table-column prop="customerName" align="center" :show-overflow-tooltip="true"
+ :label="$t('large.customerName')" min-width="90" />
<el-table-column prop="project" align="center" :label="$t('large.project')" min-width="50" />
<el-table-column prop="area" align="center" :label="$t('large.are')" min-width="50" />
<el-table-column prop="quantity" align="center" :label="$t('large.quantity')" min-width="50" />
- <el-table-column
- align="center"
- :label="$t('large.warehousing')"
- min-width="50"
- prop="warehousing"
- >
- <template #default="scope">
- <el-tag :type="getStatusType(scope.row.warehousing)">
- {{ getStatusText(scope.row.warehousing) }}
- </el-tag>
- </template>
+ <el-table-column align="center" :label="$t('large.warehousing')" min-width="50" prop="warehousing">
+ <template #default="scope">
+ <el-tag :type="getStatusType(scope.row.warehousing)">
+ {{ getStatusText(scope.row.warehousing) }}
+ </el-tag>
+ </template>
</el-table-column>
<el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="100" />
<el-table-column fixed="right" :label="$t('large.operate')" align="center" width="100">
<template #default="scope">
<el-button size="mini" type="text" plain @click="handleBinda(scope.row)">{{ $t('large.mes') }}</el-button>
</template>
- </el-table-column>
+ </el-table-column>
</el-table>
-</div>
+ </div>
</div>
<!-- 鐐瑰嚮涓嬫柟寮圭獥 -->
<el-dialog v-model="blindb" top="10vh" width="90%">
@@ -121,12 +142,12 @@
:value="item.value"
/>
</el-select>
- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span>
+ <!-- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span> -->
<!-- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
:end-placeholder="$t('reportmanage.endtime')">
</el-date-picker> -->
- <el-date-picker
+ <!-- <el-date-picker
v-model="timeRange"
type="datetimerange"
range-separator="鑷�"
@@ -134,113 +155,115 @@
style="margin-left: 15px;"
value-format="YYYY-MM-DD hh:mm:ss"
:end-placeholder="$t('reportmanage.endtime')">
- </el-date-picker>
+ </el-date-picker> -->
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{
$t('reportmanage.inquire')
}}</el-button>
- </div>
- <el-table ref="table" style="margin-top: 20px;height: 650px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ </div>
+ <el-table ref="table" style="margin-top: 20px;height: 650px;" :data="tableDatad"
+ :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
<el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
- <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
- <el-table-column prop="startCell" align="center" :label="$t('processCard.layer')" min-width="120" />
- <el-table-column
- align="center"
- :label="$t('film.taskstatus')"
- min-width="80"
- prop="taskState"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypeb(scope.row.taskState)">
- {{ getStatusTextb(scope.row.taskState) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- :label="$t('film.enabletype')"
- min-width="80"
- prop="taskType"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskType)">
- {{ getStatusTexta(scope.row.taskType) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="120" />
- <el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
- </el-table>
- <template #footer>
+ <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
+ <el-table-column prop="startCell" align="center" :label="$t('processCard.layer')" min-width="120" />
+ <el-table-column align="center" :label="$t('film.taskstatus')" min-width="80" prop="taskState">
+ <template #default="scope">
+ <el-tag :type="getStatusTypeb(scope.row.taskState)">
+ {{ getStatusTextb(scope.row.taskState) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" :label="$t('film.enabletype')" min-width="80" prop="taskType">
+ <template #default="scope">
+ <el-tag :type="getStatusTypea(scope.row.taskType)">
+ {{ getStatusTexta(scope.row.taskType) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="120" />
+ <el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
+ </el-table>
+ <template #footer>
<div id="dialog-footer">
<el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
</div>
</template>
</el-dialog>
-<el-dialog v-model="blinda" top="5vh" width="85%">
- <el-table height="650" ref="table"
- @selection-change="handleSelectionChange"
- :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId')" min-width="110" />
- <el-table-column prop="project" align="center" :label="$t('large.project')" min-width="110" />
- <el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="110" />
- <el-table-column prop="orderNumber" align="center" :label="$t('large.serialnumber')" min-width="110" />
- <el-table-column prop="productName" align="center" :label="$t('large.productname')" min-width="110" />
- <el-table-column prop="width" align="center" :label="$t('large.width')" min-width="100" />
- <el-table-column prop="height" align="center" :label="$t('large.height')" min-width="100" />
- <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="100" />
- <el-table-column prop="quantity" align="center" :label="$t('large.number')" min-width="110" />
- <el-table-column prop="numberPatches" align="center" :label="$t('large.numberpatches')" min-width="110" />
- <el-table-column prop="receivedQuantity" align="center" :label="$t('large.innumber')" min-width="110" />
- <el-table-column prop="terminationStatus" align="center" :label="$t('large.productstatus')" min-width="110" />
- <el-table-column
- align="center"
- :label="$t('large.productstatus')"
- min-width="80"
- prop="terminationStatus"
- >
- <template #default="scope">
- <el-tag
- :type="scope.row.terminationStatus === 0 ? 'success' : 'danger'"
- >
+ <el-dialog v-model="blinda" top="5vh" width="85%">
+ <el-table height="650" ref="table" @selection-change="handleSelectionChange" :data="tableData"
+ :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+ <el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId')" min-width="110" />
+ <el-table-column prop="project" align="center" :label="$t('large.project')" min-width="110" />
+ <el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="110" />
+ <el-table-column prop="orderNumber" align="center" :label="$t('large.serialnumber')" min-width="110" />
+ <el-table-column prop="productName" align="center" :label="$t('large.productname')" min-width="110" />
+ <el-table-column prop="width" align="center" :label="$t('large.width')" min-width="100" />
+ <el-table-column prop="height" align="center" :label="$t('large.height')" min-width="100" />
+ <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="100" />
+ <el-table-column prop="quantity" align="center" :label="$t('large.number')" min-width="110" />
+ <el-table-column prop="numberPatches" align="center" :label="$t('large.numberpatches')" min-width="110" />
+ <el-table-column prop="receivedQuantity" align="center" :label="$t('large.innumber')" min-width="110" />
+ <el-table-column prop="terminationStatus" align="center" :label="$t('large.productstatus')" min-width="110" />
+ <el-table-column align="center" :label="$t('large.productstatus')" min-width="80" prop="terminationStatus">
+ <template #default="scope">
+ <el-tag :type="scope.row.terminationStatus === 0 ? 'success' : 'danger'">
{{ scope.row.terminationStatus === 0 ? $t('large.right') : $t('large.stop') }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="packType" align="center" :label="$t('large.quantity')" min-width="110" />
- <el-table-column prop="projectNo" align="center" :label="$t('large.projectnumber')" min-width="110" />
- </el-table>
- <template #footer>
- <div id="dialog-footer" style="text-align: center;">
- <el-button @click="blinda = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
-</el-dialog>
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="packType" align="center" :label="$t('large.quantity')" min-width="110" />
+ <el-table-column prop="projectNo" align="center" :label="$t('large.projectnumber')" min-width="110" />
+ </el-table>
+ <template #footer>
+ <div id="dialog-footer" style="text-align: center;">
+ <el-button @click="blinda = false">{{ $t('large.close') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
</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{
+#dt {
+ display: block;
+ float: left;
+ 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{
+
+#message {
text-align: center;
align-items: center;
color: black;
- width: 200px;
- height: 100px;
- background-color: #337ecc;
- margin-left: 28%;
+ width: 200px;
+ height: 100px;
+ background-color: #337ecc;
+ margin-left: 28%;
}
-#awatch{
+
+#awatch {
height: 460px;
}
+
.clickable-area {
- cursor: pointer; /* 鎸囩ず杩欐槸涓�涓彲鐐瑰嚮鐨勫尯鍩� */
- text-align: center; /* 濡傛灉闇�瑕侊紝鍙互鍦╠iv涓坊鍔犳枃鏈苟灞呬腑 */
- line-height: 95px; /* 濡傛灉闇�瑕侊紝浣挎枃鏈瀭鐩村眳涓� */
+ cursor: pointer;
+ /* 鎸囩ず杩欐槸涓�涓彲鐐瑰嚮鐨勫尯鍩� */
+ text-align: center;
+ /* 濡傛灉闇�瑕侊紝鍙互鍦╠iv涓坊鍔犳枃鏈苟灞呬腑 */
+ line-height: 95px;
+ /* 濡傛灉闇�瑕侊紝浣挎枃鏈瀭鐩村眳涓� */
}
+
/* .awatch{
height: 460px;
/* max-width: 100%; */
--
Gitblit v1.8.0