From cf9e6eb7bfe620184ada5594dabb2734b34bb7cb Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 12 五月 2025 10:53:01 +0800
Subject: [PATCH] 添加 比对数据,不同变红警告
---
UI-Project/src/views/hollow/hollowslicecage.vue | 62 ++++++++++++-------------------
1 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index aec4351..8f4b1fb 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -62,9 +62,8 @@
const temperingengineerId=ref('');
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
- fetchxiang(currentPage2.value);
+ fetchxiang();
};
const handleBindRack = (row) => {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
@@ -87,13 +86,12 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鏄惁绂佺敤
const toggleEnableState = async (row) => {
const newState = row.enableState === 1 ? 0 : 1;
- var url="/cacheVerticalGlass/bigStorageCage/updateStorageCageDisabled?slot="+row.slot + "&enableState=" + newState;
+ var url="/hollowGlass/hollowBigStorageCageDetails/updateHollowStorageCageDisabled?slot="+row.slot + "&enableState=" + newState;
const response = await request.get(url)
if (response.code === 200) {
ElMessage.success(response.message);
@@ -123,7 +121,7 @@
var url = `/hollowGlass/hollowBigStorageCageDetails/deleteHollowBigStorageCageDetails?${params.toString()}`;
const response = await request.post(url)
if (response.code === 200) {
- fetchxiang(1);
+ fetchxiang();
// tableDataa.value = response.data;
ElMessage.success(response.message);
} else {
@@ -131,7 +129,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鐮存崯
@@ -155,14 +152,13 @@
var url = `/hollowGlass/hollowBigStorageCageDetails/damageHollowBigStorageCageDetails?${params.toString()}`;
const response = await request.post(url)
if (response.code === 200) {
- fetchxiang(1);
+ fetchxiang();
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鎷胯蛋
@@ -186,14 +182,13 @@
var url = `/hollowGlass/hollowBigStorageCageDetails/damageHollowBigStorageCageDetails?${params.toString()}`;
const response = await request.post(url)
if (response.code === 200) {
- fetchxiang(1);
+ fetchxiang();
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 纭娣诲姞
@@ -228,22 +223,21 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
const handlexiang = () => {
dialogFormVisiblea.value = true;
- fetchxiang(1);
+ fetchxiang();
currentPage2.value = 1;
window.localStorage.setItem('pagenumber', currentPage2.value)
filmsId.value = ''
flowCardId.value = ''
};
// 鐞嗙墖绗间俊鎭�
-const fetchxiang = async (page) => {
+const fetchxiang = async () => {
try {
const response = await request.post('/hollowGlass/hollowBigStorageCage/queryHollowBigStorageCageDetail',{
- deviceId: page,
+ // deviceId: page,
filmsId: filmsId.value,
flowCardId: flowCardId.value,
})
@@ -298,8 +292,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 璋冨害寮�鍏�
@@ -318,7 +311,6 @@
}
}
catch (error) {
- console.error(error);
}
}
let socket = null;
@@ -360,7 +352,6 @@
}
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
- console.log(data.bigStorageCageDetailsOutTask[0])
adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
} else {
tableDatac.value = [],
@@ -383,12 +374,9 @@
}
if(data.temperingGlassInfoList!=null){
tableDatab.value = data.temperingGlassInfoList[0]
- console.log(tableDatab.value)
}else{
tableDatab.value = []
}
- console.log(data.bigStorageCageUsage);
-
if(data.bigStorageCageUsage!=null){
tableDatae.value = data.bigStorageCageUsage[0]
}else{
@@ -689,10 +677,9 @@
<i :style="{ marginTop: '2px', backgroundColor: freethree, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
</div>
<div class="table-container">
- <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="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;">
- <el-table height="300px" ref="table"
- @selection-change="handleSelectionChange"
+ <el-table height="300px" ref="table"
:row-class-name="tableRowClassName"
:data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
@@ -713,7 +700,7 @@
</el-table>
</div>
</el-card>
- <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;">
<el-table height="300px" ref="table"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
@@ -889,7 +876,7 @@
<el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="150"/>
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
+ <el-button type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -907,7 +894,6 @@
:data="tableDataa"
@row-click="handleRowClick"
height="700"
- @expand-change="handleExpandChange"
row-key="id"
default-expand-all
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
@@ -918,7 +904,7 @@
<el-table
:data="props.row.hollowBigStorageCageDetails"
border
- style="width: 100%;margin-left: 20px;"
+ style="width: 98%;margin-left: 20px;"
row-key="id"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
@@ -947,9 +933,9 @@
<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 size="mini" type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</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>
@@ -968,7 +954,7 @@
<template #default="scope">
<el-tag
:type="scope.row.enableState === 1 ? 'success' : 'danger'"
- @click="toggleEnableState(scope.row)"
+ @click="toggleEnableState(scope.row)"
>
{{ scope.row.enableState === 1 ? $t('searchOrder.enable') : $t('searchOrder.disable')}}
</el-tag>
@@ -978,12 +964,12 @@
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
</template>
</el-table-column>
</el-table>
<div>
- <div style="margin-top: 20px;margin-left: 40%;">
+ <!-- <div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
background
size="large"
@@ -992,11 +978,11 @@
:current-page.sync="currentPage2"
@current-change="handlePageChange2"
/>
- </div>
+ </div> -->
</div>
</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"
--
Gitblit v1.8.0