From 689b64bfce7ea0eff18349b996994366568a30b3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 05 八月 2024 13:33:05 +0800
Subject: [PATCH] 下片页面添加落架详情显示
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 36 ++++++++++++++++++++++--------------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 4 ++--
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index ca99396..844a323 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -26,7 +26,7 @@
const flowCardId = ref('');
const flowCardOptions = ref('[]');
const tableData = reactive([]);
-const downGlass= reactive([]);
+const downGlass= ref([]);
// 鏂规硶
const handleSelectionChange = () => {
// 澶勭悊琛ㄦ牸琛岄�夋嫨浜嬩欢
@@ -146,8 +146,12 @@
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
- downGlass.value=data.sendDownGlass[0];
- tableData.splice(0, tableData.length, ...data.params[0]);
+ if(data.sendDownGlass!=null){
+ downGlass.value=data.sendDownGlass[0][1];
+ console.log(downGlass.value);
+ console.log(tableData.value);
+ }
+ // tableData.splice(0, tableData.length, ...data.params[0]);
// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
};
@@ -212,6 +216,7 @@
</script>
<template>
<div>
+ <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisibleaDownGlass = true">钀芥灦璇︽儏</el-button>
<el-card style="flex: 1;" v-loading="loading">
<el-card style="flex: 1;margin-left: 4px;margin-top: 1px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
@@ -234,7 +239,6 @@
prop="enableState"
>
<template #default="scope">
-
<el-tag :type="getTagType(scope.row.enableState)" @click="toggleStatus(scope.row)">
{{ scope.row.enableState === 1 ? $t('reportWork.enable') : $t('reportWork.unenable') }}
</el-tag>
@@ -245,23 +249,25 @@
<el-button size="mini" type="text" plain v-show="scope.row.enableState !== '宸插惎鐢�' " @click="handleBindRack(scope.row)">{{ $t('reportWork.bindingshelves') }}</el-button>
<el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">{{ $t('reportWork.clear') }}</el-button>
</template>
+
</el-table-column>
</el-table>
+
</div>
<el-dialog v-model="dialogFormVisibleaDownGlass" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
<el-table height="200px" ref="table"
@selection-change="handleSelectionChange"
:data="downGlass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="flowCardId" align="center" :label="$t('flowCardId')" min-width="80" />
- <el-table-column prop="layer" align="center" :label="$t('layer')" min-width="120" />
- <el-table-column prop="sequence" align="center" :label="$t('sequence')" min-width="150" />
- <el-table-column prop="width" align="center" :label="$t('width')" min-width="120" />
- <el-table-column prop="height" align="center" :label="$t('height')" min-width="120" />
- <el-table-column prop="thickness" align="center" label="thickness" min-width="120" />
- <el-table-column prop="otherNumber" align="center" label="浜哄伐涓嬬墖鏁�" min-width="120" />
- <!-- <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" /> -->
- <el-table-column prop="Filmsid" align="center" :label="$t('Filmsid')" min-width="120" />
- <el-table-column prop="glassId" align="center" :label="$t('glassId')" min-width="120" />
+ <el-table-column prop="workStationId" align="center" :label="$t('宸ヤ綅鍙�')" min-width="80" />
+ <el-table-column prop="engineerId" align="center" :label="$t('宸ョ▼鍙�')" min-width="80" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('娴佺▼鍗″彿')" min-width="80" />
+ <el-table-column prop="layer" align="center" :label="$t('灞�')" min-width="120" />
+ <el-table-column prop="sequence" align="center" :label="$t('椤哄簭')" min-width="150" />
+ <el-table-column prop="width" align="center" :label="$t('瀹�')" min-width="120" />
+ <el-table-column prop="height" align="center" :label="$t('楂�')" min-width="120" />
+ <el-table-column prop="Filmsid" align="center" :label="$t('鑶滅郴')" min-width="120" />
+ <el-table-column prop="thickness" align="center" label="鍘氬害" min-width="120" />
+ <el-table-column prop="glassId" align="center" :label="$t('鐜荤拑id')" min-width="120" />
</el-table>
</el-dialog>
@@ -282,6 +288,7 @@
</div>
</div>
</el-card>
+
</div>
<el-dialog v-model="dialogFormVisiblea" top="21vh" width="40%" :title="$t('reportWork.bindingshelves')">
@@ -301,6 +308,7 @@
</div>
<template #footer>
<div id="dialog-footer">
+
<el-button type="primary" @click="handleConfirm">
{{ $t('reportWork.sure') }}
</el-button>
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
index 7a84902..adf8d51 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -107,8 +107,8 @@
Map<Integer, List<DownGlassInfo>> listMap = downGlassInfos.stream().collect(Collectors.groupingBy(DownGlassInfo::getWorkStationId));
JSONObject jsonObject4 = new JSONObject();
List<Map<String, Object>> list = downStorageCageService.selectDownStorageCages();
- jsonObject4.append("params", listMap);
- ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("sendDownGlass");
+ jsonObject4.append("sendDownGlass", listMap);
+ ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
if (sendwServer4 != null) {
for (WebSocketServer webserver : sendwServer4) {
if (webserver != null && webserver.session.isOpen()) {
--
Gitblit v1.8.0