From 7d8cd9d28e97ea54ab4c76dbe37fd910f6d279c5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 05 十一月 2025 08:51:41 +0800
Subject: [PATCH] 1、钢化大理片，中空大理片的理片笼详情查询代码补充
---
UI-Project/src/views/hollow/hollowslicecage.vue | 306 ++++++++++++++++++++++++++-------------------------
1 files changed, 156 insertions(+), 150 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index f7eb58b..7578b56 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -29,6 +29,7 @@
const carPosition = ref([])
const tableDatass = ref([])
const tableDataLack = ref([])
+const tableDataMiss = ref([])
// 鍝嶅簲寮忕姸鎬�
const showAlert = ref(false)
const alertMessage = ref('')
@@ -37,7 +38,7 @@
const currentAlarm = ref<any>(null)
const tableDataAlert = ref([])
const alertText = ref('')
-
+const engineerId = ref('')
const ganghua = ref('')
const diaodu = ref('')
const hollowPriority = ref('')
@@ -45,6 +46,7 @@
const glassType = ref('')
const layer = ref('')
const filmsId = ref('')
+const thickness = ref('')
const adjust = ref([]);
const adjusta = ref([]);
const adjustedRects = ref([]);
@@ -83,14 +85,29 @@
window.localStorage.setItem('slot', row.slot)
add.value = true;
};
-// 缂虹墖璇︽儏
-// const handleMissingFilms = (row) => {
-// currentPage2.value = 1;
-// const { flowCardId } = row;
-// currentLack.flowCardId = row.flowCardId;
-// dialogFormVisibleb.value = true;
-// fetchFlowBind(flowCardId, currentPage2.value);
-// };
+// 澶氭潯鐮存崯鏁版嵁
+const handleMissingFilms = (row) => {
+ dialogFormVisibleb.value = true;
+ handleAllMissing(row)
+};
+const handleAllMissing = async (row) => {
+ try {
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryLackGlassByFlowCard', {
+ flowCardId: row.flowCardId,
+ layer: row.layer,
+ orderSort: row.glassType,
+ // glassId: row.glassId
+ });
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableDataMiss.value = response.data
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ }
+}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
fetchFlowBind(currentLack.flowCardId, currentPage2.value);
@@ -204,6 +221,39 @@
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.broke'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/hollowBigStorageGlassDamage', {
+ flowCardId: row.flowCardId,
+ glassType: row.glassType,
+ glassId: row.glassId,
+ layer: row.layer,
+ state: 8,
+ line: 1,
+ workingProcedure: '涓┖',
+ remark: '涓┖'
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ const { flowCardId } = row;
+ fetchFlowBind(flowCardId, currentPage2.value);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
+// 缂虹墖璇︽儏-涓�閿牬鎹�
+const handleAllBroke = async (row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('order.dilapidationWhether'),
t('workOrder.prompt'),
{
confirmButtonText: t('workOrder.yes'),
@@ -365,10 +415,13 @@
// 鐞嗙墖绗间俊鎭�
const fetchxiang = async () => {
try {
- const response = await request.post('/hollowGlass/hollowBigStorageCage/queryHollowBigStorageCageDetail',{
+ const response = await request.post('/hollowGlass/hollowBigStorageCageDetails/queryVerticalSheetCageDetailsList',{
// deviceId: page,
+ engineerId: engineerId.value,
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ glassId: glassId.value,
+ thickness: -1,
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -382,10 +435,13 @@
const fetchxianga = async () => {
let page = window.localStorage.getItem('pagenumber')
try {
- const response = await request.post('/hollowGlass/hollowBigStorageCage/queryHollowBigStorageCageDetail',{
+ const response = await request.post('/hollowGlass/hollowBigStorageCageDetails/queryVerticalSheetCageDetailsList',{
deviceId: page,
+ engineerId: engineerId.value,
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ glassId: glassId.value,
+ thickness: thickness.value ? thickness.value : -1,
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -402,28 +458,28 @@
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
}
// 浠诲姟閲嶇疆
-const handleptask = async() => {
- try {
- const confirmResult = await ElMessageBox.confirm(
- t('searchOrder.partasks'),
- t('workOrder.prompt'),
- {
- confirmButtonText: t('workOrder.yes'),
- cancelButtonText: t('workOrder.cancel'),
- type: 'warning',
- }
- );
- if (confirmResult === 'confirm') {
- const response = await request.post('/hollowGlass/hollowBigStorageCage/resetCage')
- if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.msg);
- }
- }
- } catch (error) {
- }
-};
+// const handleptask = async() => {
+// try {
+// const confirmResult = await ElMessageBox.confirm(
+// t('searchOrder.partasks'),
+// t('workOrder.prompt'),
+// {
+// confirmButtonText: t('workOrder.yes'),
+// cancelButtonText: t('workOrder.cancel'),
+// type: 'warning',
+// }
+// );
+// if (confirmResult === 'confirm') {
+// const response = await request.post('/hollowGlass/hollowBigStorageCage/resetCage')
+// if (response.code === 200) {
+// ElMessage.success(response.message);
+// } else {
+// ElMessage.error(response.msg);
+// }
+// }
+// } catch (error) {
+// }
+// };
// 璋冨害寮�鍏�
const handlediaodu = async () => {
try {
@@ -464,18 +520,27 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
// 鎶ヨ淇℃伅
- if (data.alarmInfo[0] !=null && data.alarmInfo[0].length > 0) {
- const alert = data.alarmInfo[0]
- const { id,alarmMessage, ...rest } = alert[0];
- alertMessage.value = `${alarmMessage}`;
- alertMessage.value = `${alert[0].alarmMessage}`;
- // 鍔ㄦ�佺炕璇戦�昏緫锛氭牴鎹產larmCode閫夋嫨缈昏瘧閿�
- alertText.value = alert[0].alarmCode === 'sizeSame'
- ? t('hellow.sizeSame')
- : t('hellow.idSame');
+if (data.alarmInfo[0] != null && data.alarmInfo[0].length > 0) {
+ const alert = data.alarmInfo[0];
+ const { id, alarmMessage, ...rest } = alert[0];
+ alertMessage.value = `${alarmMessage}`;
+ alertMessage.value = `${alert[0].alarmMessage}`;
+ if (alert[0].alarmCode === 'sizeSame') {
+ alertText.value = t('hellow.sizeSame');
+ } else if (alert[0].alarmCode === 'idSame') {
+ alertText.value = t('hellow.idSame');
+ } else if (alert[0].alarmCode === 'slotLess') {
+ alertText.value = t('hellow.slotLess');
+ } else if (alert[0].alarmCode === 'overSize') {
+ alertText.value = t('hellow.overSize');
+ } else if (alert[0].alarmCode === 'noGlass') {
+ alertText.value = t('hellow.noGlass');
+ } else {
+ alertText.value = t('hellow.unknownAlert');
+ }
alarmData.value = data; // 瀛樺偍瀹屾暣鏁版嵁鐢ㄤ簬寮圭獥
showAlert.value = true;
- }
+}
const formattedData = data.alarmInfo[0].map(record => ({
...record,
formattedCreateTime: formatTimestamp(record.createTime),
@@ -607,7 +672,10 @@
const getAlertText = (alarmCode) => {
const codeMap = {
sizeSame: 'hellow.sizeSame',
- idSame: 'hellow.idSame'
+ idSame: 'hellow.idSame',
+ slotLess: 'hellow.slotLess',
+ overSize: 'hellow.overSize',
+ noGlass: 'hellow.noGlass'
};
return alarmCode in codeMap
? t(codeMap[alarmCode])
@@ -806,22 +874,6 @@
const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
-function getStatusType(enableState: number) {
- switch (enableState) {
- case 100:
- return 'success';
- case 102:
- return 'warning';
- }
-}
-function getStatusText(enableState: number) {
- switch (enableState) {
- case 100:
- return t('searchOrder.zailong');
- case 102:
- return t('searchOrder.rengongxp');
- }
-}
function getcasOnea(isSame) {
switch (isSame) {
case 1:
@@ -895,7 +947,7 @@
<div style="display: flex;">
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="handlexiang">{{ $t('searchOrder.cageinformation') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
+ <!-- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> -->
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
<div style="display: flex;">
<div style="margin-left: 15px;margin-top: 5px;font-size: 14px;top: 5vh;margin-top: 12px;">{{ $t('searchOrder.hollowPriority') }}锛�</div>
@@ -1015,18 +1067,20 @@
max-height="calc(500px - 35px)"
style="width: 100%;"
>
- <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
- <el-table-column prop="layer" align="center" :label="$t('reportmanage.layer')" min-width="40" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="139" />
+ <el-table-column prop="layer" align="center" :label="$t('reportmanage.layer')" min-width="38" />
<el-table-column prop="glassType" align="center" :label="$t('large.serialnumber')" min-width="80" />
- <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="70" />
- <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="70" />
- <el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80" />
- <el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="52" />
+ <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="62"/>
+ <!-- <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="62" show-overflow-tooltip/> -->
+ <el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="55" />
+ <el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="55" />
<el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80" />
<el-table-column prop="damageCount" align="center" :label="$t('large.brokenNum')"/>
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
+ <!-- <el-table-column prop="patchCount" align="center" :label="$t('large.patchCount')"/> -->
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" min-width="82">
<template #default="scope">
- <el-button type="text" plain @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}</el-button>
+ <el-button type="text" plain @click="handleMissingFilms(scope.row)">{{ $t('hellow.missingfilms') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1149,66 +1203,19 @@
<!-- 鐞嗙墖绗间俊鎭� -->
<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
<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="engineerId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('processCard.projectnumber')"/>
+ <el-input v-model="glassId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inglassID')"/>
+ <el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
+ <el-input v-model="filmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="thickness" clearable 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="fetchxianga">
{{$t('reportmanage.inquire')}}</el-button>
</div>
- <el-table
- :data="tableDataa"
- @row-click="handleRowClick"
- height="700"
- row-key="id"
- default-expand-all
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- >
- <el-table-column type="expand">
- <template #default="props">
- <div v-if="props.row.hollowBigStorageCageDetails && props.row.hollowBigStorageCageDetails.length">
- <el-table
- :data="props.row.hollowBigStorageCageDetails"
- border
- style="width: 98%;margin-left: 20px;"
- row-key="id"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- >
- <!-- <el-table-column prop="menuName" label="浜岀骇鑿滃崟鏍�" align="center" min-width="140" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"/> -->
- <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="130"/>
- <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
- <el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
- <!-- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="80" /> -->
- <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
- <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
- <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
- <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
- <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
- <el-table-column
- align="center"
- :label="$t('searchOrder.startstatus')"
- min-width="80"
- prop="state"
- >
- <template #default="scope">
- <el-tag :type="getStatusType(scope.row.state)">
- {{ getStatusText(scope.row.state) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="80" />
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" min-width="220">
- <template #default="scope">
- <el-button type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
- <el-button type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="100"/>
+ <el-table ref="table" style="margin-top: 20px;height: 700px;width: 1770px;" :data="tableDataa" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="150" />
- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
+ <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="100" />
+ <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+ <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="120" />
<el-table-column
align="center"
:label="$t('searchOrder.startstatus')"
@@ -1225,45 +1232,44 @@
</template>
</el-table-column>
<el-table-column prop="remainWidth" align="center" :label="$t('searchOrder.remainingwidth')" min-width="120" />
-
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
- <template #default="scope">
- <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
- </template>
- </el-table-column>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="130"/>
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
+ <el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
+ <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
+ <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
+ <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="80" />
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="240">
+ <template #default="scope">
+ <!-- <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button> -->
+ <el-button type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div>
</div>
</el-dialog>
- <!-- 缂虹墖璇︽儏 -->
- <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">
- {{ currentLack.flowCardId }}
- </el-form-item>
- </div>
- <el-table ref="table" style="margin-top: 20px;height: 400px;" :data="tableDataLack"
+ <!-- 澶氭潯鐮存崯鏁版嵁 -->
+ <el-dialog v-model="dialogFormVisibleb" top="15vh" width="70%" height="500">
+ <el-button plain @click="handleAllBroke">{{ $t('order.dilapidationAll') }}</el-button>
+ <el-table ref="table" style="margin-top: 20px;height: 400px;" :data="tableDataMiss"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="glassType" align="center" :label="$t('large.serialnumber')" min-width="80" />
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" 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="workingProcedure" align="center" :label="$t('searchOrder.process')" min-width="80" />
<el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80" />
<el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" />
- <el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80" />
- <el-table-column prop="damageCount" align="center" :label="$t('large.brokenNum')"/>
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
<template #default="scope">
<el-button type="text" plain @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}</el-button>
</template>
- </el-table-column>
- <div style="float: right;margin-bottom: 5px;">
- <el-pagination layout="prev, pager, next" :total="50" />
- </div>
+ </el-table-column>
</el-table>
- <div style="display: flex;margin-left: 40%;margin-top: 10px;">
- <el-pagination background size="large" layout="prev, pager, next" :total="30" :current-page.sync="currentPage2"
- @current-change="handlePageChange2" />
- </div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
--
Gitblit v1.8.0