From 1449f79f342919f5b65003312b113a8dad229692 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 十一月 2025 11:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index e9c2807..de6d522 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -105,7 +105,7 @@
parseAndSetTime();
});
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/rawGlass`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/glassStorage/api/talk/rawGlass`;
const handleMessage = (data) => {
const formattedTasks = data.tasks[0].map(task => {
if (task && task.createTime) {
@@ -212,6 +212,11 @@
}
};
const handleEdit = (row) => {
+ patternWidth.value = row.patternWidth;
+ patternHeight.value = row.patternHeight;
+ patternThickness.value = row.patternThickness;
+ filmsId.value = row.filmsId;
+ remainQuantity.value = row.remainQuantity;
window.localStorage.setItem('deviceId', row.deviceId)
window.localStorage.setItem('slot', row.slot)
Edit.value = true;
@@ -252,6 +257,30 @@
};
// 鍘熺墖鍏ュ簱
const handleup = async () => {
+ if (!patternWidth.value) {
+ ElMessage.error(t('film.inwidth'))
+ return
+ }
+ if (!patternHeight.value) {
+ ElMessage.error(t('film.inheight'))
+ return
+ }
+ if (!patternThickness.value) {
+ ElMessage.error(t('film.inthickness'))
+ return
+ }
+ if (!filmsId.value) {
+ ElMessage.error(t('film.infilms'))
+ return
+ }
+ if (!remainQuantity.value) {
+ ElMessage.error(t('film.inquantity'))
+ return
+ }
+ if (!slot.value) {
+ ElMessage.error(t('film.selectwarehousing'))
+ return
+ }
try {
const response = await request.post('/glassStorage/rawGlassStorageDetails/patternWarehousing', {
patternWidth: patternWidth.value,
@@ -278,6 +307,10 @@
};
// 鍏ュ簱璇锋眰
const handleupc = async () => {
+ if (!leftingStation.value) {
+ ElMessage.error(t('film.selectwarehousing'))
+ return
+ }
try {
var url="/glassStorage/rawGlassStorageDetails/warehousingRequest?leftingStation="+leftingStation.value;
const response = await request.post(url)
@@ -295,6 +328,10 @@
}
// 鍑哄簱璇锋眰
const handleupe = async () => {
+ if (!leftingStation.value) {
+ ElMessage.error(t('film.selectwarehousing'))
+ return
+ }
try {
var url="/glassStorage/rawGlassStorageDetails/outWarehousingRequest?leftingStation="+leftingStation.value;
const response = await request.post(url)
@@ -388,6 +425,26 @@
const Editclick = async () => {
let slot = window.localStorage.getItem('slot')
let deviceId = window.localStorage.getItem('deviceId')
+ if (!patternWidth.value) {
+ ElMessage.error(t('film.inwidth'))
+ return
+ }
+ if (!patternHeight.value) {
+ ElMessage.error(t('film.inheight'))
+ return
+ }
+ if (!patternThickness.value) {
+ ElMessage.error(t('film.inthickness'))
+ return
+ }
+ if (!filmsId.value) {
+ ElMessage.error(t('film.infilms'))
+ return
+ }
+ if (!remainQuantity.value) {
+ ElMessage.error(t('basicData.selectquantity'))
+ return
+ }
try {
const response = await request.post('/glassStorage/rawGlassStorageDetails/updateQuantity', {
deviceId: deviceId,
@@ -898,7 +955,7 @@
.img-dlpl{
margin-left: 330px;
margin-top: 10px;
- background-image:url('../../assets/ypcc.png');
+ background-image:url('/ypcc.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 450px;
@@ -911,7 +968,7 @@
}
.img-car1{
display: flex;
- background-image:url('../../assets/C1.png');
+ background-image:url('/C1.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
--
Gitblit v1.8.0