From d1bd20f33173a250015130bbe68fd47f37fd9160 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 29 八月 2025 16:12:33 +0800
Subject: [PATCH] 修改点胶页面
---
UI-Project/src/views/GlueDispenser/glueDispenser.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/GlueDispenser/glueDispenser.vue b/UI-Project/src/views/GlueDispenser/glueDispenser.vue
index 096c6d5..580ed7e 100644
--- a/UI-Project/src/views/GlueDispenser/glueDispenser.vue
+++ b/UI-Project/src/views/GlueDispenser/glueDispenser.vue
@@ -22,8 +22,10 @@
const downLineTask = ref([]);
const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
-const pageParams=userInfo.user.menus[0].pages[2].params;
+const pageParams=userInfo.user.menus[0].pages[12].params;
const pageParamsJson=JSON.parse(pageParams);
+console.log(userInfo.user);
+
const machineId = pageParamsJson.machineId;//褰撳墠椤甸潰鐨勮澶嘔D
console.log(machineId);
//浣跨敤WebSocket鏂瑰紡灞曠ず鏁版嵁
@@ -38,6 +40,7 @@
loadData.value = dataJson.taskingList[0];
findMachine.value = dataJson.machine[0];
+
sendRecords.value = dataJson.sendRecords[0].reverse();
};
@@ -331,7 +334,7 @@
</div>
<div id="main-body">
<!-- 琛ㄦ牸鍐呭 -->
- <el-table :data="loadData" stripe style="height:260px"
+ <el-table :data="loadData" stripe style="height:560px"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }">
<!-- <el-table-column type="selection" min-width="30" /> -->
@@ -360,12 +363,9 @@
</el-table>
</div>
- <div id="main-body" style="width: 100%; height: 460px;min-width: 1200px;">
+ <!-- <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;;">
<el-table :data="sendRecords" stripe
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center', height: '30px' }"
@@ -375,7 +375,7 @@
</div>
<div style="clear锛歜oth"></div>
- </div>
+ </div> -->
</div>
</template>
--
Gitblit v1.8.0