From dd134cc5bb387b03afc67d6ac9ef58d5414bad56 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 26 九月 2024 15:03:52 +0800
Subject: [PATCH] 原片仓储所有显示的接口以及前端调用
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 106 ++++++++++++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 54 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index d34ea16..d633e6f 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -41,14 +41,6 @@
taskType: '',
taskState: '',
});
-// const response = await request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest", {
-// beginDate: timeRange.value[0],
-// endDate: timeRange.value[1],
-// taskState: stateList,
-// taskType: celllist
-// })
-// if (response.code === 200) {
-// // tableDataa.value = response.data;
request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest",{
beginDate: "2022-01-01 00:00:00",
endDate: "2025-01-01 00:00:00",
@@ -62,13 +54,12 @@
}
});
onMounted(() => {
+ // closeWebSocket();
+ debugger
+ // console.log("--------------webSocket")
socket = initializeWebSocket(socketUrl, handleMessage);
});
- onUnmounted(() => {
- if (socket) {
- closeWebSocket(socket);
- }
- });
+
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/rawGlass`;
const handleMessage = (data) => {
@@ -79,8 +70,28 @@
tableDatab.value = data.rawStationDetailsList[0]
}
};
+// 淇敼鏁伴噺
+const handleConfirmb = async () => {
+ let slotId = window.localStorage.getItem('slotId')
+ try {
+ const response = await request.post('/glassStorage/rawGlassStorageDetails/updateQuantity', {
+ slotId: slotId,
+ remainQuantity: remainQuantity.value,
+ }
+ );
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ dialogFormVisiblec.value = false;
+ tableDatab.value = response.data;
+ } else {
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+};
// 鍒犻櫎
- const opena = async(row) => {
+ const deleteWarehousing = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('film.dedelete'),
@@ -92,7 +103,10 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/loadGlass/sys/user/deleteUser", [row.id])
+ const response = await request.post("/glassStorage/rawGlassStorageDetails/deleteWarehousing",[row.slotId])
+ // const response = await request.post("/glassStorage/rawGlassStorageDetails/deleteWarehousing",{
+ // slotId: row.slotId
+ // })
if (response.code === 200) {
ElMessage.success(response.message);
} else {
@@ -103,30 +117,7 @@
console.error('鍙戠敓閿欒:', error);
}
};
- // 绂佺敤
- const openb = async(row) => {
- try {
- const confirmResult = await ElMessageBox.confirm(
- t('film.dedisable'),
- t('productStock.prompt'),
- {
- confirmButtonText: t('productStock.yes'),
- cancelButtonText: t('productStock.cancel'),
- type: 'warning',
- }
- );
- if (confirmResult === 'confirm') {
- const response = await request.post("/loadGlass/sys/user/deleteUser", [row.id])
- if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.msg);
- }
- }
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
- }
-};
+
// 鍑哄簱
const openc = async(row) => {
try {
@@ -140,12 +131,12 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/loadGlass/sys/user/deleteUser", [row.id])
+ const response = await request.post("/glassStorage/rawGlassStorageDetails/outWarehousing",[row.slotId])
if (response.code === 200) {
ElMessage.success(response.message);
} else {
ElMessage.error(response.msg);
- }
+ }
}
} catch (error) {
console.error('鍙戠敓閿欒:', error);
@@ -188,7 +179,7 @@
patternThickness: patternThickness.value,
filmsId: filmsId.value,
remainQuantity: remainQuantity.value,
- slot: slot.value,
+ slotId: slot.value,
});
if (response.code === 200) {
ElMessage.success(response.message);
@@ -207,26 +198,28 @@
}
};
// 鏄惁绂佺敤
-const toggleEnableState = async (row: any) => {
+const toggleEnableState = async (row: any) => {
if (!row.deviceId) {
ElMessage.error(t('basicData.updatanull'));
return;
}
- const newState = row.enableState === 1 ? 0 : 1;
- try {
- // 鍙戦�佽姹傚埌鍚庣鏇存柊鐘舵��
- const response = await request.post('/glassStorage/rawGlassStorageDetails/updateEnableState', { deviceId: row.deviceId, enableState: newState });
+ const newState = row.state === 1 ? 0 : 1;
+ try {
+ var url="/glassStorage/rawGlassStorageStation/updateSlotState?slot="+row.deviceId + "&state=" + newState;
+ const response = await request.post(url)
if (response.code === 200) {
ElMessage.success(response.message);
- row.enableState = newState;
+ row.state = newState;
} else {
ElMessage.error(response.message);
}
- } catch (error) {
+ row.state = newState;
+} catch (error) {
ElMessage.error(t('basicData.glassnull'));
}
};
const handleEdit = (row) => {
+ window.localStorage.setItem('slotId', row.slotId)
dialogFormVisiblec.value = true;
};
function getStatusType1(taskType) {
@@ -269,6 +262,11 @@
return t('film.finish');//瀹屾垚
}
}
+// onUnmounted(() => {
+// if (socket) {
+// closeWebSocket(socket);
+// }
+// });
onBeforeUnmount(() => {
closeWebSocket();
});
@@ -349,21 +347,21 @@
align="center"
:label="$t('film.enablestate')"
min-width="80"
- prop="enablestate"
+ prop="state"
>
<template #default="scope">
<el-tag
- :type="scope.row.enableState == 1 ? 'success' : 'danger'"
+ :type="scope.row.state == 1 ? 'success' : 'danger'"
@click="toggleEnableState(scope.row)"
>
- {{ scope.row.enableState == 1 ? $t('film.start') : $t('film.disable')}}
+ {{ scope.row.state == 1 ? $t('film.start') : $t('film.disable')}}
</el-tag>
</template>
</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 size="mini" type="text" plain @click="opena(scope.row)">{{ $t('film.delete') }}</el-button>
+ <el-button size="mini" type="text" plain @click="deleteWarehousing(scope.row)">{{ $t('film.delete') }}</el-button>
<el-button size="mini" type="text" plain @click="openc(scope.row)">{{ $t('film.outbound') }}</el-button>
</template>
</el-table-column>
@@ -450,7 +448,7 @@
<el-form size="mini" label-width="100px">
<el-form label-width="210px" label-position="right">
<el-form-item :label="$t('film.thickremainquantity')" :required="true" style="width: 25vw">
- <el-input v-model="workstationId" autocomplete="off" />
+ <el-input v-model="remainQuantity" autocomplete="off" />
</el-form-item>
</el-form>
</el-form>
--
Gitblit v1.8.0