From 2d19bc41c031d7ccd1e2ec3d7ba96ac7d6e0b0cc Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 10 四月 2025 15:51:56 +0800
Subject: [PATCH] 钢化前理片笼钢化查询新增取消钢化任务、中空一线、二线、三线创建任务接口更改获取方式更改，根据字段判断按钮是否可点击及背景色突出
---
UI-Project/src/views/Slicecage/slicecage.vue | 4 -
UI-Project/src/views/hollow/hollowequipmenthree.vue | 35 ++++++++---
UI-Project/src/lang/en.js | 4
UI-Project/src/lang/py.js | 4
UI-Project/src/lang/zh.js | 4
UI-Project/src/views/hollow/hollowequipment.vue | 35 ++++++++---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 35 ++++++++---
7 files changed, 85 insertions(+), 36 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 622334e..88f6710 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -177,7 +177,7 @@
searchlayout:'Non-tempered process card inquiry',
fullfurnaces:'Number of full furnaces',
specifiedproject:'The currently specified project',
- undesignate:'Undesignate',
+ undesignate:'鍙栨秷閽㈠寲',
allnumber:'Total quantity',
numbercages:'Number of cages',
missingquantity:'Missing quantity',
@@ -289,7 +289,7 @@
projectnumber:'Project number',
layoutnumber:'Drawing number of loading for tempering furnace',
numberglasses:'Number of glasses',
- specifytemperinga:'Whether to specify the tempering of this information锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'Tempered switch',
dutyinformation:'Duty information',
process:'Process',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index dbb89ea..8b884b7 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -176,7 +176,7 @@
searchlayout:'袟邪锌褉芯褋 薪械褌械屑锌械褉懈褉芯胁邪薪薪芯泄 褌械褏薪芯谢芯谐懈褔械褋泻芯泄 泻邪褉褌褘',
fullfurnaces:'袣芯谢懈褔械褋褌胁芯 锌芯谢薪褘褏 锌械褔械泄',
specifiedproject:'校泻邪蟹邪薪薪褘泄 胁 写邪薪薪褘泄 屑芯屑械薪褌 锌褉芯械泻褌',
- undesignate:'袘械蟹 芯斜芯蟹薪邪褔械薪懈褟',
+ undesignate:'鍙栨秷閽㈠寲',
allnumber:'袨斜褖械械 泻芯谢懈褔械褋褌胁芯',
numbercages:'袣芯谢懈褔械褋褌胁芯 褋械锌邪褉邪褌芯褉芯胁',
missingquantity:'袧械写芯褋褌邪褞褖械械 泻芯谢懈褔械褋褌胁芯',
@@ -288,7 +288,7 @@
projectnumber:'袧芯屑械褉 锌褉芯械泻褌邪',
layoutnumber:'效械褉褌械卸 薪芯屑械褉 蟹邪谐褉褍蟹泻懈 锌械褔懈 写谢褟 蟹邪泻邪谢泻懈',
numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
process:'宸ュ簭',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 1029ed7..817731d 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -176,7 +176,7 @@
searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
fullfurnaces:'婊＄倝鏁伴噺',
specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
- undesignate:'鍙栨秷鎸囧畾',
+ undesignate:'鍙栨秷閽㈠寲',
allnumber:'鎬绘暟閲�',
numbercages:'绗煎瓙鍐呮暟閲�',
missingquantity:'缂哄皯鏁伴噺',
@@ -288,7 +288,7 @@
projectnumber:'宸ョ▼鍙�',
layoutnumber:'閽㈠寲鐗堝浘鍙�',
numberglasses:'鐜荤拑鏁伴噺',
- specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+ specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
process:'宸ュ簭',
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 70f6a20..d289f6f 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -348,9 +348,7 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointEngineerId",{
- engineerId: ""
- });
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/cancelTemperingTask");
if (response.code === 200) {
ElMessage.success(response.message);
} else {
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index d69481d..ecf2fdd 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -100,12 +100,15 @@
ref="table"
style="margin-top: 20px; height: 700px;"
:data="tableDatab"
+ :row-class-name="tableRowClassName"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="projectNumber"
>
<el-table-column>
<template #default="props">
- <el-table :data="props.row.records" style="width: 100%">
+ <el-table :data="props.row.flowCardGlassInfoDTOList" style="width: 100%"
+ :row-class-name="(row) => nestedTableRowClassName(props.row, row)"
+ >
<el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
<el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80"/>
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
@@ -116,11 +119,11 @@
</el-table>
</template>
</el-table-column>
- <el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
- <el-table-column prop="productname" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
+ <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
- <el-button type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
+ <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
<el-button type="text" plain @click="handleBindRack(scope.row)">{{
$t('hellow.missingfilms')
}}
@@ -1365,14 +1368,14 @@
const fetchFlowCardId = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
+ deviceId: 0,
filmsId: '',
flowCardId: '',
- thickness: '',
+ thickness: 0,
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
} else {
ElMessage.error('Failed to fetch data');
}
@@ -1380,6 +1383,18 @@
ElMessage.error('Error fetching data');
}
};
+function tableRowClassName({ row }) {
+ if (row.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
+function nestedTableRowClassName(parentRow, row) {
+ if (parentRow.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
const fetchFlowCardsearch = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
@@ -1389,8 +1404,7 @@
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
} else {
ElMessage.error('Failed to fetch data');
}
@@ -1783,4 +1797,7 @@
margin-top: 20px;
margin-bottom: 10px;
}
+::v-deep(.row-red-background) {
+ background-color: rgb(224.6, 242.8, 215.6) !important;
+}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index ae7ebe9..f0e4518 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -73,13 +73,16 @@
ref="table"
style="margin-top: 20px; height: 700px;"
:data="tableDatab"
+ :row-class-name="tableRowClassName"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="projectNumber"
>
<!-- <el-table-column type="expand"> -->
<el-table-column>
<template #default="props">
- <el-table :data="props.row.records" style="width: 100%">
+ <el-table :data="props.row.flowCardGlassInfoDTOList" style="width: 100%"
+ :row-class-name="(row) => nestedTableRowClassName(props.row, row)"
+ >
<el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
<el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80"/>
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
@@ -90,11 +93,11 @@
</el-table>
</template>
</el-table-column>
- <el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
- <el-table-column prop="productname" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
+ <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
- <el-button type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
+ <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
<el-button type="text" plain @click="handleBindRack(scope.row)">{{
$t('hellow.missingfilms')
}}
@@ -682,14 +685,14 @@
const fetchFlowCardId = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
+ deviceId: 0,
filmsId: '',
flowCardId: '',
- thickness: '',
+ thickness: 0,
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
} else {
ElMessage.error('Failed to fetch data');
}
@@ -697,6 +700,18 @@
ElMessage.error('Error fetching data');
}
};
+function tableRowClassName({ row }) {
+ if (row.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
+function nestedTableRowClassName(parentRow, row) {
+ if (parentRow.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
const fetchFlowCardsearch = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
@@ -706,8 +721,7 @@
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
} else {
ElMessage.error('Failed to fetch data');
}
@@ -1003,4 +1017,7 @@
margin-top: 20px;
margin-bottom: 10px;
}
+::v-deep(.row-red-background) {
+ background-color: rgb(224.6, 242.8, 215.6) !important;
+}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index b232214..fd68574 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -73,13 +73,16 @@
ref="table"
style="margin-top: 20px; height: 700px;"
:data="tableDatab"
+ :row-class-name="tableRowClassName"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="projectNumber"
>
<!-- <el-table-column type="expand"> -->
<el-table-column>
<template #default="props">
- <el-table :data="props.row.records" style="width: 100%">
+ <el-table :data="props.row.flowCardGlassInfoDTOList" style="width: 100%"
+ :row-class-name="(row) => nestedTableRowClassName(props.row, row)"
+ >
<el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
<el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80"/>
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
@@ -90,11 +93,11 @@
</el-table>
</template>
</el-table-column>
- <el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
- <el-table-column prop="productname" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
+ <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
- <el-button type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
+ <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
<el-button type="text" plain @click="handleBindRack(scope.row)">{{
$t('hellow.missingfilms')
}}
@@ -684,14 +687,14 @@
const fetchFlowCardId = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
+ deviceId: 0,
filmsId: '',
flowCardId: '',
- thickness: '',
+ thickness: 0,
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
} else {
ElMessage.error('Failed to fetch data');
}
@@ -699,6 +702,18 @@
ElMessage.error('Error fetching data');
}
};
+function tableRowClassName({ row }) {
+ if (row.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
+function nestedTableRowClassName(parentRow, row) {
+ if (parentRow.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
const fetchFlowCardsearch = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
@@ -708,8 +723,7 @@
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
} else {
ElMessage.error('Failed to fetch data');
}
@@ -1006,4 +1020,7 @@
margin-top: 20px;
margin-bottom: 10px;
}
+::v-deep(.row-red-background) {
+ background-color: rgb(224.6, 242.8, 215.6) !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0