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/ManualReporting/manualReporting.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/ManualReporting/manualReporting.vue b/UI-Project/src/views/ManualReporting/manualReporting.vue
index 1119704..c7c992c 100644
--- a/UI-Project/src/views/ManualReporting/manualReporting.vue
+++ b/UI-Project/src/views/ManualReporting/manualReporting.vue
@@ -24,7 +24,11 @@
const scanCodeOld = ref([]);
const searcheh = ref();
-const machineId = 24;//褰撳墠椤甸潰鐨勮澶嘔D
+const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
+const pageParams=userInfo.user.menus[0].pages[6].params;
+const pageParamsJson=JSON.parse(pageParams);
+const machineId = pageParamsJson.machineId;//褰撳墠椤甸潰鐨勮澶嘔D
+console.log(machineId);
var errorScanId;
var errorOpen=false;
//浣跨敤WebSocket鏂瑰紡灞曠ず鏁版嵁
@@ -37,8 +41,9 @@
// 鏇存柊 tableData 鐨勬暟鎹�
//taskinggoruby.value = data.taskinggoruby[0];
//loadData.value =getDataSort(data.taskingList[0]);
- loadData.value = data.taskingList[0];
- findMachine.value = data.machine[0];
+ const dataJson = data[""+machineId][0];
+ loadData.value = dataJson.taskingList[0];
+ findMachine.value = dataJson.machine[0];
if(findMachine.value.remark.toString()!=errorScanId&&findMachine.value.remark.toString()!=""&&findMachine.value.remark.toString()!=undefined){
//鏈夋暟鎹氨寮圭獥
@@ -395,13 +400,14 @@
:cell-style="{ textAlign: 'center' }">
<!-- <el-table-column type="selection" min-width="30" /> -->
<el-table-column type="index" :label="$t('glassInfo.number')" min-width="30" />
- <el-table-column prop="batchNumber" :label="$t('glassInfo.batchNumber')" />
<el-table-column prop="taskType" :label="$t('glassInfo.taskType')" />
- <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="operationRecordTime" :formatter="gridDateFormatter" :label="$t('glassInfo.operationRecordTime')" width="180"/>
+ <el-table-column prop="batchNumber" :label="$t('glassInfo.batchNumber')" />
+ <el-table-column prop="scanId" :label="$t('glassInfo.scanId')" />
<el-table-column prop="warehouse" :label="$t('glassInfo.warehouse')" />
<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
<template #default="scope">
--
Gitblit v1.8.0