From 4bef3c1a0dd435b4c6bf8f8429db67dac027ed6b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 10 十二月 2025 14:48:17 +0800
Subject: [PATCH] 1、中空创建任务查询界面添加当总数量不等于已配对数时高亮显示
---
UI-Project/src/views/Returns/upreturns2.vue | 102 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 22 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index ad20672..7226b34 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -15,6 +15,7 @@
const dialogFormVisible = ref(false)
const blind = ref(false)
const blinda = ref(false)
+const isLoading = ref(true);
const ReportData = ref(true);
const blindb = ref(false)
const blindbd = ref(false)
@@ -30,6 +31,19 @@
const titleSelectJson = ref({
engineerId: [],
})
+const selectGong = async () => {
+ try {
+ const response = await request.post('/loadGlass/loadglassdevicetaskhistory/queryAllMessage',{
+ redisRequest: 'loadGlassRequestTwo',
+ stationCell: 6,
+ tableName: 'LOAD_GLASS_DEVICE_TWO_TASK',
+ webSocketName: 'loadGlassTwo'
+});
+ if (response.code == 200) {
+ }
+ } catch (error) {
+ }
+};
request.post("/loadGlass/up-patten-usage/setUpPattenRequest",{
state: null,
stationCell: 6
@@ -53,6 +67,7 @@
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ selectGong()
});
onUnmounted(() => {
if (socket) {
@@ -71,8 +86,10 @@
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassTwo`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/loadGlass/api/talk/loadGlassTwo`;
const handleMessage = (data: any) => {
+ isLoading.value = true;
+
if (data.stationList.length != 0) {
const processedData = [...data.stationList[0]];
if (processedData.length > 0) {
@@ -89,6 +106,7 @@
cuttingMachineStatusColor.value = data.inkageState[0] === 1 ? 'green' : '#911005';
}
if (data.upPattenUsages.length != 0) {
+ isLoading.value = false;
tableData.value = data.upPattenUsages[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
@@ -96,6 +114,7 @@
canSelectProjectc.value = true;
}
else {
+ isLoading.value = false;
tableData.value = [];
canSelectProjecta.value = true;
canSelectProjectb.value = true;
@@ -159,6 +178,14 @@
};
//閫夋嫨宸ョ▼棰勮纭
const handlesure = async () => {
+ if (!selectedProjectNo.value) {
+ ElMessage.error(t('basicData.plselectproject'))
+ return
+ }
+ if (!filmRemove.value) {
+ ElMessage.error(t('Mounting.removalmethod'))
+ return
+ }
try {
const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
stationCell: 6,
@@ -221,17 +248,32 @@
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
- let engineeringIda = window.localStorage.getItem('engineeringIda')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 6,
filmRemove: filmRemove,
- engineerId: engineeringIda,
+ engineerId: engineeringId,
state: 1,
})
if (response.code == 200) {
- ElMessage.success(response.message);
+ let timeoutId = setTimeout(() => {
+ // 妯℃嫙鎸変笅纭鎸夐挳
+ const confirmBtn = document.querySelector('.el-message-box__btns .el-button--primary');
+ if (confirmBtn) {
+ confirmBtn.click();
+ }
+ }, 5000)
+ await ElMessageBox.alert(' ', t('basicData.sectionUpperSuccessful'), {
+ confirmButtonText: t('searchOrder.sure'),
+ type: 'success',
+ center: true,
+ customClass: 'center-message-box',
+ });
+ // 娓呴櫎瀹氭椂鍣�
+ clearTimeout(timeoutId);
+ // 鎵ц纭鍚庣殑閫昏緫
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
@@ -263,6 +305,10 @@
if (response.code == 200) {
ElMessage.success(response.message);
blinda.value = false;
+ canSelectProjecta.value = true;
+ canSelectProjectb.value = true;
+ canSelectProjectc.value = false;
+ tableData.value = response.data;
} else {
ElMessage.error(response.message);
}
@@ -401,11 +447,11 @@
function getStatusText2(filmRemove) {
switch (filmRemove) {
case 0:
- return t('Mounting.noremoval');//瀹屾垚
- case 1:
- return t('Mounting.coarselyground');//鏂板缓
+ return t('Mounting.noremoval');//涓嶉櫎鑶�
+ // case 1:
+ // return t('Mounting.coarselyground');
case 2:
- return t('Mounting.finegrinding');//鎵ц涓�
+ return t('Mounting.removal');//闄よ啘
}
}
</script>
@@ -445,6 +491,7 @@
<el-option :label="$t('Mounting.pass')" value="100"></el-option>
</el-select>
<el-button :disabled="!ReportData" type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('Mounting.setparameters') }}</el-button>
+ <div v-loading="isLoading" class="loading-container" :element-loading-text="$t('searchOrder.loadingText')" >
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
@@ -453,7 +500,7 @@
: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"/>
@@ -470,6 +517,7 @@
:type="scope.row.state === 100 ? 'success' : 'warning'"
@click="toggleEnableState(scope.row)"
>
+ <!-- 绛夊緟涓細0 閫氳繃锛�100 -->
{{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
</el-tag>
</template>
@@ -477,20 +525,21 @@
</el-table>
</div>
</el-card>
- <div style="display: flex;">
- <div style="width: 49%;float: left;margin-left: 300px;">
+ </div>
+ <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"
+ <img src="/shangpianji.png" alt=""
+ 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>
</template>
@@ -500,13 +549,13 @@
</div>
</div>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindbd" top="10vh" width="71%">
+ <el-dialog v-model="blindbd" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
marginheight="2000px"
width="100%"
- height="700px"
+ height="750px"
frameborder="0"
></iframe>
</el-dialog>
@@ -594,8 +643,9 @@
<el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
<el-select v-model="filmRemove" clearable :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
- <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option>
- <el-option :label="$t('Mounting.finegrinding')" value="2"></el-option>
+ <!-- 涓嶉櫎鑶滐細0 闄よ啘锛�2 -->
+ <!-- <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option> -->
+ <el-option :label="$t('Mounting.removal')" value="2"></el-option>
</el-select>
</el-form-item>
</div>
@@ -635,4 +685,12 @@
margin-top: 20px;
margin-bottom: 10px;
}
+.loading-container {
+ position: relative;
+ height: 100%;
+}
+/* 纭繚閬僵灞傚湪鏈�椤跺眰 */
+.el-loading-mask {
+ z-index: 2000 !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0