From af7f09e7965887b034c9add213bf68c816f22338 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 19 九月 2025 18:02:36 +0800
Subject: [PATCH] 中空理片笼缺片详情改造，中空一线二线三线页面改造
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 107 ++++++++++++++++++++++++++++-------------------------
1 files changed, 57 insertions(+), 50 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 0faa976..6a9d33e 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -16,10 +16,6 @@
<el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">
{{ $t('hellow.starttask') }}
</el-button>
- <el-button style="margin-left: 10px;" id="searchButton" type="info" @click="handleBindd">{{
- $t('hellow.taskdet')
- }}
- </el-button>
<el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBindc">{{
$t('hellow.stopproject')
}}
@@ -36,9 +32,25 @@
:style="{ marginTop: '2px', backgroundColor: freetwo, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
</div>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="650" ref="table" :data="tableDataa"
- :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
- <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center" />
+ <el-tabs v-model="activeTab" type="card">
+ <el-tab-pane
+ v-for="tab in tabList"
+ :key="tab.title"
+ :label="tab.title"
+ :name="tab.title"
+ >
+ <div style="margin-bottom: 10px;">
+ <el-button style="margin-left: 10px;" type="info" @click="handleDelete(tab.title)">{{
+ $t('hellow.taskdet')
+ }}
+ </el-button>
+ </div>
+ <!-- 鍔ㄦ�佽〃鏍� -->
+ <el-table
+ :data="tab.tableDataa"
+ :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
+ >
+ <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center" />
<el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" />
<el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center" />
<el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center" />
@@ -48,10 +60,12 @@
<el-table-column prop="width" :label="$t('hellow.width')" align="center" />
<el-table-column prop="state" :label="$t('hellow.state')" align="center">
<template #default="scope">
- {{ scope.row.state == -1 ? "绛夊緟鍑虹墖" : "鍑虹墖瀹屾垚" }}
+ {{ scope.row.state == -1 ? $t('hellow.waitingout') : $t('hellow.finishout') }}
</template>
</el-table-column>
- </el-table>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
<!-- <div style="display: flex;margin-left: 40%;margin-top: 10px;">
<div style="margin-top: 5px;margin-right: 5px;">{{ $t('hellow.line') }}</div>
<el-pagination
@@ -417,17 +431,6 @@
<print-custom-label-x-j id="childLabel" :faceOrientation="stateValue" :lableType="1" :list="listFlow"
:lastList='lastList' :type="tag.name" style="width: 100%;height: 100%" />
</el-dialog>
- <!-- 鍒犻櫎浠诲姟 -->
- <el-dialog v-model="blindd" top="30vh" width="25%" :title="$t('hellow.hollowtaskdet')">
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="handled">
- {{ $t('basicData.confirm') }}
- </el-button>
- <el-button @click="blindd = false">{{ $t('basicData.cancel') }}</el-button>
- </div>
- </template>
- </el-dialog>
<!-- 棰勮 -->
<el-dialog v-model="dialogFormVisiblee" top="24vh" width="25%" :title="$t('hellow.reviewproject')">
<div style="margin-left: 50px;margin-bottom: 10px;">
@@ -500,9 +503,10 @@
const blinda = ref(false)
const blindb = ref(false)
const blindc = ref(false)
-const blindd = ref(false)
-
const mulan = ref(false)
+const activeTab = ref('')
+const tabList = ref([])
+const internalInstance = getCurrentInstance()
const tableDataa = ref([])
const tableDatab = ref([])
const tableDatac = ref([])
@@ -594,19 +598,23 @@
fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
+ const rawData = data.queueInfo[0]
+ const formattedData = Object.entries(rawData).map(([key, data]) => ({
+ title: key,
+ tableDataa: Array.isArray(data) ? data : [data]
+ }));
+ tabList.value = formattedData;
+ if (tabList.value.length > 0) {
+ activeTab.value = tabList.value[0].title;
+ }
+ internalInstance.ctx.$forceUpdate();
try {
- tableDataa.value = data.queueInfo[0];
const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
if (data.freeRequest != null) {
freetwo.value = data.freeRequest[0] == true ? 'green' : '#911005';
}
- // if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
- // tableDataa.value = currentPageData[0];
- // } else {
- // console.warn('No data for the current page key:', currentPageKeyValue);
- // }
} catch (error) {
}
};
@@ -646,10 +654,6 @@
// 鏆傚仠浠诲姟
const handleBindc = (row) => {
blindc.value = true;
-};
-// 鍒犻櫎浠诲姟
-const handleBindd = (row) => {
- blindd.value = true;
};
const handleBinde = (row) => {
blinde.value = true;
@@ -985,7 +989,7 @@
try {
let flowCardId = window.localStorage.getItem('flowCardId')
if (flowCardId !== '') {
- var url = "/hollowGlass/hollowGlassOutRelationInfo/startTask?flowCardId=" + flowCardId + "&cell=" + 931;
+ var url = "/hollowGlass/hollowGlassOutRelationInfo/startTask?cell=" + 931 ;
const response = await request.post(url)
if (response.code == 200) {
ElMessage.success(response.message);
@@ -1006,7 +1010,7 @@
try {
let flowCardId = window.localStorage.getItem('flowCardId')
if (flowCardId !== '') {
- var url = "/hollowGlass/hollowGlassOutRelationInfo/pauseTask?flowCardId=" + flowCardId + "&cell=" + 931;
+ var url = "/hollowGlass/hollowGlassOutRelationInfo/pauseTask?cell=" + 931;
const response = await request.post(url)
if (response.code == 200) {
ElMessage.success(response.message);
@@ -1023,26 +1027,29 @@
}
}
// 鍒犻櫎浠诲姟
-const handled = async () => {
+const handleDelete = async (flowCardId) => {
try {
- let flowCardId = window.localStorage.getItem('flowCardId')
- if (flowCardId !== '') {
- var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 931;
+ const confirmResult = await ElMessageBox.confirm(
+ t('hellow.hollowtaskdet'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 930;
const response = await request.post(url)
- if (response.code == 200) {
- ElMessage.success(response.message);
- blindd.value = false;
+ if (response.code === 200) {
+ ElMessage.success(response.message);
} else {
- }
- } else {
- ElMessage({
- type: 'info',
- message: t('basicData.infonull'),
- })
- }
+ ElMessage.error(response.msg);
+ }
+ }
} catch (error) {
- }
-}
+ }
+};
// 棰嗗彇浠诲姟
const finisha = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
--
Gitblit v1.8.0