From 55aa572d4750c29b1bb6b21dae800a2dbe71a9d4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 13 十二月 2024 14:26:04 +0800
Subject: [PATCH] 删除废弃代码
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 99 ++++++++++++++++---------------------------------
1 files changed, 33 insertions(+), 66 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index bc70c0a..0b01439 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -6,7 +6,6 @@
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {useI18n} from 'vue-i18n'
import {useRouter} from 'vue-router'
-
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const dialogFormVisible = ref(false)
@@ -52,7 +51,6 @@
ElMessage.warning(response.message)
}
} catch (error) {
- // console.error('Error fetching rects :', error);
}
});
const selectReportData = async () => {
@@ -74,9 +72,7 @@
type: 9,
workingProcedure: '閽㈠寲',
...(engineerId.value !== '' && { engineerId: engineerId.value }),
- };
- console.log(engineerId.value);
-
+ };
const response = await request.post("/loadGlass/damage/selectDamagePrintDetails", postData)
if (response.code === 200) {
dialogVisible.value = true;
@@ -91,15 +87,11 @@
}
};
const printTable = () => {
- // 杩欓噷鍙互娣诲姞涓�浜汣SS鏍峰紡鏉ヤ紭鍖栨墦鍗版晥鏋�
- // 渚嬪锛屽彲浠ユ坊鍔犱竴涓殣钘忕殑鎵撳嵃鏍峰紡琛�
window.print();
};
// 鏂规硶瀹氫箟
function handlePageChange(page: number) {
currentPage.value = page;
- console.log(page);
-
}
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
const handleMessage = (data) => {
@@ -400,7 +392,7 @@
if (newRect) {
return { ...oldRect, ...newRect, isActive: oldRect.isActive };
}
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
+ return oldRect;
}).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
}
// if (data.outGlass && data.outGlass.length > 0) {
@@ -708,12 +700,10 @@
blind1.value = false;
updateRectColors1();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -730,12 +720,10 @@
blind2.value = false;
updateRectColors2();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -753,12 +741,10 @@
blinda.value = false;
updateRectColorsa();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -776,12 +762,10 @@
blinda.value = false;
updateoutColorsa();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -799,12 +783,10 @@
blinda.value = false;
updateonColorsa();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -822,16 +804,14 @@
blind1.value = false;
updateoutColorsc();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
-// 杩涚倝zhong浜哄伐鎷胯蛋
+// 杩涚倝涓汉宸ユ嬁璧�
const takeoutd = async () => {
try {
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
@@ -845,12 +825,10 @@
blind2.value = false;
updateoutColorsd();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -868,13 +846,10 @@
blindb.value = false;
updateRectColorsb();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
- // console.error(error);
}
}
// 宸插嚭鐐変汉宸ユ嬁璧�
@@ -891,13 +866,10 @@
blindb.value = false;
updateoutColorsb();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
- // console.error(error);
}
}
// 宸插嚭鐐夋斁鍥�
@@ -914,13 +886,10 @@
blindb.value = false;
updateonColorsb();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
- // console.error(error);
}
}
onBeforeUnmount(() => {
@@ -1083,9 +1052,8 @@
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('processCard.inquire') }}</el-button>
<el-button type="info" style="margin-left: 10px;" @click="printing()">{{ $t('processCard.printing') }}</el-button>
</div>
-
- <el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
height="600"
ref="table"
@@ -1166,8 +1134,7 @@
<el-table-column prop="layer" :label="$t('processCard.layer')" align="center" width="52"/>
<el-table-column prop="engineerId" :label="$t('processCard.project')" align="center" width="110"/>
<el-table-column prop="temperingLayoutId" :label="$t('processCard.temperinglayout')" align="center" width="52"/>
- <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center"
- width="52"/>
+ <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center" width="52"/>
<el-table-column prop="width" :label="$t('processCard.width')" align="center" width="80"/>
<el-table-column prop="height" :label="$t('processCard.height')" align="center" width="80"/>
<el-table-column prop="thickness" :label="$t('processCard.thickness')" align="center" width="52"/>
@@ -1192,42 +1159,42 @@
/* display:flex; */
text-align: center;
display: inline-block;
- align-items:center;
- justify-content:center;
+ align-items:center;
+ justify-content:center;
margin-left: 20px;
}
#box{
border: 1px solid black;
background-color: #337ecc;
display:flex;
- align-items:center;
- justify-content:center;
+ align-items:center;
+ justify-content:center;
}
#home-card {
- width: 100%;
- overflow: hidden;
- padding: 10px 0px;
+ width: 100%;
+ overflow: hidden;
+ padding: 10px 0px;
+ display: flex;
+ flex-wrap: wrap;
+ #home-item {
+ border-style: solid;
+ border-width: 1px;
+ border-color: #E4E4E4;
+ width: calc(34% - 20px);
+ padding: 20px 0px 20px 20px;
+ margin-right: 10px;
+ margin-bottom: 10px;
display: flex;
- flex-wrap: wrap;
- #home-item {
- border-style: solid;
- border-width: 1px;
- border-color: #E4E4E4;
- width: calc(34% - 20px);
- padding: 20px 0px 20px 20px;
- margin-right: 10px;
- margin-bottom: 10px;
- display: flex;
- justify-content: center;
- /* align-items: center; */
- background: #fff;
- #home-img {
- display: inline-block;
- width: 160px;
- height: 60px;
- margin: 0;
- padding: 0;
- }
+ justify-content: center;
+ /* align-items: center; */
+ background: #fff;
+ #home-img {
+ display: inline-block;
+ width: 160px;
+ height: 60px;
+ margin: 0;
+ padding: 0;
+ }
#home-right {
display: flex;
flex-direction: column;
--
Gitblit v1.8.0