From 963dc5dd7b480376e1da6893ee30183dbd5bef50 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 18 三月 2025 14:43:06 +0800
Subject: [PATCH] 大屏更改按钮样式
---
UI-Project/src/views/Slicecage/slicecage.vue | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index a09a077..2233a63 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -777,12 +777,6 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
- if (cageInfo && cageInfo.createTime) {
- cageInfo.formattedCreateTime = formatTimestamp(cageInfo.createTime);
- }
- if (cageInfo && cageInfo.updateTime) {
- cageInfo.formattedupdateTime = formatTimestamp(cageInfo.updateTime);
- }
if(data.bigStorageSummary!=null){
tableDatass.value = data.bigStorageSummary[0]
}else{
@@ -825,6 +819,11 @@
} else {
tableDatac.value = '',
adjusta.value = ''
+ }
+ if(data.bigStorageCageDetailsFeedTask!=null){
+ tableDatax.value = data.bigStorageCageDetailsFeedTask[0]
+ } else {
+ tableDatax.value = ''
}
if(data.bigStorageCageDetailsFeedTask!=null){
tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
@@ -1147,20 +1146,6 @@
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;">
<el-table height="300px" ref="table"
- :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
- <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </el-card>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
- <el-table height="300px" ref="table"
@selection-change="handleSelectionChange"
:row-class-name="tableRowClassName"
:data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
@@ -1180,6 +1165,20 @@
</template>
</el-table-column>
</el-table>
+ </div>
+ </el-card>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
+ <el-table height="300px" ref="table"
+ :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
+ <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
</el-card>
</div>
<div style="padding: 10px;display: flex;height:130px;">
@@ -1445,13 +1444,13 @@
</div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="90%">
+<el-dialog v-model="blindb" top="10vh" width="95%">
<iframe
:src="iframeUrl"
marginwidth="2000px"
marginheight="2000px"
width="100%"
- height="700px"
+ height="750px"
frameborder="0"
></iframe>
</el-dialog>
--
Gitblit v1.8.0