From 870b2e410af104ce9a551cd7f3f462b77800266a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 26 六月 2025 09:47:15 +0800
Subject: [PATCH] 解决中空一线、二线、三线前端返回空数据时报错问题
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 258 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 163 insertions(+), 95 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index dbd27ad..0d1a301 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -1,6 +1,6 @@
<template>
<div style="height: 600px;">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" >
<div style="display: flex; flex-direction: row; align-items: center; margin-bottom: 10px;">
<el-button id="searchButton" type="primary" @click="handleormulan">
{{ $t('hellow.hollowformula') }}
@@ -65,40 +65,48 @@
<div style="display: flex;">
<el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="productName" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('large.inproductname')"/>
+ <el-input v-model="customerName" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('large.incustomerName')"/>
<el-input v-model="thickness" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchFlowCardsearch">
{{$t('reportmanage.inquire')}}</el-button>
</div>
+ <div style="margin-left: 87%;">{{$t('hellow.pairsnumbertotal')}}{{ pairTotal }}</div>
<el-table
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"/>
<el-table-column prop="sumCount" align="center" :label="$t('hellow.totalnumber')" min-width="80"/>
<el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="80"/>
- <el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
<el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80"/>
+ <el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
</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="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 prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{
+ <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')
}}
</el-button>
- <el-button size="mini" type="text" plain @click="handleout(scope.row)">{{
+ <el-button type="text" plain @click="handleout(scope.row)">{{
$t('hellow.forcedfilming')
}}
</el-button>
@@ -109,21 +117,21 @@
<!-- 涓┖閰嶆柟娣诲姞 -->
<el-dialog v-model="add" top="23vh" width="55%" :title="$t('hellow.hollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
- <el-form label-width="150px" label-position="right">
+ <el-form label-width="200px">
+ <el-form label-width="200px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
- <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
+ <el-select v-model="filmRemove" clearable style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -132,35 +140,35 @@
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
</el-form-item>
</div></div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div></div>
@@ -181,21 +189,21 @@
<!-- 涓┖閰嶆柟淇敼 -->
<el-dialog v-model="adda" top="23vh" width="55%" :title="$t('hellow.edithollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
- <el-form label-width="150px" label-position="right">
+ <el-form label-width="200px">
+ <el-form label-width="200px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
- <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
+ <el-select v-model="filmRemove" clearable style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -204,35 +212,35 @@
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
</el-form-item>
</div></div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div></div>
@@ -253,9 +261,9 @@
<!-- 棰嗗彇浠诲姟 -->
<el-dialog v-model="dialogFormVisiblec" top="21vh" width="40%" :title="$t('hellow.claimquest')">
<div style="margin-left: 20px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="100px">
+ <el-form label-width="100px">
<el-form label-width="210px" label-position="right">
- <el-form-item :label="$t('hellow.pairQuantity')" :required="true" style="width: 25vw">
+ <el-form-item :label="$t('hellow.ptotalpairQuantity')" :required="true" style="width: 25vw">
<el-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantity" autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('hellow.route')" :required="true" style="width: 25vw;">
@@ -304,9 +312,9 @@
<!-- 寮哄埗鍑虹墖 -->
<el-dialog v-model="dialogFormVisibled" top="21vh" width="40%" :title="$t('hellow.forcedfilming')">
<div style="margin-left: 20px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="100px">
+ <el-form label-width="100px">
<el-form label-width="210px" label-position="right">
- <el-form-item :label="$t('hellow.pairQuantity')" :required="true" style="width: 25vw">
+ <el-form-item :label="$t('hellow.ptotalpairQuantity')" :required="true" style="width: 25vw">
<el-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantitya" autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('hellow.route')" :required="true" style="width: 25vw;">
@@ -356,7 +364,7 @@
<el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
<div style="margin-top: -20px;text-align: center;margin-left: 400px;">
<el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
- {{ currentRow.projectNumber }}
+ {{ currentRow.flowCardId }}
</el-form-item>
</div>
<el-table ref="table" style="margin-top: 20px;height: 400px;"
@@ -426,7 +434,6 @@
clearable
:placeholder="$t('basicData.plselectproject')"
style="width: 260px"
- @input="handleInputChange"
>
<el-option
v-for="item in titleSelectJson.processType"
@@ -467,8 +474,8 @@
<el-table-column prop="rightRemove" align="center" :label="$t('hellow.rightRemovep')"> </el-table-column>
<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('productStock.exit') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('productStock.delete') }}</el-button>
+ <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('productStock.exit') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('productStock.delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -479,7 +486,7 @@
</template>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindb" top="5vh" width="71%">
+ <el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
@@ -509,7 +516,7 @@
const tableDatax = ref([])
const cell = ref('')
const cella = ref('')
-const selectedProjectNo = ref('');
+const selectedProjectNo = ref('')
const totalPairQuantity = ref('')
const totalPairQuantitya = ref('')
const bottomRemove = ref('')
@@ -520,6 +527,9 @@
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
+const pairTotal = ref()
+const productName = ref('')
+const customerName = ref('')
const flowCardId = ref('')
const freetwo = ref('#911005');
const dialogFormVisiblea = ref(false)
@@ -553,7 +563,7 @@
}
]
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassTwo`;
const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1);
watch(() => currentPage.value, (newVal) => {
window.localStorage.setItem('currentPage', newVal);
@@ -561,21 +571,19 @@
const currentPageKey = computed(() => `93${currentPage.value - 1}`);
const handlePageChange1 = (newPage) => {
currentPage.value = newPage;
- console.log(currentPage.value);
};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
- fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
+ fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
try {
- tableDataa.value = data[931][0];
+ tableDataa.value = data.queueInfo[0];
const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
- if (data.freeTwoRequestEntity != null) {
- freetwo.value = data.freeTwoRequestEntity[0] == true ? 'green' : '#911005';
+ if (data.freeRequest != null) {
+ freetwo.value = data.freeRequest[0] == true ? 'green' : '#911005';
}
// if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
// tableDataa.value = currentPageData[0];
@@ -583,7 +591,6 @@
// console.warn('No data for the current page key:', currentPageKeyValue);
// }
} catch (error) {
- console.error('Error parsing WebSocket message:', error);
}
};
onMounted(() => {
@@ -666,20 +673,20 @@
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
currentPage2.value = 1;
- const { projectNumber, layer } = row;
- currentRow.projectNumber = row.projectNumber;
+ const { flowCardId } = row;
+ currentRow.flowCardId = row.flowCardId;
dialogFormVisibleb.value = true;
- fetchFlowBind(projectNumber, layer,currentPage2.value);
+ fetchFlowBind(flowCardId,currentPage2.value);
};
// 棰嗗彇浠诲姟
const handletake = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisiblec.value = true;
fetchmulan()
};
// 寮哄埗鍑虹墖
const handleout = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisibled.value = true;
fetchmulan()
};
@@ -687,21 +694,32 @@
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;
+ pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- 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',{
@@ -711,13 +729,11 @@
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
+ pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟
@@ -730,10 +746,8 @@
tableDatax.value = response.data;
titleformulaName.value = response.data.map(item => ({ formulaId: item.id, formulaName: item.formulaName }));
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const handleFormulaChange = (value) => {
@@ -747,6 +761,30 @@
};
// 涓┖閰嶆柟娣诲姞
const handleConfirm = async () => {
+ if (!formulaName.value) {
+ ElMessage.error(t('hellow.formulaNamea'))
+ return
+ }
+ if (!filmRemove.value) {
+ ElMessage.error(t('Mounting.removalmethod'))
+ return
+ }
+ if (!bottomRemove.value) {
+ ElMessage.error(t('hellow.bottomRemovea'))
+ return
+ }
+ if (!topRemove.value) {
+ ElMessage.error(t('hellow.topRemovea'))
+ return
+ }
+ if (!leftRemove.value) {
+ ElMessage.error(t('hellow.leftRemovea'))
+ return
+ }
+ if (!rightRemove.value) {
+ ElMessage.error(t('hellow.rightRemovea'))
+ return
+ }
try {
const response = await request.post('/hollowGlass/hollowFormulaDetails/saveFormulaDetails',{
formulaName: formulaName.value,
@@ -768,10 +806,8 @@
topRemove.value = '';
fetchmulan()
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const removalMethodMapa = {
@@ -780,6 +816,30 @@
};
// 涓┖閰嶆柟淇敼
const handledit = async () => {
+ if (!formulaName.value) {
+ ElMessage.error(t('hellow.formulaNamea'))
+ return
+ }
+ if (!filmRemove.value) {
+ ElMessage.error(t('Mounting.removalmethod'))
+ return
+ }
+ if (!bottomRemove.value) {
+ ElMessage.error(t('hellow.bottomRemovea'))
+ return
+ }
+ if (!topRemove.value) {
+ ElMessage.error(t('hellow.topRemovea'))
+ return
+ }
+ if (!leftRemove.value) {
+ ElMessage.error(t('hellow.leftRemovea'))
+ return
+ }
+ if (!rightRemove.value) {
+ ElMessage.error(t('hellow.rightRemovea'))
+ return
+ }
try {
const response = await request.post('/hollowGlass/hollowFormulaDetails/updateFormulaDetails',{
formulaName: formulaName.value,
@@ -794,10 +854,8 @@
adda.value = false
fetchmulan()
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟鍒犻櫎
@@ -819,11 +877,9 @@
ElMessage.success(response.message);
fetchmulan()
} else {
- ElMessage.error(response.msg);
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 宸ョ▼鍙�
@@ -838,14 +894,16 @@
}));
titleSelectJson.value.processType = processTypes;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 棰勮
const handleup = async () => {
+ if (!selectedProjectNo.value) {
+ ElMessage.error(t('basicData.plselectproject'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/appointHollowTaskDetails?cell="+ 931 + "&flowCardId=" + selectedProjectNo.value;
window.localStorage.setItem('flowCardId', selectedProjectNo.value)
@@ -857,30 +915,32 @@
selectedProjectNo.value = ''
closeWebSocket(socket);
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const parseData = (rawData) => {
- return Object.keys(rawData).map(projectNumber => ({
- projectNumber,
- records: rawData[projectNumber]
- }));
+ return Object.entries(rawData).map(([compositeKey, records]) => {
+ const [projectNumber, productName] = compositeKey.split(':');
+ return {
+ projectNumber,
+ productname: productName,
+ records: records.map(record => ({
+ ...record,
+ }))
+ };
+ });
};
-const fetchFlowBind = async (flowCardId, layer, page) => {
+const fetchFlowBind = async (flowCardId, page) => {
try {
- var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
+ var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + 1;
const response = await request.post(url)
if (response.code == 200) {
tableDatac.value = response.data[page];
ElMessage.success(response.message);
} else {
- ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮�濮嬩换鍔�
@@ -894,7 +954,6 @@
ElMessage.success(response.message);
blinda.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -903,7 +962,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 鏆傚仠浠诲姟
@@ -917,7 +975,6 @@
ElMessage.success(response.message);
blindc.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -926,7 +983,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 鍒犻櫎浠诲姟
@@ -940,7 +996,6 @@
ElMessage.success(response.message);
blindd.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -949,13 +1004,20 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 棰嗗彇浠诲姟
const finisha = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
let id = window.localStorage.getItem('id')
+ if (!totalPairQuantity.value) {
+ ElMessage.error(t('hellow.cpairQuantity'))
+ return
+ }
+ if (!selectedFormulaName.value) {
+ ElMessage.error(t('hellow.phollowformula'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/receiveTask?cell="+ 931 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantity.value+ "&formulaId=" + id;
const response = await request.post(url)
@@ -966,16 +1028,22 @@
formulaName.value = '';
totalPairQuantity.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮哄埗鍑虹墖
const finishb = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
let id = window.localStorage.getItem('id')
+ if (!totalPairQuantity.value) {
+ ElMessage.error(t('hellow.cpairQuantity'))
+ return
+ }
+ if (!selectedFormulaName.value) {
+ ElMessage.error(t('hellow.phollowformula'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+ 931 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantitya.value+ "&formulaId=" + id;
const response = await request.post(url)
@@ -985,24 +1053,21 @@
cella.value = '';
totalPairQuantitya.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
<style scoped>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
-#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
+#dt { display:block; float:left;line-height: 20px;margin-left: 10px;}
+#dta { display:block; float:left;line-height: 20px;margin-left: 70%;}
#dialog-footer {
text-align: center;
- margin-top: -15px;
+ margin-top: -5px;
}
#dotClass {
display: flex;
@@ -1011,4 +1076,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