From 43d86830f4696c3ba2250a961d26377e1ff6cc32 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 17 十二月 2025 10:39:43 +0800
Subject: [PATCH] 1、 查询是否除膜优化
---
UI-Project/src/views/Slicecage/slicecage.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 24d1ce4..9a49a1c 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -786,7 +786,7 @@
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
// 鎶ヨ淇℃伅
if (data.alarmInfo[0] != null && data.alarmInfo[0].length > 0) {
@@ -1248,6 +1248,7 @@
<el-icon><WarnTriangleFilled /></el-icon>
<span class="alert-text">
{{ alertText }} (id:{{ alertMessage }})
+ <span class="confirm-text">{{ $t('hellow.pleaseConfirm') }}</span>
</span>
</div>
<button @click="showAlert = false" class="close-btn">脳</button>
@@ -1265,7 +1266,7 @@
style="width: 100%;"
>
<el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="100" />
- <el-table-column
+ <el-table-column
:label="$t('hellow.content')"
align="center"
min-width="220"
@@ -1616,7 +1617,7 @@
></iframe>
</el-dialog>
<!-- 閽㈠寲鏌ヨ -->
-<el-dialog v-model="dialogFormVisiblec" top="5vh" width="85%" :title="$t('searchOrder.temperingqueries')">
+<el-dialog v-model="dialogFormVisiblec" top="5vh" width="90%" :title="$t('searchOrder.temperingqueries')">
<div style="margin-bottom: 20px">
<el-form>
<el-row style="margin-top: -15px;margin-bottom: -2px;">
@@ -1656,17 +1657,17 @@
</el-row>
</el-form>
</div>
- <el-table ref="table" style="margin-top: 20px;height: 500px;"
+ <el-table ref="table" style="margin-top: 20px;height: 600px;"
:data="tableDatagh" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
- <el-table-column prop="engineerName" fixed align="center" :label="$t('large.productname')" min-width="150"/>
- <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
- <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
- <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
- <el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
- <el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
- <el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
- <el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
+ <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="100"/>
+ <el-table-column prop="engineerName" fixed align="center" :label="$t('large.engineername')" min-width="120"/>
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="100" />
+ <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="100" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutnumber')" min-width="100" />
+ <el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="100" />
+ <el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="100" />
+ <el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="100" />
+ <el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="120" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
<el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
@@ -2035,4 +2036,11 @@
.el-loading-mask {
z-index: 2000 !important;
}
+.confirm-text {
+ color: rgb(242, 121, 8);
+ display: block; /* 寮哄埗鎹㈣ */
+ text-align: center; /* 姘村钩灞呬腑 */
+ margin-top: 4px; /* 涓庝笂涓�琛屼繚鎸侀棿璺� */
+ font-weight: 500; /* 鍔犵矖绐佸嚭 */
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0