From faa3b0410410415c4ad788c7e0955ef97158df2e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 13 三月 2025 22:37:20 +0800
Subject: [PATCH] 贴膜机任务数据显示异常修改
---
UI-Project/src/views/FlipSlice/flipSlice.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/FlipSlice/flipSlice.vue b/UI-Project/src/views/FlipSlice/flipSlice.vue
index c3d5b17..804ac8d 100644
--- a/UI-Project/src/views/FlipSlice/flipSlice.vue
+++ b/UI-Project/src/views/FlipSlice/flipSlice.vue
@@ -6,6 +6,9 @@
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 +22,12 @@
const sendRecords = ref([]);
const downLineTask = ref([]);
-const machineId = 26;//褰撳墠椤甸潰鐨勮澶嘔D
+const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
+const pageParams=userInfo.user.menus[0].pages[2].params;
+const pageParamsJson=JSON.parse(pageParams);
+const machineId = pageParamsJson.machineId;//褰撳墠椤甸潰鐨勮澶嘔D
+console.log(machineId);
+//const machineId = 26;//褰撳墠椤甸潰鐨勮澶嘔D
var errorScanId;
var errorOpen=false;
//浣跨敤WebSocket鏂瑰紡灞曠ず鏁版嵁
@@ -30,9 +38,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){
//鏈夋暟鎹氨寮圭獥
if(errorOpen){
@@ -357,6 +367,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, '閲嶅彂')">{{
@@ -373,7 +384,8 @@
</div>
<div id="main-body" style="width: 100%; height: 460px;min-width: 1200px;">
- <el-image style="width: 70%;min-width: 900px; height: 460px;float: left;" src="../../src/assets/缈荤墖鍙�.png"></el-image>
+ <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> -->
--
Gitblit v1.8.0