From e553bf03da95027fc26ac06384e17ef43dd3ccf4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 26 三月 2025 11:33:56 +0800
Subject: [PATCH] 上片模块整体接口更改。控制台报错及警告
---
UI-Project/src/views/User/rolelist.vue | 17
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 31 -
UI-Project/src/views/Caching/cachingbefore.vue | 6
UI-Project/src/views/StockBasicData/stockBasicyiwu.vue | 8
UI-Project/src/views/hollow/hellowslicecagehistory.vue | 12
UI-Project/src/views/Permissions/permissionslist.vue | 17
UI-Project/src/views/hollow/hollowequipment.vue | 30 -
UI-Project/src/views/Caching/cachingun.vue | 6
UI-Project/src/views/hollow/hollowequipmenthree.vue | 33 -
UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue | 1
UI-Project/src/views/hollow/hollowslicecage.vue | 36 -
UI-Project/src/utils/request.js | 1
UI-Project/src/views/Returns/upreturns2.vue | 25
UI-Project/src/views/Returns/upreturnhistory.vue | 25 -
UI-Project/src/views/User/permissions.vue | 21
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 32 -
UI-Project/src/views/User/userlist.vue | 14
UI-Project/src/views/StockBasicData/stockhistory.vue | 3
UI-Project/src/views/largescreendisplay/statistics.vue | 13
UI-Project/src/views/largescreen/largescreen.vue | 6
UI-Project/src/views/GlassStorage/rawhistory.vue | 18
UI-Project/src/views/RegisterView.vue | 1
UI-Project/src/views/StockBasicData/stockBasicData.vue | 6
UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue | 7
UI-Project/src/lang/en.js | 1
UI-Project/src/lang/py.js | 1
UI-Project/src/lang/zh.js | 1
UI-Project/src/views/ReportWork/reportWork.vue | 5
UI-Project/src/utils/unloadrequest.js | 1
UI-Project/src/views/Visualization/screentwo.vue | 1
UI-Project/src/views/Returns/upreturns.vue | 629 +++++++++++++++---------------
UI-Project/src/views/Slicecage/slicecage.vue | 36
UI-Project/src/views/hollow/hellowquipthreehistory.vue | 17
UI-Project/src/views/Caching/cachingbeforehistory.vue | 6
UI-Project/src/views/GlassStorage/MaterialRackManagement.vue | 24
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 2
UI-Project/src/views/mm/purchaseOrder/Select.vue | 16
UI-Project/src/views/largescreendisplay/screendisplay.vue | 1
UI-Project/src/views/Visualization/screenone.vue | 1
UI-Project/src/views/Returns/upreturnhistory2.vue | 25 -
UI-Project/src/views/hollow/hellowquiptwohistory.vue | 17
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 2
UI-Project/src/views/hollow/hellowquiphistory.vue | 17
UI-Project/src/views/NewPage.vue | 7
UI-Project/src/views/hollow/hollowaluminum.vue | 7
45 files changed, 474 insertions(+), 712 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index e20c572..c18fc20 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -35,7 +35,6 @@
},
basicData:{
untask:'鏃犱换鍔�',
- up:'涓婄墖',
tonumber:'涓婄墖鎬绘暟閲�',
finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 436fec6..a49aa38 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -35,7 +35,6 @@
},
basicData: {
untask:'鏃犱换鍔�',
- up:'涓婄墖',
tonumber:'涓婄墖鎬绘暟閲�',
finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 4422c2a..6c28d39 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -35,7 +35,6 @@
},
basicData:{
untask:'鏃犱换鍔�',
- up:'涓婄墖',
tonumber:'涓婄墖鎬绘暟閲�',
finishnumber:'宸插畬鎴愭暟閲�',
rackreset:'鏋跺瓙澶嶄綅',
diff --git a/UI-Project/src/utils/request.js b/UI-Project/src/utils/request.js
index e1b84a4..7b5da6b 100644
--- a/UI-Project/src/utils/request.js
+++ b/UI-Project/src/utils/request.js
@@ -36,7 +36,6 @@
return res;
},
error => {
- console.log('err' + error) // for debug
return Promise.reject(error)
}
)
diff --git a/UI-Project/src/utils/unloadrequest.js b/UI-Project/src/utils/unloadrequest.js
index bdaeeb5..8ba8f0e 100644
--- a/UI-Project/src/utils/unloadrequest.js
+++ b/UI-Project/src/utils/unloadrequest.js
@@ -39,7 +39,6 @@
return res;
},
error => {
- console.log('err' + error) // for debug
return Promise.reject(error)
}
)
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index 4941c10..f30ba46 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -374,9 +374,9 @@
<el-table-column prop="thickness" align="center" min-width="80" />
<el-table-column fixed="right" align="center" width="150">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
- <el-button size="mini" type="text" plain @click="handledelete(scope.row)">{{ $t('searchOrder.delete')}} </el-button>
+ <el-button type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
+ <el-button type="text" plain @click="handledelete(scope.row)">{{ $t('searchOrder.delete')}} </el-button>
</template>
</el-table-column>
</el-table>
diff --git a/UI-Project/src/views/Caching/cachingbeforehistory.vue b/UI-Project/src/views/Caching/cachingbeforehistory.vue
index 0883628..31674bc 100644
--- a/UI-Project/src/views/Caching/cachingbeforehistory.vue
+++ b/UI-Project/src/views/Caching/cachingbeforehistory.vue
@@ -147,7 +147,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const Daily = async () => {
@@ -171,7 +170,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const handlePageChange2 = (newPage) => {
@@ -203,7 +201,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const Dailya = async (page) => {
@@ -228,7 +225,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const handleClick = async () => {
@@ -260,7 +256,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const Dailyhistorical = async () => {
@@ -285,7 +280,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index d32fb1b..6bb327e 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -351,9 +351,9 @@
<el-table-column prop="thickness" align="center" min-width="80" />
<el-table-column fixed="right" align="center" width="150">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
- <el-button size="mini" type="text" plain @click="handledelete(scope.row)">{{ $t('searchOrder.delete')}} </el-button>
+ <el-button type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
+ <el-button type="text" plain @click="handledelete(scope.row)">{{ $t('searchOrder.delete')}} </el-button>
</template>
</el-table-column>
</el-table>
diff --git a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
index 9edb226..41981a4 100644
--- a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
+++ b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
@@ -8,13 +8,13 @@
>
<!-- 宸︿晶鎸夐挳缁� -->
<div>
- <el-button type="success" size="mini" @click="storage()"
+ <el-button type="success" @click="storage()"
>鍘熺墖浠撳偍璇︽儏</el-button
>
- <el-button type="success" size="mini" @click="handleInbound()"
+ <el-button type="success" @click="handleInbound()"
>鍏ュ簱</el-button
>
- <el-button type="success" size="mini">鍚婅浣嶅叆搴�</el-button>
+ <el-button type="success" >鍚婅浣嶅叆搴�</el-button>
</div>
<!-- 鍙充晶閫夋嫨妗� -->
<el-form-item style="margin-top: 15px; width: 150px;margin-left: 10px;">
@@ -66,17 +66,16 @@
<template #default="{ row }">
<el-button
type="primary"
- size="mini"
@click="edithandleRowClick(row)"
>淇敼</el-button
>
- <el-button type="danger" size="mini" @click="handleDelete(row)"
+ <el-button type="danger" @click="handleDelete(row)"
>鍒犻櫎</el-button
>
- <el-button type="warning" size="mini" @click="handleCheckout(row)"
+ <el-button type="warning" @click="handleCheckout(row)"
>鍑哄簱</el-button
>
- <!-- <el-button type="success" size="mini" @click="addglass()">娣诲姞鍘熺墖</el-button> -->
+ <!-- <el-button type="success" @click="addglass()">娣诲姞鍘熺墖</el-button> -->
</template>
</el-table-column>
</el-table>
@@ -134,13 +133,13 @@
<!-- 鎿嶄綔鍒� -->
<el-table-column label="鎿嶄綔" width="350">
<template #default="{ row }">
- <el-button type="primary" size="mini" @click="handleRestart(row)"
+ <el-button type="primary" @click="handleRestart(row)"
>閲嶆柊寮�濮�</el-button
>
- <el-button type="danger" size="mini" @click="handleDeletetask(row)"
+ <el-button type="danger" @click="handleDeletetask(row)"
>鍒犻櫎浠诲姟</el-button
>
- <el-button type="success" size="mini" @click="handleComplete(row)"
+ <el-button type="success" @click="handleComplete(row)"
>浠诲姟瀹屾垚</el-button
>
</template>
@@ -420,7 +419,6 @@
}
});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�");
closeWebSocket();
});
const tasktableData = ref([]);
@@ -501,7 +499,6 @@
const handleConfirmInbound = () => {
inStorage(formData.value);
// 澶勭悊纭鍏ュ簱閫昏緫锛屽彲浠ュ湪杩欓噷鎻愪氦琛ㄥ崟鎴栬�呮墽琛屽叾浠栨搷浣�
- console.log("Confirm Inbound:", formData.value);
// 鍏抽棴瀵硅瘽妗�
dialogVisible.value = false;
};
@@ -530,7 +527,6 @@
formData.value[field] = "";
};
const submitForm = () => {
- console.log("鎻愪氦鏁版嵁:", formData.value);
dialogVisible3.value = false;
// Add your submit logic here
};
@@ -548,7 +544,6 @@
// 澶勭悊琛岀偣鍑讳簨浠�
const edithandleRowClick = (row) => {
currentRow.value = row;
- console.log(row);
editForm.value.pieces = row.pieces.toString();
editForm.value.batchId = row.batchId;
editForm.value.rawWidth = row.rawWidth;
@@ -556,7 +551,6 @@
editForm.value.rawThickness = row.rawThickness;
editForm.value.id = row.number;
editdialogVisible.value = true;
- console.log(editForm.value);
};
// 娣诲姞淇濆瓨缂栬緫鍐呭
const editsaveEdit = () => {
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 8bbe6bf..e2c196e 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -248,7 +248,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鍘熺墖鍏ュ簱
@@ -275,7 +274,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鍏ュ簱璇锋眰
@@ -293,8 +291,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍑哄簱璇锋眰
@@ -312,8 +308,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍑哄簱
@@ -339,7 +333,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鏌ヨ鏁版嵁
@@ -419,7 +412,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -458,7 +450,6 @@
// }
// }
// catch (error) {
-// console.error(error);
// }
// }
// 浠诲姟鎴愬姛澶勭悊
@@ -482,8 +473,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 浠诲姟澶辫触澶勭悊
@@ -507,8 +497,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
function getStatusType1(taskType) {
@@ -603,7 +592,7 @@
</el-select>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('film.inquire') }}</el-button>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="300" ref="table"
:data="tableDataa" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
@@ -636,8 +625,8 @@
<el-table-column prop="createTime" align="center" :label="$t('film.createtime')" />
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
- <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
+ <el-button :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
+ <el-button :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -705,9 +694,9 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('film.operate')" align="center" width="270">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
- <el-button :disabled="!scope.row.remainQuantity" size="mini" type="text" plain @click="deleteWarehousing(scope.row)">{{ $t('film.delete') }}</el-button>
- <el-button :disabled="!scope.row.remainQuantity || scope.row.remainQuantity === 0" size="mini" type="text" plain @click="openc(scope.row)">{{ $t('film.outbound') }}</el-button>
+ <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
+ <el-button :disabled="!scope.row.remainQuantity" type="text" plain @click="deleteWarehousing(scope.row)">{{ $t('film.delete') }}</el-button>
+ <el-button :disabled="!scope.row.remainQuantity || scope.row.remainQuantity === 0" type="text" plain @click="openc(scope.row)">{{ $t('film.outbound') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -725,7 +714,7 @@
</el-dialog>
<el-dialog v-model="dialogFormVisibleb" top="23vh" width="55%" :title="$t('film.addglass')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -837,7 +826,7 @@
</el-dialog>
<el-dialog v-model="Edit" top="23vh" width="55%" :title="$t('film.addglass')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
diff --git a/UI-Project/src/views/GlassStorage/rawhistory.vue b/UI-Project/src/views/GlassStorage/rawhistory.vue
index 386681f..bd7f9a9 100644
--- a/UI-Project/src/views/GlassStorage/rawhistory.vue
+++ b/UI-Project/src/views/GlassStorage/rawhistory.vue
@@ -54,8 +54,8 @@
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="50" />
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
- <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
+ <el-button :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
+ <el-button :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -121,7 +121,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const successfull = async(row) => {
@@ -144,8 +143,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 浠诲姟澶辫触澶勭悊
@@ -169,13 +167,11 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -196,8 +192,6 @@
stateList=[selectValuesa[1]];
}
}
- console.log(startSlot.value);
-
if(startSlot.value != ""){
pstartSlot = startSlot.value
}else{
@@ -232,7 +226,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鍘嗗彶鏌ヨ鐐瑰嚮
@@ -288,7 +281,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -308,8 +300,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
diff --git a/UI-Project/src/views/NewPage.vue b/UI-Project/src/views/NewPage.vue
index 94a1e03..96c235d 100644
--- a/UI-Project/src/views/NewPage.vue
+++ b/UI-Project/src/views/NewPage.vue
@@ -5,7 +5,7 @@
<el-input v-model="current" style="margin-left: 20px;margin-top: 15px;width: 240px" placeholder="璇疯緭鍏ュ伐绋嬪彿" @input="updateUrl"/>
<el-button style="margin-top: 15px;margin-left: 15px;" type="primary" @click="fetchData">鏌ヨ</el-button>
</div>
- <el-card style="flex: 1;margin-left: 400px;margin-top: 50px;margin-right: 10px;width: 1100px;" height="900" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 400px;margin-top: 50px;margin-right: 10px;width: 1100px;" height="900" >
<div v-for="(row, rowIndex) in divsData" :key="rowIndex" class="row">
<div v-for="(rect, colIndex) in row" :key="colIndex" class="div-container">
<div style="text-align: center;">鐐夊彿锛歿{ getAdjustedRectsForRow(rowIndex)[0].layout_id }} ---- 瑁呰浇鐜囷細{{ getAdjustedRectsForRow(rowIndex)[0].olLayoutRate }}</div>
@@ -77,12 +77,9 @@
const response = await request.post(`/cacheGlass/taskCache/temperingTerritory?current=${current.value}`);
if (response.code === 200) {
rawData.value = response.data;
- console.log(response.data);
-
processData(rawData.value);
}
-} catch (error) {
- console.error('Failed to fetch data:', error);
+} catch (error) {
} finally {
loading.value = false;
}
diff --git a/UI-Project/src/views/Permissions/permissionslist.vue b/UI-Project/src/views/Permissions/permissionslist.vue
index 42a0399..6acbe84 100644
--- a/UI-Project/src/views/Permissions/permissionslist.vue
+++ b/UI-Project/src/views/Permissions/permissionslist.vue
@@ -193,16 +193,15 @@
<template>
<div>
- <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" size="mini" id="searchButton" @click="add = true">娣诲姞鏉冮檺</el-button>
+ <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" id="searchButton" @click="add = true">娣诲姞鏉冮檺</el-button>
<el-input
clearable
placeholder="璇疯緭鍏ュ叧閿瓧"
- size="mini"
style="margin-right: 20px; width: 200px;margin-left: 10px;margin-top: 10px;"
/>
- <el-button type="primary" size="mini" @click="searchSubmit" style="margin-top: 10px;">鏌ヨ</el-button >
- <el-button type="primary" size="mini" @click="empty" style="margin-top: 10px;">娓呯┖</el-button>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
+ <el-button type="primary" @click="searchSubmit" style="margin-top: 10px;">鏌ヨ</el-button >
+ <el-button type="primary" @click="empty" style="margin-top: 10px;">娓呯┖</el-button>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 200px;">
<el-table height="100%" ref="table"
@selection-change="handleSelectionChange"
@@ -218,8 +217,8 @@
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
<template #default>
- <el-button size="mini" type="text" plain @click="adda = true">缂栬緫</el-button>
- <el-button size="mini" type="text" plain @click="delete">鍒犻櫎</el-button>
+ <el-button type="text" plain @click="adda = true">缂栬緫</el-button>
+ <el-button type="text" plain @click="delete">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -230,7 +229,7 @@
<el-dialog v-model="add" top="23vh" width="37%" title="娣诲姞鏉冮檺" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
@@ -309,7 +308,7 @@
</el-dialog>
<el-dialog v-model="adda" top="23vh" width="37%" title="淇敼鏉冮檺" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index d35e191..a352616 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -45,7 +45,6 @@
})
if (response.code === 200) {
tableData.value = response.data
- console.log(response.data);
} else {
ElMessage.warning(response.message)
}
@@ -864,7 +863,6 @@
}
}
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index d6a250e..befea3a 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -196,8 +196,6 @@
};
const handleCurrentChange = async(val: number) => {
currentPage.value = val;
- console.log(currentPage.value);
-
const response = await request.post('/temperingGlass/temperingGlassInfo/selectTemperingGlass', {
engineerId: engineerId.value,
temperingLayoutId: currentPage.value
diff --git a/UI-Project/src/views/RegisterView.vue b/UI-Project/src/views/RegisterView.vue
index 28f731e..31a83f7 100644
--- a/UI-Project/src/views/RegisterView.vue
+++ b/UI-Project/src/views/RegisterView.vue
@@ -65,7 +65,6 @@
request.post('/user/register',
register).then((res) => {
if(res['code']==200){
- console.log(res.data)
ElMessageBox.alert(
`<strong>鐢ㄦ埛:<i style="color: #1890FF;">'${res.data.userName}</i>'
<br>璐﹀彿ID:<i style="color: #1890FF;">${res.data.loginName}</i> </strong>`,
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index f20b55e..ef5e1b9 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -30,7 +30,7 @@
$t('reportmanage.signingwork')
}}</el-button>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="740" ref="table" :data="reportData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
@@ -152,8 +152,6 @@
const backendTime = new Date(globalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
@@ -286,7 +284,6 @@
}
});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
diff --git a/UI-Project/src/views/Returns/upreturnhistory.vue b/UI-Project/src/views/Returns/upreturnhistory.vue
index b810e5a..0535c37 100644
--- a/UI-Project/src/views/Returns/upreturnhistory.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory.vue
@@ -39,18 +39,6 @@
</el-tag>
</template>
</el-table-column>
- <!-- <el-table-column
- align="center"
- :label="$t('sorter.taskRunning')"
- min-width="80"
- prop="taskRunning"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskRunning)">
- {{ getStatusTexta(scope.row.taskRunning) }}
- </el-tag>
- </template>
- </el-table-column> -->
<el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
</el-table>
@@ -117,7 +105,6 @@
}));
// tableDatax.value = response.data.records;
tableDatax.value = formattedData;
- console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -129,7 +116,6 @@
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -197,7 +183,6 @@
}
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
- console.log(page);
const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
pageNo: 1,
pageSize: 20,
@@ -247,8 +232,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
@@ -278,14 +261,6 @@
return 'primary';
case 1:
return 'success';
- }
-}
-function getStatusTexta(taskRunning: number) {
- switch (taskRunning) {
- case 0:
- return t('basicData.untask');
- case 1:
- return t('basicData.up');
}
}
onMounted(() => {
diff --git a/UI-Project/src/views/Returns/upreturnhistory2.vue b/UI-Project/src/views/Returns/upreturnhistory2.vue
index 962ba9b..e2b3bef 100644
--- a/UI-Project/src/views/Returns/upreturnhistory2.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory2.vue
@@ -39,18 +39,6 @@
</el-tag>
</template>
</el-table-column>
- <!-- <el-table-column
- align="center"
- :label="$t('sorter.taskRunning')"
- min-width="80"
- prop="taskRunning"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskRunning)">
- {{ getStatusTexta(scope.row.taskRunning) }}
- </el-tag>
- </template>
- </el-table-column> -->
<el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
</el-table>
@@ -118,7 +106,6 @@
}));
// tableDatax.value = response.data.records;
tableDatax.value = formattedData;
- console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -130,7 +117,6 @@
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
-console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -198,7 +184,6 @@
}
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
-console.log(page);
const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
pageNo: 1,
pageSize: 20,
@@ -247,8 +232,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
-console.log(formatTimestamp(oneWeekAgo));
-console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
@@ -278,14 +261,6 @@
return 'primary';
case 1:
return 'success';
-}
-}
-function getStatusTexta(taskRunning: number) {
-switch (taskRunning) {
- case 0:
- return t('basicData.untask');
- case 1:
- return t('basicData.up');
}
}
onMounted(() => {
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 0790c2c..61b9152 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -1,13 +1,13 @@
<script lang="ts" setup>
-import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref, computed} from "vue";
-import {useRouter} from "vue-router"
+import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref, computed } from "vue";
+import { useRouter } from "vue-router"
import { ElMessage, ElMessageBox } from 'element-plus'
-import {useI18n} from 'vue-i18n'
-import {host, WebSocketHost} from '@/utils/constants'
+import { useI18n } from 'vue-i18n'
+import { host, WebSocketHost } from '@/utils/constants'
import request from "@/utils/request"
-import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
const router = useRouter()
-const {t} = useI18n()
+const { t } = useI18n()
const selectValuesa = reactive([]);
const selectedProjectNo = ref('');
const stationCell = ref('1');
@@ -36,15 +36,15 @@
const titleSelectJson = ref({
engineerId: [],
})
-request.post("/loadGlass/up-patten-usage/setUpPattenRequest",{
+request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
state: null,
stationCell: 5
}).then((response) => {
- if (response.code == 200) {
- } else {
- // ElMessage.warning(response.msg)
- }
- });
+ if (response.code == 200) {
+ } else {
+ // ElMessage.warning(response.msg)
+ }
+});
const selectproject = () => {
dialogFormVisible.value = true;
selectgong();
@@ -65,50 +65,38 @@
closeWebSocket(socket);
}
});
-const fetchTableData = async () => {
- try {
- const response = await request.get("/loadGlass/up-patten-usage/prioritylist");
- if (response.code === 200) {
- tableData.value = response.data
- // tableData.splice(0, tableData.length, ...response.data);
- // ElMessage.error(response.message);
- window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
-}
- } catch (error) {
- // ElMessage.error(response.message);
- }
-};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassOne`;
const handleMessage = (data: any) => {
- if (data.LoadOneState != null) {
- cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
+ if (data.inkageState != null) {
+ cuttingMachineStatusColor.value = data.inkageState[0] === 1 ? 'green' : '#911005';
}
-if (data.stationOne!=null) {
-const processedData = [...data.stationOne[0]];
- if (processedData.length > 0) {
- processedData[0] = { ...processedData[0], workstationId: 1 };
- }
- if (processedData.length > 1) {
- processedData[1] = { ...processedData[1], workstationId: 2 };
- }
- tableDataa.value = processedData;
- }else {
+ if (data.stationList.length != 0) {
+ const processedData = [...data.stationList[0]];
+ if (processedData.length > 0) {
+ processedData[0] = { ...processedData[0], workstationId: 1 };
+ }
+ if (processedData.length > 1) {
+ processedData[1] = { ...processedData[1], workstationId: 2 };
+ }
+ tableDataa.value = processedData;
+ } else {
tableDataa.value = []
}
- if(data.loadTask1!=null){
- tableData.value = data.loadTask1[0]
- window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
- canSelectProjecta.value = false;
- canSelectProjectb.value = false;
- canSelectProjectc.value = true;
-}
-else {
- canSelectProjecta.value = true;
- canSelectProjectb.value = true;
- canSelectProjectc.value = false;
- tableData.value = '';
-}
+ if (data.upPattenUsages.length != 0) {
+ tableData.value = data.upPattenUsages[0]
+ window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
+ canSelectProjecta.value = false;
+ canSelectProjectb.value = false;
+ canSelectProjectc.value = true;
+ }
+ else {
+ canSelectProjecta.value = true;
+ canSelectProjectb.value = true;
+ canSelectProjectc.value = false;
+ tableData.value = [];
+ window.localStorage.setItem('engineeringIda', '')
+ }
};
onBeforeUnmount(() => {
closeWebSocket();
@@ -171,14 +159,14 @@
state: 1,
})
if (response.code == 200) {
- ElMessage.success(response.message);
+ ElMessage.success(response.message);
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
socket = initializeWebSocket(socketUrl, handleMessage);
blind.value = false;
ReportData.value = true;
- } else {
+ } else {
ElMessage.error(response.message);
}
} catch (error) {
@@ -235,7 +223,6 @@
ElMessage.error(response.message);
}
};
-onMounted(fetchTableData);
// 寮�濮嬩笂鐗�
const handleBind = (row) => {
blind.value = true;
@@ -245,13 +232,13 @@
blinda.value = true;
};
const toggleEnableState = async (row: any) => {
- if (!row.id) {
- ElMessage.error(t('basicData.updatanull'));
+ if (!row.id) {
+ ElMessage.error(t('basicData.updatanull'));
return;
- }
+ }
const newState = row.state === 100 ? 0 : 100;
try {
- const response = await request.post('/loadGlass/up-patten-usage/updateGlassState', {id: row.id, state: newState});
+ const response = await request.post('/loadGlass/up-patten-usage/updateGlassState', { id: row.id, state: newState });
if (response.code === 200) {
ElMessage.success(response.message);
row.state = newState;
@@ -263,69 +250,69 @@
}
};
// 鐮存崯
-const opena = async(row) => {
+const opena = async (row) => {
try {
- const confirmResult = await ElMessageBox.confirm(
- t('searchOrder.broke'),
- t('productStock.prompt'),
- {
- confirmButtonText: t('productStock.yes'),
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.broke'),
+ t('productStock.prompt'),
+ {
+ confirmButtonText: t('productStock.yes'),
cancelButtonText: t('productStock.cancel'),
- type: 'warning',
- }
- );
- if (confirmResult === 'confirm') {
- const response = await request.post('/loadGlass/engineering/engineering/identControls', {
- glassId: row.glassId,
- line: 5,
- status: 1,
- state: 8,
- workingProcedure: '涓婄墖',
- })
- if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.msg);
- }
- }
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
- }
-};
-// 浜哄伐鎷胯蛋
-const openb = async(row) => {
- try {
- const confirmResult = await ElMessageBox.confirm(
- t('order.takeawaya'),
- t('productStock.prompt'),
- {
- confirmButtonText: t('productStock.yes'),
- cancelButtonText: t('productStock.cancel'),
- type: 'warning',
- }
+ type: 'warning',
+ }
);
if (confirmResult === 'confirm') {
const response = await request.post('/loadGlass/engineering/engineering/identControls', {
- glassId: row.glassId,
- line: 5,
- status: 1,
- state: 9,
- workingProcedure: '涓婄墖',
- })
- if (response.code === 200) {
- ElMessage.success(response.message);
+ glassId: row.glassId,
+ line: 5,
+ status: 1,
+ state: 8,
+ workingProcedure: '涓婄墖',
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
} else {
- ElMessage.error(response.msg);
- }
- }
+ ElMessage.error(response.msg);
+ }
+ }
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
- }
-};
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 浜哄伐鎷胯蛋
+const openb = async (row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('order.takeawaya'),
+ t('productStock.prompt'),
+ {
+ confirmButtonText: t('productStock.yes'),
+ cancelButtonText: t('productStock.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post('/loadGlass/engineering/engineering/identControls', {
+ glassId: row.glassId,
+ line: 5,
+ status: 1,
+ state: 9,
+ workingProcedure: '涓婄墖',
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
// 鏋跺瓙澶嶄綅
const handleptask = async (workstationId: number) => {
- try {
+ try {
const confirmResult = await ElMessageBox.confirm(
t('basicData.prackreset'),
t('workOrder.prompt'),
@@ -336,12 +323,12 @@
}
);
if (confirmResult === 'confirm') {
-
+
const slot = workstationId === 1 ? 101 : (workstationId === 2 ? 102 : null);
if (slot !== null) {
const response = await request.post('/glassStorage/rawGlassStorageDetails/shelfReset', {
slot: slot,
- })
+ })
// const url = `/loadGlass/rawGlassStorageDetails/shelfReset?slot=${slot}`;
// const response = await request.post(url);
if (response.code === 200) {
@@ -357,7 +344,7 @@
};
// 缁撴潫宸ョ▼
const deleteTask = async () => {
- try {
+ try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.pdeleteTask'),
t('workOrder.prompt'),
@@ -368,19 +355,19 @@
}
);
if (confirmResult === 'confirm') {
- let engineeringId = window.localStorage.getItem('engineeringIda')
- if (engineeringId !== '') {
- const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
- engineerId: engineeringId,
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- canSelectProjecta.value = true;
- canSelectProjectb.value = true;
- canSelectProjectc.value = false;
- blindb.value = true;
- tableDatad.value = response.data;
- } else {
+ let engineeringId = window.localStorage.getItem('engineeringIda')
+ if (engineeringId !== '') {
+ const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
+ engineerId: engineeringId,
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ canSelectProjecta.value = true;
+ canSelectProjectb.value = true;
+ canSelectProjectc.value = false;
+ blindb.value = true;
+ tableDatad.value = response.data;
+ } else {
ElMessage.error(response.message);
}
} else {
@@ -421,222 +408,226 @@
<div>
<div id="dotClass">
<div>{{ $t('basicData.laserprinting') }}</div>
- <i :style="{ marginTop: '2px', backgroundColor: markingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <i
+ :style="{ marginTop: '2px', backgroundColor: markingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
<el-button @click="confirmMarkingMachine" style="margin-left: 30px;margin-top: -3px;">{{
- $t('basicData.yes')
- }}
+ $t('basicData.yes')
+ }}
</el-button>
<div style="margin-left: 70px;">{{ $t('basicData.cuttingmachine') }}</div>
- <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <i
+ :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
<el-button @click="confirmCuttingMachine" style="margin-left: 30px;margin-top: -3px;">{{
- $t('basicData.yes')
- }}
+ $t('basicData.yes')
+ }}
</el-button>
<div style="margin-left: 70px;">{{ upstatus }}</div>
- <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- </div>
- <el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
- <el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
- <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
- <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
- <el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
- style="margin-top: 5px;margin-left: 20px;">
- <el-option :label="$t('Mounting.all')" value="0"></el-option>
- <el-option :label="$t('Mounting.oneloadingline')" value="1"></el-option>
- <el-option :label="$t('Mounting.twoloadingline')" value="2"></el-option>
- </el-select>
- <el-select v-model="selectValuesa[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-top: 5px;margin-left: 20px;" >
- <el-option :label="$t('Mounting.all')" value="null"></el-option>
- <el-option :label="$t('Mounting.waiting')" value="0"></el-option>
- <el-option :label="$t('Mounting.pass')" value="100"></el-option>
- </el-select>
- <el-button :disabled="!ReportData" type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('Mounting.setparameters') }}</el-button>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 15px;">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table
- height="400"
- ref="table"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- :data="tableData"
- >
- <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center"/>
- <el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center"/>
- <el-table-column prop="height" :label="$t('Mounting.height')" align="center"/>
- <el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center"/>
- <el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>
- <el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center"/>
- <el-table-column
- align="center"
- :label="$t('Mounting.state')"
- min-width="80"
- prop="state"
- >
- <template #default="scope">
- <el-tag
- :type="scope.row.state === 100 ? 'success' : 'warning'"
- @click="toggleEnableState(scope.row)"
- >
- {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
- </el-tag>
- </template>
- </el-table-column>
- </el-table>
+ <i
+ :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
</div>
- </el-card>
- <div style="display: flex;">
- <div style="width: 49%;float: left;margin-left: 300px;">
- <div style="display: flex;">
- <img src="../../assets/shangpianji.png" alt=""
- style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
- <el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="500"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" >
- <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="50"/>
- <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/>
- <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
- <el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80"/>
- <el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="60"/>
- <el-table-column fixed="right" :label="$t('film.operate')" align="center">
- <template #default="scope">
- <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </div>
-</div>
- <el-dialog v-model="blind" top="30vh" width="25%" :title="$t('basicData.startfilm')">
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="handleon">
- {{ $t('basicData.confirm') }}
- </el-button>
- <el-button @click="blind = false">{{ $t('basicData.cancel') }}</el-button>
- </div>
- </template>
- </el-dialog>
-<!-- 缁撴潫宸ョ▼ -->
- <el-dialog v-model="blindb" top="10vh" width="80%">
- <el-table ref="table" style="margin-top: 20px;height: 450px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="engineerId" fixed align="center" :label="$t('basicData.projectnumber')"/>
- <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')"/>
- <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')"/>
- <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')"/>
- <el-table-column prop="width" align="center" :label="$t('basicData.width')"/>
- <el-table-column prop="height" align="center" :label="$t('basicData.height')"/>
- <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')"/>
- <el-table-column prop="filmsid" align="center" :label="$t('basicData.coatingtypes')"/>
- <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')"/>
- <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="200">
- <template #default="scope">
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
- <el-button size="mini" type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
- </template>
- </el-table-column>
- </el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
- </el-dialog>
- <el-dialog v-model="blinda" top="24vh" width="30%" :title="$t('basicData.whetherpause')">
- <div style="margin-left: 50px;margin-bottom: 10px;">
- <el-form-item :label="$t('Mounting.loadingline')" :required="true">
- <el-select disabled v-model="stationCell" clearable :placeholder="$t('Mounting.inloadingline')" style="margin-left: 20px;">
+ <el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;" type="primary"
+ @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
+ <el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success"
+ @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
+ <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton"
+ type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
+ <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton"
+ type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical">{{
+ $t('searchOrder.historicaltasks') }}</el-button>
+ <el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
+ style="margin-top: 5px;margin-left: 20px;">
<el-option :label="$t('Mounting.all')" value="0"></el-option>
<el-option :label="$t('Mounting.oneloadingline')" value="1"></el-option>
<el-option :label="$t('Mounting.twoloadingline')" value="2"></el-option>
</el-select>
- </el-form-item>
- </div>
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="handleup">
- {{ $t('basicData.confirm') }}
- </el-button>
- <el-button @click="blinda = false">{{ $t('basicData.cancel') }}</el-button>
- </div>
- </template>
- </el-dialog>
+ <el-select v-model="selectValuesa[0]" clearable :placeholder="$t('film.taskstatus')"
+ style="margin-top: 5px;margin-left: 20px;">
+ <el-option :label="$t('Mounting.all')" value="null"></el-option>
+ <el-option :label="$t('Mounting.waiting')" value="0"></el-option>
+ <el-option :label="$t('Mounting.pass')" value="100"></el-option>
+ </el-select>
+ <el-button :disabled="!ReportData" type="primary" style="margin-left: 10px;" @click="selectReportData()">{{
+ $t('Mounting.setparameters') }}</el-button>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 15px;">
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
+ <el-table height="400" ref="table" :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }"
+ :data="tableData">
+ <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center" />
+ <el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center" />
+ <el-table-column prop="height" :label="$t('Mounting.height')" align="center" />
+ <el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center" />
+ <el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center" />
+ <el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center" />
+ <el-table-column align="center" :label="$t('Mounting.state')" min-width="80" prop="state">
+ <template #default="scope">
+ <el-tag :type="scope.row.state === 100 ? 'success' : 'warning'" @click="toggleEnableState(scope.row)">
+ {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
- <el-dialog v-model="dialogFormVisible" top="24vh" width="70%">
- <div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">
- <el-form-item :label="$t('Mounting.loadingline')" :required="true">
- <el-select disabled v-model="stationCell" clearable :placeholder="$t('Mounting.inloadingline')">
- <el-option :label="$t('Mounting.oneloadingline')" value="1"></el-option>
- <el-option :label="$t('Mounting.twoloadingline')" value="2"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item :label="$t('Mounting.projecta')" :required="true">
- <el-select
- v-model="selectedProjectNo"
- filterable
- clearable
- :placeholder="$t('basicData.plselectproject')"
- style="width: 220px"
- @input="handleInputChange"
- >
- <el-option
- v-for="item in titleSelectJson['engineerId']"
- :key="item.id"
- :label="item.projectNo"
- :value="item.projectNo"
- />
- </el-select>
- </el-form-item>
- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
- <el-select v-model="filmRemove" clearable :placeholder="$t('Mounting.removalmethod')">
- <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
- <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option>
- <el-option :label="$t('Mounting.finegrinding')" value="2"></el-option>
- </el-select>
- </el-form-item>
- </div>
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="handlesure">
- {{ $t('basicData.confirm') }}
- </el-button>
- <el-button @click="dialogFormVisible = false">{{ $t('basicData.cancel') }}</el-button>
+ </el-card>
+ <div style="display: flex;">
+ <div style="width: 49%;float: left;margin-left: 300px;">
+ <div style="display: flex;">
+ <img src="../../assets/shangpianji.png" alt=""
+ style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
+ <el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="500"
+ :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+ <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="50" />
+ <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80" />
+ <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80" />
+ <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
+ <el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80" />
+ <el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')"
+ min-width="60" />
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <template #default="scope">
+ <el-button :disabled="(!scope.row.patternThickness)" type="text" plain
+ @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
</div>
- </template>
- </el-dialog>
+ <el-dialog v-model="blind" top="30vh" width="25%" :title="$t('basicData.startfilm')">
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handleon">
+ {{ $t('basicData.confirm') }}
+ </el-button>
+ <el-button @click="blind = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ <!-- 缁撴潫宸ョ▼ -->
+ <el-dialog v-model="blindb" top="10vh" width="80%">
+ <el-table ref="table" style="margin-top: 20px;height: 450px;" :data="tableDatad"
+ :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+ <el-table-column prop="engineerId" fixed align="center" :label="$t('basicData.projectnumber')" />
+ <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" />
+ <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')" />
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" />
+ <el-table-column prop="width" align="center" :label="$t('basicData.width')" />
+ <el-table-column prop="height" align="center" :label="$t('basicData.height')" />
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" />
+ <el-table-column prop="filmsid" align="center" :label="$t('basicData.coatingtypes')" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')" />
+ <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="200">
+ <template #default="scope">
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
+ <el-button type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ <el-dialog v-model="blinda" top="24vh" width="30%" :title="$t('basicData.whetherpause')">
+ <div style="margin-left: 50px;margin-bottom: 10px;">
+ <el-form-item :label="$t('Mounting.loadingline')" :required="true">
+ <el-select disabled v-model="stationCell" clearable :placeholder="$t('Mounting.inloadingline')"
+ style="margin-left: 20px;">
+ <el-option :label="$t('Mounting.all')" value="0"></el-option>
+ <el-option :label="$t('Mounting.oneloadingline')" value="1"></el-option>
+ <el-option :label="$t('Mounting.twoloadingline')" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handleup">
+ {{ $t('basicData.confirm') }}
+ </el-button>
+ <el-button @click="blinda = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+ <el-dialog v-model="dialogFormVisible" top="24vh" width="70%">
+ <div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">
+ <el-form-item :label="$t('Mounting.loadingline')" :required="true">
+ <el-select disabled v-model="stationCell" clearable :placeholder="$t('Mounting.inloadingline')">
+ <el-option :label="$t('Mounting.oneloadingline')" value="1"></el-option>
+ <el-option :label="$t('Mounting.twoloadingline')" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item :label="$t('Mounting.projecta')" :required="true">
+ <el-select v-model="selectedProjectNo" filterable clearable :placeholder="$t('basicData.plselectproject')"
+ style="width: 220px" @input="handleInputChange">
+ <el-option v-for="item in titleSelectJson['engineerId']" :key="item.id" :label="item.projectNo"
+ :value="item.projectNo" />
+ </el-select>
+ </el-form-item>
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
+ <el-select v-model="filmRemove" clearable :placeholder="$t('Mounting.removalmethod')">
+ <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
+ <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option>
+ <el-option :label="$t('Mounting.finegrinding')" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handlesure">
+ {{ $t('basicData.confirm') }}
+ </el-button>
+ <el-button @click="dialogFormVisible = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindbd" top="10vh" width="71%">
- <iframe
- :src="iframeUrl"
- marginwidth="2000px"
- marginheight="2000px"
- width="100%"
- height="700px"
- frameborder="0"
- ></iframe>
- </el-dialog>
+ <el-dialog v-model="blindbd" top="10vh" width="71%">
+ <iframe :src="iframeUrl" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
+ frameborder="0"></iframe>
+ </el-dialog>
</div>
</template>
<style scoped>
- .flex-container {
- display: flex;
+.flex-container {
+ display: flex;
align-items: center;
-}
-.flex-container .el-form-item {
- flex: 1;
- margin-right: 0; /* 绉婚櫎榛樿鐨勫彸渚ц竟璺� */
-}
-.flex-container .el-form-item:last-child {
- margin-left: 20px; /* 涓虹浜屼釜琛ㄥ崟椤规坊鍔犲乏渚ц竟璺� */
}
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
-#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
-#dialog-footer{
+
+.flex-container .el-form-item {
+ flex: 1;
+ margin-right: 0;
+ /* 绉婚櫎榛樿鐨勫彸渚ц竟璺� */
+}
+
+.flex-container .el-form-item:last-child {
+ margin-left: 20px;
+ /* 涓虹浜屼釜琛ㄥ崟椤规坊鍔犲乏渚ц竟璺� */
+}
+
+#dt {
+ display: block;
+ float: left;
+ line-height: 20px;
+ margin-left: 100px;
+}
+
+#dta {
+ display: block;
+ float: left;
+ line-height: 20px;
+ margin-left: 80%;
+}
+
+#dialog-footer {
text-align: center;
margin-top: -15px;
}
+
#dotClass {
display: flex;
- margin-left: 20px;
+ margin-left: 20px;
size: 50px;
margin-top: 20px;
margin-bottom: 10px;
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index da51ee4..ad20672 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -71,10 +71,10 @@
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassTwo`;
const handleMessage = (data: any) => {
- if (data.stationTwo!=null) {
- const processedData = [...data.stationTwo[0]];
+ if (data.stationList.length != 0) {
+ const processedData = [...data.stationList[0]];
if (processedData.length > 0) {
processedData[0] = { ...processedData[0], workstationId: 1 };
}
@@ -85,19 +85,18 @@
}else {
tableDataa.value = []
}
- if (data.LoadTwoervice != null) {
- cuttingMachineStatusColor.value = data.LoadTwoervice[0] == 1 ? 'green' : '#911005';
+ if (data.inkageState != null) {
+ cuttingMachineStatusColor.value = data.inkageState[0] === 1 ? 'green' : '#911005';
}
- if(data.loadTask2!=null){
- // tableData.splice(0, tableData.length, ...data.loadTask2[0]);
- tableData.value = data.loadTask2[0]
+ if (data.upPattenUsages.length != 0) {
+ tableData.value = data.upPattenUsages[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
}
else {
- tableData.value = '';
+ tableData.value = [];
canSelectProjecta.value = true;
canSelectProjectb.value = true;
canSelectProjectc.value = false;
@@ -130,7 +129,6 @@
};
// 鏋跺瓙澶嶄綅
const handleptask = async (workstationId: number) => {
- console.log(workstationId);
try {
const confirmResult = await ElMessageBox.confirm(
t('basicData.prackreset'),
@@ -255,7 +253,6 @@
try {
let filmRemove = window.localStorage.getItem('filmRemove')
let engineeringId = window.localStorage.getItem('engineeringIda')
- console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pause', {
stationCell: 6,
@@ -495,7 +492,7 @@
<el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="60"/>
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
+ <el-button :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -537,8 +534,8 @@
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')"/>
<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
- <el-button size="mini" type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
+ <el-button type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 796f5b3..5271b9b 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1268,7 +1268,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>
@@ -1325,10 +1325,10 @@
<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 size="mini" type="text"
+ <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>
+ <el-button type="text"
:disabled="!((props.row.bigStorageCageDetails[0].state !== 102 && scope.$index == 0 ) || (props.row.bigStorageCageDetails[(scope.$index - 1)<0?0:scope.$index-1].state==102)&&(scope.row.state!=102))"
plain @click="outfil(scope.row)">
{{ $t('searchOrder.outfilm') }}
@@ -1361,7 +1361,7 @@
<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>
@@ -1424,7 +1424,7 @@
</el-col>
<el-col :span="4">
<div id="dt" style="font-size: 15px;">
- <el-button size="mini" type="text" plain @click="broked()">{{ $t('searchOrder.undesignate') }}</el-button>
+ <el-button type="text" plain @click="broked()">{{ $t('searchOrder.undesignate') }}</el-button>
</div>
</el-col>
</el-row>
@@ -1442,11 +1442,11 @@
<el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
+ <el-button type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+ <el-button type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1589,11 +1589,11 @@
<el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
+ <el-button type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+ <el-button type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1604,7 +1604,7 @@
<el-table-column prop="count" align="center" :label="$t('searchOrder.numberglasses')" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" >
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokes(scope.row)">{{ $t('searchOrder.processcard') }}</el-button>
+ <el-button type="text" plain @click="brokes(scope.row)">{{ $t('searchOrder.processcard') }}</el-button>
</template>
</el-table-column>
</el-table> -->
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index fdba045..182644c 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -162,7 +162,7 @@
<template>
<div style="height: 500px;">
<div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="display: flex;">
<!-- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handlehistorical">{{
$t('searchOrder.historicaltasks')
@@ -210,11 +210,11 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">{{
+ <el-button type="text" plain @click="open(scope.row)">{{
$t('workOrder.breakage')
}}
</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{
+ <el-button type="text" plain @click="opena(scope.row)">{{
$t('workOrder.takeout')
}}
</el-button>
diff --git a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
index 4352bbe..601fd1f 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
@@ -87,13 +87,12 @@
}
});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
<template>
<div style="height: 500px;">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="750" ref="table"
@selection-change="handleSelectionChange"
@@ -105,8 +104,8 @@
<el-table-column prop="glass_type" align="center" :label="$t('workOrder.glasstype')" min-width="120"/>
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('workOrder.takeout') }}</el-button>
+ <el-button type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('workOrder.takeout') }}</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/UI-Project/src/views/StockBasicData/stockBasicyiwu.vue b/UI-Project/src/views/StockBasicData/stockBasicyiwu.vue
index 68db359..e6b409e 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicyiwu.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicyiwu.vue
@@ -50,7 +50,6 @@
stateList = [selectValuesa[1]]
}
}
- console.log(timeRange.value[0], timeRange.value[1])
const response = await request.post(
'/cacheGlass/edgGlassTaskInfo/setEdgGlassInfoRequest',
{
@@ -155,7 +154,6 @@
}
})
onBeforeUnmount(() => {
- console.log('鍏抽棴浜�')
closeWebSocket()
})
</script>
@@ -163,7 +161,7 @@
<div style="height: 500px;">
<div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;"
- v-loading="loading">
+ >
<el-select v-model="selectValuesa[0]"
filterable
:placeholder="$t('workOrder.cway')"
@@ -248,14 +246,14 @@
align="center"
width="200">
<template #default="scope">
- <el-button size="mini"
+ <el-button
type="text"
plain
@click="open(scope.row)">{{
$t('workOrder.breakage')
}}
</el-button>
- <el-button size="mini"
+ <el-button
type="text"
plain
@click="opena(scope.row)">{{
diff --git a/UI-Project/src/views/StockBasicData/stockhistory.vue b/UI-Project/src/views/StockBasicData/stockhistory.vue
index 93f5788..38fe996 100644
--- a/UI-Project/src/views/StockBasicData/stockhistory.vue
+++ b/UI-Project/src/views/StockBasicData/stockhistory.vue
@@ -126,7 +126,6 @@
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
-console.log(newPage);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -200,8 +199,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
diff --git a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
index e1edb80..8e8194c 100644
--- a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
+++ b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
@@ -86,7 +86,6 @@
// var TerritoryCross=TerritoryWidth/Bli; //椤甸潰鐗堝浘妯悜 鍍忕礌
// var TerritoryVertical=TerritoryLength/Bli;//椤甸潰鐗堝浘绾靛悜 鍍忕礌
- console.log(Font1);
var canva = this.$refs[id];
var content = canva.getContext('2d');
diff --git a/UI-Project/src/views/User/permissions.vue b/UI-Project/src/views/User/permissions.vue
index 9dc0572..4fc96e2 100644
--- a/UI-Project/src/views/User/permissions.vue
+++ b/UI-Project/src/views/User/permissions.vue
@@ -22,7 +22,6 @@
const slot = ref('')
request.get("/loadGlass/sys/menu/nav").then((res) => {
if (res.code == 200) {
- console.log(res.data);
tableData.value = res.data.tree
} else {
ElMessage.warning(res.msg)
@@ -213,7 +212,7 @@
</script>
<template>
<div style="height: 600px;">
- <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" size="mini" id="searchButton" @click="add = true">{{ $t('customer.addmenu') }}</el-button>
+ <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" id="searchButton" @click="add = true">{{ $t('customer.addmenu') }}</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 750px;">
<el-table
@@ -238,8 +237,8 @@
<el-table-column prop="listSort" align="center" :label="$t('customer.sort')" min-width="140"/>
<el-table-column fixed="right" :label="$t('customer.operate')" align="center">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleEditc(scope.row)">{{ $t('customer.exit') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('customer.delete') }}</el-button>
+ <el-button type="text" plain @click="handleEditc(scope.row)">{{ $t('customer.exit') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('customer.delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -251,9 +250,9 @@
<el-table-column prop="listSort" align="center" :label="$t('customer.sort')" min-width="180" />
<el-table-column fixed="right" :label="$t('customer.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('customer.addmenua') }}</el-button>
- <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('customer.exit') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('customer.delete') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('customer.addmenua') }}</el-button>
+ <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('customer.exit') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('customer.delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -262,7 +261,7 @@
</div>
<el-dialog v-model="add" top="23vh" width="37%" :title="$t('customer.addmenu')">
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -318,7 +317,7 @@
</el-form>
</div>
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -361,7 +360,7 @@
</el-dialog>
<el-dialog v-model="adda" top="23vh" width="37%" :title="$t('customer.exmene')">
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form ref="formRef" size="mini" label-width="150px">
+ <el-form ref="formRef" label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -404,7 +403,7 @@
</el-dialog>
<el-dialog v-model="addc" top="23vh" width="37%" :title="$t('customer.exmenea')">
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form ref="formRef" size="mini" label-width="150px">
+ <el-form ref="formRef" label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
diff --git a/UI-Project/src/views/User/rolelist.vue b/UI-Project/src/views/User/rolelist.vue
index c929df2..156a1a3 100644
--- a/UI-Project/src/views/User/rolelist.vue
+++ b/UI-Project/src/views/User/rolelist.vue
@@ -38,7 +38,6 @@
tableData.value = response.data
// titleSelectJsona.value.processTypea = response.data.menuList;
// options.value = response.data.menuList
- console.log(response.data);
} else {
ElMessage.warning(response.data);
}
@@ -132,8 +131,7 @@
}
if (selectedOptions.value !== topLevelItems) {
selectedOptions.value = topLevelItems;
- }
- console.log(topLevelItems);
+ }
// selectedOptions.value = topLevelItems;
const topLevelItemsWithChildren = topLevelItems; // 鍖呭惈椤剁骇鑿滃崟椤瑰強鍏跺瓙鑿滃崟椤圭殑鏁扮粍 聽
let selectedPath = [];
@@ -149,7 +147,6 @@
}
}
}
- console.log(selectedPath);
selectedOptions.value = selectedPath;
}
// 缂栬緫
@@ -237,9 +234,7 @@
};
request.get("/loadGlass/sys/menu/nav").then((res) => {
if (res.code == 200) {
- console.log(res.data);
options.value = res.data.tree
- console.log( options.value);
} else {
ElMessage.warning(res.msg)
}
@@ -247,7 +242,7 @@
</script>
<template>
<div>
- <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" size="mini" id="searchButton" @click="add = true">{{ $t('delivery.addrole') }}</el-button>
+ <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" id="searchButton" @click="add = true">{{ $t('delivery.addrole') }}</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="750" ref="table"
@@ -255,8 +250,8 @@
<el-table-column prop="name" align="center" :label="$t('delivery.role')" min-width="180" />
<el-table-column fixed="right" :label="$t('delivery.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('delivery.edit') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('delivery.delete') }}</el-button>
+ <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('delivery.edit') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('delivery.delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -265,7 +260,7 @@
</div>
<el-dialog v-model="add" top="23vh" width="37%" :title="$t('productStock.addusername')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form ref="formRef" size="mini" label-width="150px">
+ <el-form ref="formRef" label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -305,7 +300,7 @@
</el-dialog>
<el-dialog v-model="adda" top="23vh" width="37%" :title="$t('delivery.editrole')">
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form ref="formRef" size="mini" label-width="150px">
+ <el-form ref="formRef" label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
diff --git a/UI-Project/src/views/User/userlist.vue b/UI-Project/src/views/User/userlist.vue
index 88571f1..6d78378 100644
--- a/UI-Project/src/views/User/userlist.vue
+++ b/UI-Project/src/views/User/userlist.vue
@@ -183,8 +183,8 @@
</script>
<template>
<div>
- <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" size="mini" id="searchButton" @click="add = true">{{ $t('productStock.addusers') }}</el-button>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" id="searchButton" @click="add = true">{{ $t('productStock.addusers') }}</el-button>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="750" ref="table"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
@@ -198,9 +198,9 @@
</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="open(scope.row)">{{ $t('productStock.resetpassword') }}</el-button>
- <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="open(scope.row)">{{ $t('productStock.resetpassword') }}</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>
@@ -209,7 +209,7 @@
</div>
<el-dialog v-model="add" top="23vh" width="37%" :title="$t('productStock.addusers')">
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -270,7 +270,7 @@
</el-dialog>
<el-dialog v-model="adda" top="23vh" width="37%" :title="$t('productStock.reusername')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form ref="formRef" size="mini" label-width="150px">
+ <el-form ref="formRef" label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
diff --git a/UI-Project/src/views/Visualization/screenone.vue b/UI-Project/src/views/Visualization/screenone.vue
index 25b8983..4ff7068 100644
--- a/UI-Project/src/views/Visualization/screenone.vue
+++ b/UI-Project/src/views/Visualization/screenone.vue
@@ -33,7 +33,6 @@
// onMounted(fetchTableData);
request.get("unLoadGlass/downStorage/selectStorageCage").then((res) => {
if (res.code == 200) {
- console.log(res.data);
tableData.value = res.data
} else {
ElMessage.warning(res.msg)
diff --git a/UI-Project/src/views/Visualization/screentwo.vue b/UI-Project/src/views/Visualization/screentwo.vue
index d0847d3..f78061d 100644
--- a/UI-Project/src/views/Visualization/screentwo.vue
+++ b/UI-Project/src/views/Visualization/screentwo.vue
@@ -33,7 +33,6 @@
// onMounted(fetchTableData);
request.get("unLoadGlass/downStorage/selectStorageCage").then((res) => {
if (res.code == 200) {
- console.log(res.data);
tableData.value = res.data
} else {
ElMessage.warning(res.msg)
diff --git a/UI-Project/src/views/hollow/hellowquiphistory.vue b/UI-Project/src/views/hollow/hellowquiphistory.vue
index aa5f6a3..644efb1 100644
--- a/UI-Project/src/views/hollow/hellowquiphistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiphistory.vue
@@ -51,8 +51,8 @@
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('hellow.HollowGlass') }}</el-button>
+ <el-button type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button>
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('hellow.HollowGlass') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -88,7 +88,7 @@
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="15vh" width="65%" :title="$t('hellow.listFormula')">
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
@@ -434,19 +434,16 @@
formattedUpdateTime: formatTimestamp(record.updateTime),
}));
tableDatax.value = formattedData;
- console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- console.error(error);
}
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
-console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -490,7 +487,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鍘嗗彶鏌ヨ鐐瑰嚮
@@ -536,7 +532,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 閰嶆柟淇℃伅
@@ -586,8 +581,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 闃熷垪淇℃伅
@@ -613,8 +606,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -634,8 +625,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
-console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
diff --git a/UI-Project/src/views/hollow/hellowquipthreehistory.vue b/UI-Project/src/views/hollow/hellowquipthreehistory.vue
index 965d48f..25c8491 100644
--- a/UI-Project/src/views/hollow/hellowquipthreehistory.vue
+++ b/UI-Project/src/views/hollow/hellowquipthreehistory.vue
@@ -51,8 +51,8 @@
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <!-- <el-button size="mini" type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button> -->
- <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('hellow.HollowGlass') }}</el-button>
+ <!-- <el-button type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button> -->
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('hellow.HollowGlass') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -89,7 +89,7 @@
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="23vh" width="55%" :title="$t('hellow.listFormula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="8">
@@ -227,19 +227,16 @@
formattedUpdateTime: formatTimestamp(record.updateTime),
}));
tableDatax.value = formattedData;
- console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- console.error(error);
}
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
-console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -283,7 +280,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 閰嶆柟淇℃伅
@@ -333,8 +329,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 闃熷垪淇℃伅
@@ -360,8 +354,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍘嗗彶鏌ヨ鐐瑰嚮
@@ -407,7 +399,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -427,8 +418,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
-console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
diff --git a/UI-Project/src/views/hollow/hellowquiptwohistory.vue b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
index 7a86fff..c61da50 100644
--- a/UI-Project/src/views/hollow/hellowquiptwohistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
@@ -51,8 +51,8 @@
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('hellow.HollowGlass') }}</el-button>
+ <el-button type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button>
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('hellow.HollowGlass') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -89,7 +89,7 @@
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="23vh" width="55%" :title="$t('hellow.listFormula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="8">
@@ -227,19 +227,16 @@
formattedUpdateTime: formatTimestamp(record.updateTime),
}));
tableDatax.value = formattedData;
- console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- console.error(error);
}
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
-console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -283,7 +280,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 閰嶆柟淇℃伅
@@ -333,8 +329,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 闃熷垪淇℃伅
@@ -360,8 +354,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍘嗗彶鏌ヨ鐐瑰嚮
@@ -407,7 +399,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -427,8 +418,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
-console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
diff --git a/UI-Project/src/views/hollow/hellowslicecagehistory.vue b/UI-Project/src/views/hollow/hellowslicecagehistory.vue
index 1d1fe3d..7da48a7 100644
--- a/UI-Project/src/views/hollow/hellowslicecagehistory.vue
+++ b/UI-Project/src/views/hollow/hellowslicecagehistory.vue
@@ -169,7 +169,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const historical = async () => {
@@ -201,12 +200,10 @@
}
}
catch (error) {
- console.error(error);
}
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
-console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
Dailya(currentPage2.value);
@@ -265,7 +262,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const Dailya = async (page) => {
@@ -317,7 +313,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const handleClick = async () => {
@@ -372,17 +367,13 @@
formattedCreateTime: formatTimestamp(record.createTime),
formattedUpdateTime: formatTimestamp(record.updateTime),
}));
- // tableDatax.value = response.data.records;
tableDatax.value = formattedData;
- console.log(tableDatax.value);
- console.log(formattedData);
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- console.error(error);
}
}
const Dailyhistorical = async () => {
@@ -434,7 +425,6 @@
}
}
catch (error) {
- console.error(error);
}
}
@@ -455,8 +445,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
-console.log(formatTimestamp(oneWeekAgo));
-console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
diff --git a/UI-Project/src/views/hollow/hollowaluminum.vue b/UI-Project/src/views/hollow/hollowaluminum.vue
index 0698b68..9ae549b 100644
--- a/UI-Project/src/views/hollow/hollowaluminum.vue
+++ b/UI-Project/src/views/hollow/hollowaluminum.vue
@@ -31,14 +31,13 @@
}
});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
<template>
<div style="height: 500px;">
<div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="750" ref="table"
@selection-change="handleSelectionChange"
@@ -51,11 +50,11 @@
<el-table-column prop="line" align="center" :label="$t('workOrder.line')" min-width="120" />
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">{{
+ <el-button type="text" plain @click="open(scope.row)">{{
$t('workOrder.breakage')
}}
</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{
+ <el-button type="text" plain @click="opena(scope.row)">{{
$t('workOrder.takeout')
}}
</el-button>
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index ef63a94..39d256f 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.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') }}
@@ -119,12 +119,12 @@
<el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" 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" 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>
@@ -135,7 +135,7 @@
<!-- 涓┖閰嶆柟娣诲姞 -->
<el-dialog v-model="add" top="3vh" 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">
<!-- <el-form label-width="150px" label-position="right"> -->
<el-row style="margin-top: 10px;">
<el-col :span="6">
@@ -412,7 +412,7 @@
<!-- 涓┖閰嶆柟淇敼 -->
<el-dialog v-model="adda" top="3vh" 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">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
@@ -689,7 +689,7 @@
<!-- 棰嗗彇浠诲姟 -->
<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-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantity" autocomplete="off" />
@@ -740,7 +740,7 @@
<!-- 寮哄埗鍑虹墖 -->
<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-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantitya" autocomplete="off" />
@@ -862,7 +862,6 @@
clearable
:placeholder="$t('basicData.plselectproject')"
style="width: 260px"
- @input="handleInputChange"
>
<el-option
v-for="item in titleSelectJson.processType"
@@ -973,8 +972,8 @@
<el-table-column prop="rightRemove" align="center" :label="$t('hellow.rightRemovep')" min-width="95"> </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>
@@ -1108,7 +1107,6 @@
// console.warn('No data for the current page key:', currentPageKeyValue);
// }
} catch (error) {
- console.error('Error parsing WebSocket message:', error);
}
};
onMounted(() => {
@@ -1636,7 +1634,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 宸ョ▼鍙�
@@ -1693,7 +1690,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮�濮嬩换鍔�
@@ -1716,7 +1712,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 鏆傚仠浠诲姟
@@ -1739,7 +1734,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 鍒犻櫎浠诲姟
@@ -1762,7 +1756,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 棰嗗彇浠诲姟
@@ -1782,7 +1775,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮哄埗鍑虹墖
@@ -1801,12 +1793,10 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index d5fbf2d..179858f 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.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') }}
@@ -93,12 +93,12 @@
<el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" 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" 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,7 +109,7 @@
<!-- 涓┖閰嶆柟娣诲姞 -->
<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">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
@@ -181,7 +181,7 @@
<!-- 涓┖閰嶆柟淇敼 -->
<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">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
@@ -253,7 +253,7 @@
<!-- 棰嗗彇浠诲姟 -->
<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-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantity" autocomplete="off" />
@@ -304,7 +304,7 @@
<!-- 寮哄埗鍑虹墖 -->
<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-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantitya" autocomplete="off" />
@@ -426,7 +426,6 @@
clearable
:placeholder="$t('basicData.plselectproject')"
style="width: 260px"
- @input="handleInputChange"
>
<el-option
v-for="item in titleSelectJson.processType"
@@ -467,8 +466,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>
@@ -564,11 +563,9 @@
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);
};
const handleMessage = (data) => {
@@ -581,7 +578,6 @@
freethree.value = data.freeRequest[0] == true ? 'green' : '#911005';
}
} catch (error) {
- console.error('Error parsing WebSocket message:', error);
}
};
onMounted(() => {
@@ -821,7 +817,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 宸ョ▼鍙�
@@ -878,7 +873,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮�濮嬩换鍔�
@@ -901,7 +895,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 鏆傚仠浠诲姟
@@ -924,7 +917,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 鍒犻櫎浠诲姟
@@ -947,7 +939,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 棰嗗彇浠诲姟
@@ -967,7 +958,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮哄埗鍑虹墖
@@ -986,12 +976,9 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
-
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 505be33..f27550f 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') }}
@@ -93,12 +93,12 @@
<el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" 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" 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,7 +109,7 @@
<!-- 涓┖閰嶆柟娣诲姞 -->
<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">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
@@ -181,7 +181,7 @@
<!-- 涓┖閰嶆柟淇敼 -->
<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">
<el-form label-width="150px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
@@ -253,7 +253,7 @@
<!-- 棰嗗彇浠诲姟 -->
<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-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantity" autocomplete="off" />
@@ -304,7 +304,7 @@
<!-- 寮哄埗鍑虹墖 -->
<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-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantitya" autocomplete="off" />
@@ -426,7 +426,6 @@
clearable
:placeholder="$t('basicData.plselectproject')"
style="width: 260px"
- @input="handleInputChange"
>
<el-option
v-for="item in titleSelectJson.processType"
@@ -467,8 +466,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>
@@ -561,11 +560,9 @@
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);
};
const handleMessage = (data) => {
@@ -583,7 +580,6 @@
// console.warn('No data for the current page key:', currentPageKeyValue);
// }
} catch (error) {
- console.error('Error parsing WebSocket message:', error);
}
};
onMounted(() => {
@@ -823,7 +819,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 宸ョ▼鍙�
@@ -880,7 +875,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮�濮嬩换鍔�
@@ -903,7 +897,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 鏆傚仠浠诲姟
@@ -926,7 +919,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 鍒犻櫎浠诲姟
@@ -949,7 +941,6 @@
})
}
} catch (error) {
- console.error(error);
}
}
// 棰嗗彇浠诲姟
@@ -969,7 +960,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
// 寮哄埗鍑虹墖
@@ -988,12 +978,10 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
}
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index aec4351..f66af6e 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -62,7 +62,6 @@
const temperingengineerId=ref('');
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
fetchxiang(currentPage2.value);
};
@@ -87,7 +86,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鏄惁绂佺敤
@@ -131,7 +129,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鐮存崯
@@ -161,8 +158,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鎷胯蛋
@@ -192,8 +188,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 纭娣诲姞
@@ -228,7 +223,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
const handlexiang = () => {
@@ -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'}"
@@ -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>
@@ -978,7 +964,7 @@
<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>
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index 93f75d8..70534ca 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -1,6 +1,6 @@
<template>
<div style="height: 500px;">
- <el-card style="flex: 1;margin-left: 1px;margin-top: 10px;margin-right: 1px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 1px;margin-top: 10px;margin-right: 1px;" >
<el-scrollbar height="800px">
<div style="font-size: 20px;font-weight: bold;">{{ $t('large.loading') }}{{ temperingtotal }}</div>
<div id="top" style="height: 150px;display: flex; justify-content: center; align-items: center;">
@@ -56,7 +56,7 @@
<el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="100" />
<el-table-column fixed="right" :label="$t('large.operate')" align="center" width="100">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleBinda(scope.row)">{{ $t('large.mes') }}</el-button>
+ <el-button type="text" plain @click="handleBinda(scope.row)">{{ $t('large.mes') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -169,7 +169,6 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableData.value = response.data;
- console.log(tableData.value);
} else {
ElMessage.error(response.message);
}
@@ -381,7 +380,6 @@
}
});
onBeforeUnmount(() => {
-console.log("鍏抽棴浜�")
closeWebSocket();
closeWebSocket2();
closeWebSocket3();
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index bacad27..7169291 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -180,7 +180,6 @@
}
});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
const numBoxes = ref(5);
diff --git a/UI-Project/src/views/largescreendisplay/statistics.vue b/UI-Project/src/views/largescreendisplay/statistics.vue
index b751330..2fcea07 100644
--- a/UI-Project/src/views/largescreendisplay/statistics.vue
+++ b/UI-Project/src/views/largescreendisplay/statistics.vue
@@ -74,7 +74,6 @@
}));
// tableDatax.value = response.data.records;
tableDatax.value = formattedData;
- console.log(response.data.pages);
totalRecords.value = response.data.total / 2 || 0
} else {
ElMessage.error(response.message);
@@ -86,7 +85,6 @@
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -147,7 +145,6 @@
}
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
- console.log(page);
const response = await request.post("/loadGlass/largenScreen/queryDailyProduction", {
pageNo: 1,
pageSize: 20,
@@ -190,8 +187,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
@@ -221,14 +216,6 @@
return 'primary';
case 1:
return 'success';
- }
-}
-function getStatusTexta(taskRunning: number) {
- switch (taskRunning) {
- case 0:
- return t('basicData.untask');
- case 1:
- return t('basicData.up');
}
}
onMounted(() => {
diff --git a/UI-Project/src/views/mm/purchaseOrder/Select.vue b/UI-Project/src/views/mm/purchaseOrder/Select.vue
index 4b42baf..1b9c98f 100644
--- a/UI-Project/src/views/mm/purchaseOrder/Select.vue
+++ b/UI-Project/src/views/mm/purchaseOrder/Select.vue
@@ -785,7 +785,7 @@
<el-button style="margin-top: 5px;float: right;margin-right: 50px;" id="searchButton" type="text" @click="dialogForm">鐗堝浘鍙�</el-button>
<div v-if="box">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 450px;">
<el-table height="100%" ref="table"
@selection-change="handleSelectionChange"
@@ -798,8 +798,8 @@
<el-table-column prop="thick" align="center" label="鍏朵粬" min-width="120" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
<template #default>
- <!-- <el-button size="mini" type="text" plain @click="dialogFormVisible = true">璇︽儏</el-button> -->
- <el-button size="mini" type="text" plain @click="dialogFormVisiblea = true">璁剧疆</el-button>
+ <!-- <el-button type="text" plain @click="dialogFormVisible = true">璇︽儏</el-button> -->
+ <el-button type="text" plain @click="dialogFormVisiblea = true">璁剧疆</el-button>
</template>
</el-table-column>
</el-table>
@@ -807,7 +807,7 @@
</el-card>
</div>
<div v-if="boxb">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 450px;">
<el-table height="100%" ref="table"
@selection-change="handleSelectionChange"
@@ -820,8 +820,8 @@
<el-table-column prop="thick" align="center" label="鍏朵粬" min-width="120" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
<template #default>
- <!-- <el-button size="mini" type="text" plain @click="dialogFormVisible = true">璇︽儏</el-button> -->
- <el-button size="mini" type="text" plain @click="dialogFormVisiblea = true">璁剧疆</el-button>
+ <!-- <el-button type="text" plain @click="dialogFormVisible = true">璇︽儏</el-button> -->
+ <el-button type="text" plain @click="dialogFormVisiblea = true">璁剧疆</el-button>
</template>
</el-table-column>
</el-table>
@@ -829,7 +829,7 @@
</el-card>
</div>
<!-- <div v-if="boxa">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto">
<el-table height="100%" ref="table"
@selection-change="handleSelectionChange"
@@ -856,7 +856,7 @@
</template>
</el-dialog> -->
<el-dialog v-model="dialogFormVisiblea" top="21vh" width="30%" title="娴嬮噺璁剧疆" >
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form style="margin-left: 80px;">
<el-form-item label="璇樊闀匡細" :required="true" style="width: 16vw;margin-bottom: 30px;">
--
Gitblit v1.8.0