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/Edging/edging.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/Edging/edging.vue b/UI-Project/src/views/Edging/edging.vue
index 3c47ac8..20edac0 100644
--- a/UI-Project/src/views/Edging/edging.vue
+++ b/UI-Project/src/views/Edging/edging.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()
const requestData = reactive({
@@ -19,7 +20,12 @@
const sendRecords = ref([]);
const downLineTask = ref([]);
-const machineId = 6;//褰撳墠椤甸潰鐨勮澶嘔D
+
+const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
+const pageParams=userInfo.user.menus[0].pages[1].params;
+const pageParamsJson=JSON.parse(pageParams);
+const machineId = pageParamsJson.machineId;//褰撳墠椤甸潰鐨勮澶嘔D
+console.log(machineId);
var errorScanId;
var errorOpen=false;
//浣跨敤WebSocket鏂瑰紡灞曠ず鏁版嵁
@@ -30,9 +36,11 @@
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
- loadData.value = data.taskingList[0];
- findMachine.value = data.machine[0];
- sendRecords.value = data.sendRecords[0].reverse();
+ let dataJson = data[""+machineId][0];
+
+ loadData.value = dataJson.taskingList[0];
+ findMachine.value = dataJson.machine[0];
+ sendRecords.value = dataJson.sendRecords[0].reverse();
if(findMachine.value.remark.toString()!=errorScanId&&findMachine.value.remark.toString()!=""&&findMachine.value.remark.toString()!=undefined){
//鏈夋暟鎹氨寮圭獥
@@ -322,6 +330,7 @@
<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, '閲嶅彂')">{{
--
Gitblit v1.8.0