From 1460aa1d5f2b5722d43ed31724594c006213bea7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 18 四月 2025 16:40:43 +0800
Subject: [PATCH] 看板2更新
---
UI-Project/src/views/Marking/marking.vue | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/Marking/marking.vue b/UI-Project/src/views/Marking/marking.vue
index 8ebac0c..bba4efb 100644
--- a/UI-Project/src/views/Marking/marking.vue
+++ b/UI-Project/src/views/Marking/marking.vue
@@ -6,6 +6,7 @@
import { useI18n } from 'vue-i18n'
import { WebSocketHost ,host} from '@/utils/constants'
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
+import {gridDateFormatter} from '@/stores/tool';
let language = ref(localStorage.getItem('lang') || 'zh')
const { t } = useI18n()
@@ -15,15 +16,25 @@
});
const loadData = ref([]);
const findMachine = ref([]);
-const machineId=11;//褰撳墠椤甸潰鐨勮澶嘔D
+const sendRecords = ref([]);
+
+const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
+const pageParams=userInfo.user.menus[0].pages[3].params;
+const pageParamsJson=JSON.parse(pageParams);
+const machineId = pageParamsJson.machineId;//褰撳墠椤甸潰鐨勮澶嘔D
+console.log(machineId);
+//const machineId=12;//褰撳墠椤甸潰鐨勮澶嘔D
//浣跨敤WebSocket鏂瑰紡灞曠ず鏁版嵁
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/deviceInteraction/api/talk/marking`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
- loadData.value = data.taskingList[0];
- findMachine.value = data.machine[0];
+ let dataJson = data[""+machineId][0];
+
+ loadData.value = dataJson.taskingList[0];
+ findMachine.value = dataJson.machine[0];
+ sendRecords.value = dataJson.sendRecords[0];
};
onUnmounted(() => {
if (socket) {
@@ -199,9 +210,9 @@
<el-button type="primary" id="searchButton" @click="workStatus('鐮存崯')">鐮存崯</el-button>
<el-button type="primary" id="searchButton" @click="workStatus('瀹屽伐')">瀹屽伐</el-button> -->
</div>
- <div id="main-body" style="min-height:240px;">
+ <div id="main-body">
<!-- 琛ㄦ牸鍐呭 -->
- <el-table :data="loadData" stripe
+ <el-table :data="loadData" stripe style="height:260px"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }">
<!-- <el-table-column type="selection" min-width="30" /> -->
@@ -210,10 +221,12 @@
<el-table-column prop="batchNumber" :label="$t('glassInfo.batchNumber')"/>
<el-table-column prop="taskType" :label="$t('glassInfo.taskType')"/>
<el-table-column prop="glassId" :label="$t('glassInfo.glassId')"/>
+ <el-table-column prop="scanId" :label="$t('glassInfo.scanId')" />
<el-table-column prop="length" :label="$t('glassInfo.length')"/>
<el-table-column prop="width" :label="$t('glassInfo.width')"/>
<el-table-column prop="thickness" :label="$t('glassInfo.thickness')"/>
<el-table-column prop="workState" :label="$t('glassInfo.workState')"/>
+ <el-table-column prop="operationRecordTime" :formatter="gridDateFormatter" :label="$t('glassInfo.operationRecordTime')" width="180"/>
<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
<template #default="scope">
<el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '閲嶅彂')" >{{$t('functionState.anew')}}</el-button>
@@ -225,11 +238,22 @@
</el-table>
</div>
- <div id="main-body"
- style="width: 100%; height: 460px;background-image: url(../../src/assets/鑷姩鎵撴爣鏈�.png) ;background-size: 100% 100%;">
- <!-- 鐢诲浘鍐呭 -->
- <div style="width: 100px; height: 100px; background-color: red; position: relative; top: 171px; left: 218px">
+ <div id="main-body" style="width: 100%; height: 460px;min-width: 1200px;">
+ <img style="width: 70%;min-width: 900px; height: 460px;float: left;" src="../../assets/鑷姩鎵撴爣鏈�.png">
+ <!-- <el-image style="width: 70%;min-width: 900px; height: 460px;float: left;" src="../../src/assets/鑷姩鎵撴爣鏈�.png"></el-image> -->
+ <!-- <div style="width: 70%;min-width: 900px; height: 460px;background-image: url('../../src/assets/鑷姩鎵撴爣鏈�.png') ;background-size: 100% 100%;float: left;">
+
+ </div> -->
+ <div style="width: 30%;min-width: 300px; height: 460px;float: left;padding: 20px;;">
+ <!-- <div style="text-align: center;height: 30px;line-height: 30px;font-size: 20px;padding: 20px;">鏁版嵁浜や簰璁板綍</div> -->
+ <el-table :data="sendRecords" stripe :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center',height:'30px'}" :cell-style="{ textAlign: 'center' }">
+ <el-table-column prop="sendContent" :label="$t('glassInfo.sendContent')"/>
+ </el-table>
</div>
+ <div style="clear锛歜oth"></div>
+ <!-- 鐢诲浘鍐呭
+ <div style="width: 100px; height: 100px; background-color: red; position: relative; top: 171px; left: 218px">
+ </div>-->
</div>
</div>
</template>
--
Gitblit v1.8.0