From a8c1dd008f9a096cb01774f17a8bceda5aafed88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 二月 2025 15:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 441 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 266 insertions(+), 175 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index f87eb50..868c247 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -1,43 +1,166 @@
-<script setup>
-import {onBeforeUnmount, onMounted, onUnmounted, ref} from "vue";
+<template>
+ <div style="height: 500px;">
+ <div style="display: flex;">
+ <el-input v-model="engineerId" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')" @blur="handleBlur"/>
+ <el-button type="primary" style="margin-left: 10px;margin-top: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
+ <el-pagination
+ v-model:current-page="currentPage"
+ :page-size="pageSize"
+ :size="size"
+ :disabled="disabled"
+ layout="prev, pager, next, jumper"
+ :total="totalPages"
+ @current-change="handleCurrentChange"
+ style="margin-top: 10px;"
+ />
+ </div>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
+ <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
+ <div style="position: relative;">
+ <div
+ v-for="(rect, index) in adjustedRects"
+ :key="rect.glassId"
+ class="rect"
+ @click="showDialog(rect.glassId)"
+ :style="{ position: 'absolute',
+ top: `${rect.y}px`, left: `${rect.x}px`, width: `${rect.width}px`, height: `${rect.height}px`,
+ backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.status)
+ }"
+ >
+ <div class="centered-text">
+ <div style="font-size: 20px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 20px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ </div>
+ </div>
+ </div>
+ </el-scrollbar>
+ <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
+ <el-button :disabled="currentGlassRect?.status === 8 || currentGlassRect?.status === 9" type="warning"
+ plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
+ {{ $t('order.dilapidation') }}
+ </el-button>
+ <el-button :disabled="currentGlassRect?.status === 9 || currentGlassRect?.status === 8" type="danger"
+ plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
+ <el-icon class="el-icon--right">
+ <Upload/>
+ </el-icon>
+ {{ $t('order.takeaway') }}
+ </el-button>
+ </el-dialog>
+ </el-card>
+ </div>
+</template>
+<script setup lang="ts">
import {ElMessage} from 'element-plus'
+import {computed, onMounted, onUnmounted, ref} from 'vue';
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
-import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
-const adjustedRects = ref([]);
-const currentGlassId = ref(null);
-const currenttemperingFeedSequence = ref(null);
-const currentRect = ref(null);
-const canSelectProject = ref(true);
-const dialogFormVisible = ref(true)
-const dialogFormVisiblea = ref(false)
+import {useI18n} from 'vue-i18n'
+const {t} = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
const blind = ref(false)
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
- break
+const engineerId = ref();
+const currentGlassId = ref(null);
+const currentstate = ref(null);
+const adjustedRects = ref([]);
+const raw = ref([]);
+let webSocket: WebSocket | null = null;
+const totalPages = ref(0);
+const pageSize = ref(1);
+const currentPage = ref('');
+const disabled = false;
+const size = 'small';
+const rawData = ref([]);
+// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glassId
+const currentGlassRect = computed(() => {
+ return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
+});
+function showDialog(glassId: number) {
+ currentGlassId.value = glassId;
+ blind.value = true;
+ adjustedRects.value = adjustedRects.value.map(rect =>
+ rect.glassId === glassId ? { ...rect, isActive: true } : rect
+ );
+}
+const handleDialogClose = () => {
+ adjustedRects.value = adjustedRects.value.map(rect => ({
+ ...rect,
+ isActive: false
+ }));
+}
+// 鐮存崯
+const handleDamage = async () => {
+ try {
+ const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
+ glassId: currentGlassId.value,
+ line: 4001,
+ status: 8,
+ workingProcedure: '閽㈠寲',
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ blind.value = false;
+ updateRectStatus(currentGlassId.value, 8);
+ } else {
+ ElMessage.error(response.msg);
}
- case 'delete':{
- break
- }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
}
}
-let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
-const handleMessage = (data) => {
- if (data.overGlass && data.overGlass.length > 0) {
- // 鎻愬彇鏂扮殑鐭╁舰ID
- const newGlassIds = new Set(data.overGlass[0].map(rect => rect.glassId));
- // 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
- const existingRects = adjustedRects.value.filter(rect => newGlassIds.has(rect.glassId));
- // 璁＄畻鏂扮殑鐭╁舰
- const newRects = data.overGlass[0].map(rect => {
- const scaleFactor = 1390/5190;
+ // 浜哄伐鎷胯蛋
+const handleManualTake = async () => {
+ try {
+ const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
+ glassId: currentGlassId.value,
+ line: 4001,
+ status: 9,
+ workingProcedure: '閽㈠寲',
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ blind.value = false;
+ updateRectStatus(currentGlassId.value, 9);
+ } else {
+ ElMessage.error(response.msg);
+ }
+}
+catch (error) {
+ console.error(error);
+ }
+}
+const sethistorical = async () => {
+ search()
+ fetchTableData()
+}
+const fetchTableData = async () => {
+ try {
+ const response = await request.post("/temperingGlass/temperingGlassInfo/selectTempering", {
+ engineerId: engineerId.value,
+ })
+ if (response.code === 200) {
+ totalPages.value = response.data.id;
+}
+ } catch (error) {
+ ElMessage.error(response.message);
+ }
+};
+const search = async () => {
+ const response = await request.post('/temperingGlass/temperingGlassInfo/selectTemperingGlass', {
+ engineerId: engineerId.value,
+ temperingLayoutId: 1
+ })
+ if (response.code === 200) {
+ const scaleFactor = 1621.78/6000;
+ const scaleFactory = 750/2800;
+ const adjustedRectsData = response.data.map(rect => {
+ const scaleFactor = 1621.78/6000;
const scaleFactorY = 750/2800;
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
- let newX = rect.yCoordinate;
-
+ let adjustedWidth, adjustedHeight,widtha,heighta;;
+ let newX = rect.ycoordinate;
if (rect.width < rect.height) {
widtha = rect.height;
heighta = rect.width;
@@ -45,168 +168,136 @@
widtha = rect.width;
heighta = rect.height;
}
- if (rect.angle === 0) {
+ if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * scaleFactorY;
- } else {
+ adjustedHeight = heighta * scaleFactorY;
+ newX = 6000 - (rect.ycoordinate + widtha);
+ } else {
adjustedWidth = heighta * scaleFactor;
adjustedHeight = widtha * scaleFactorY;
+ newX = 6000 - (rect.ycoordinate + heighta);
}
return {
...rect,
- xcoordinate: newX * scaleFactor,
- ycoordinate: rect.xCoordinate * scaleFactorY,
+ x: newX * scaleFactor,
+ y: rect.xcoordinate* scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
}
});
- // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
- adjustedRects.value = existingRects.map(oldRect => {
- const newRect = newRects.find(r => r.glassId === oldRect.glassId);
- if (newRect) {
- return { ...oldRect, ...newRect, isActive: oldRect.isActive };
- }
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
- }
- else if (data.overGlass == null) {
- adjustedRects.value = []
- }
+ adjustedRects.value = adjustedRectsData;
+ currentPage.value = 1;
+ }
};
-function updateRectColors() {
+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
+ })
+ if (response.code === 200) {
+ const scaleFactor = 1621.78/6000;
+ const scaleFactory = 750/2800;
+ const adjustedRectsData = response.data.map(rect => {
+ const scaleFactor = 1621.78/6000;
+ const scaleFactorY = 750/2800;
+ let adjustedWidth, adjustedHeight,widtha,heighta;;
+ let newX = rect.ycoordinate;
+ if (rect.width < rect.height) {
+ widtha = rect.height;
+ heighta = rect.width;
+ }else {
+ widtha = rect.width;
+ heighta = rect.height;
+ }
+ if (rect.angle === 0) {
+ adjustedWidth = widtha * scaleFactor;
+ adjustedHeight = heighta * scaleFactorY;
+ newX = 6000 - (rect.ycoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * scaleFactor;
+ adjustedHeight = widtha * scaleFactorY;
+ newX = 6000 - (rect.ycoordinate + heighta);
+ }
+ return {
+ ...rect,
+ x: newX * scaleFactor,
+ y: rect.xcoordinate* scaleFactorY,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: rect.width,
+ heighta: rect.height,
+ }
+ });
+ adjustedRects.value = adjustedRectsData;
+ }
+};
+function getRectColor(status: number): string {
+ switch (status) {
+ case -1:
+ return '#CDAF95';
+ case 0:
+ return '#7AC5CD';
+ case 1:
+ return '#95d475';
+ case 2:
+ return 'lightblue';
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
+ case 8:
+ return '#911005';
+ case 9:
+ return '#4682B4';
+ }
+}
+// 鏇存柊鐭╁舰鐘舵��
+function updateRectStatus(glassId: string, status: number) {
adjustedRects.value.forEach(rect => {
if (rect.glassId === glassId) {
- rect.state = 8;
- }
+ rect.status = status; // 鏇存柊鐭╁舰鐨勭姸鎬�
+ }
});
-}
-function getRectColora(state) {
- switch (state) {
- case 3:
- return '#eebe77';
- case 4:
- return '#CD6090';
- case 8:
- return '#911005';
- }
}
-function showDialog(rect) {
- const index = adjustedRects.value.findIndex(r => r.glassId === rect.glassId);
- if (index !== -1) {
- adjustedRects.value[index].isActive = true;
- }
- currentGlassId.value = rect.glassId;
- currenttemperingFeedSequence.value = rect.temperingFeedSequence;
- blind.value = true;
- currentRect.value = rect;
- if (currentRect.value.state == 8) {
- canSelectProject.value = false;
- } else if (currentRect.value.state !== 8) {
- canSelectProject.value = true;
- }
-}
-const handleDialogClose = () => {
- adjustedRects.value.forEach(rect => {
- rect.isActive = false;
- });
- blind.value = false;
-};
-// 鐮存崯
-const handleDamage = async () => {
- try {
- const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
- glassId: currentGlassId.value,
- line: 4001,
- status: 8,
- workingProcedure: '閽㈠寲',
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- blind.value = false;
- updateRectColors();
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
-onMounted(() => {
- socket = initializeWebSocket(socketUrl, handleMessage);
-});
- onUnmounted(() => {
- if (socket) {
- closeWebSocket(socket);
- }
- });
-onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
- closeWebSocket();
-});
-</script>
-<template>
- <div style="height: 500px;">
- <div style="margin-top: 10px;">
- <div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;"
- v-loading="loading">
- <div v-if="adjustedRects.length > 0">
- <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{
- adjustedRects[0].temperingLayoutId
- }}
- </div>
- <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
- <div style="position: relative;">
- <div
- v-for="(rect, index) in adjustedRects"
- :key="index"
- @click="showDialog(rect)"
- class="rect"
- :style="{ position: 'absolute', top: `${rect.ycoordinate}px`, left: `${rect.xcoordinate}px`,
- width: `${rect.width}px`, height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state)
- }">
- <div class="centered-text">
- <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
- <div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
- <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
- </div>
- </div>
- </div>
- </el-scrollbar>
- </div>
- </el-card>
- </div>
- <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
- <el-button :disabled="!canSelectProject" type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;">
- {{ $t('order.dilapidation') }}
- </el-button>
- </el-dialog>
-</div>
-</div>
-</template>
-<style scoped>
-#boxa{
- border: 1px solid rgb(119, 116, 116);
- background-color: #529b2e;
- text-align: center;
- display: inline-block;
- margin-left: 20px;
- margin-top: 70px;
- margin-bottom: 50px;
-}
+</script>
+<style scoped>
.rect {
border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
- background-color: lightblue;
}
.centered-text {
- /* display: flex; */
- justify-content: center;
- align-items: center;
- height: 100%;
- font-size: small;
-}
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+ /* font-size: large; */
+}
+#rect {
+ position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
+}
+
+#arrow {
+ position: absolute;
+ top: 70%; /* 绠ご浣嶄簬鐭╁舰涓棿 */
+ left: 200px; /* 绠ご鍦ㄧ煩褰㈠乏渚т竴浜涜窛绂� */
+ transform: translateY(-50%); /* 鍨傜洿灞呬腑 */
+ width: 0;
+ height: 0;
+ border-top: 10px solid transparent; /* 涓婅竟妗� */
+ border-bottom: 10px solid transparent; /* 涓嬭竟妗� */
+ border-right: 20px solid #911005; /* 鍙宠竟妗嗭紝褰㈡垚绠ご */
+}
+
+#line {
+ position: absolute;
+ top: 70%; /* 鐩寸嚎浣嶄簬鐭╁舰涓棿 */
+ left: 210px; /* 鐩寸嚎鍦ㄧ澶村彸渚т竴浜涜窛绂� */
+ transform: translateY(-50%); /* 鍨傜洿灞呬腑 */
+ height: 2px; /* 鐩寸嚎鐨勯珮搴� */
+ width: 240px; /* 鐩寸嚎鐨勯暱搴︼紝鏍规嵁闇�瑕佽皟鏁� */
+ background-color: #911005; /* 鐩寸嚎鐨勯鑹� */
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0