From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 61b9152..12be9ea 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -68,6 +68,8 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassOne`;
const handleMessage = (data: any) => {
+ console.log(data.stationList);
+
if (data.inkageState != null) {
cuttingMachineStatusColor.value = data.inkageState[0] === 1 ? 'green' : '#911005';
}
@@ -453,7 +455,7 @@
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="400" ref="table" :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }"
:data="tableData">
- <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center" />
+ <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="120" align="center" />
<el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center" />
<el-table-column prop="height" :label="$t('Mounting.height')" align="center" />
<el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center" />
@@ -469,21 +471,21 @@
</el-table>
</div>
</el-card>
- <div style="display: flex;">
- <div style="width: 49%;float: left;margin-left: 300px;">
+ <div style="display: flex;margin-left:5%">
+ <div style="width: 55%;float: left;margin-left: 300px;">
<div style="display: flex;">
<img src="../../assets/shangpianji.png" alt=""
- style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
- <el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="500"
+ style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 3%;">
+ <el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="700"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="50" />
- <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80" />
- <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80" />
+ <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="65" />
+ <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="75" />
+ <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="75" />
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
<el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80" />
<el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')"
min-width="60" />
- <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
<template #default="scope">
<el-button :disabled="(!scope.row.patternThickness)" type="text" plain
@click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
@@ -583,8 +585,8 @@
</template>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindbd" top="10vh" width="71%">
- <iframe :src="iframeUrl" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
+ <el-dialog v-model="blindbd" top="5vh" width="95%" @close="iframeUrl=''">
+ <iframe :src="iframeUrl" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
</div>
--
Gitblit v1.8.0