From a66b4925a2528ff23a34c3607e9c45bbbdd28e5e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 15 八月 2024 09:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 193 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 148 insertions(+), 45 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 11f2545..ee9a6a7 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -2,11 +2,19 @@
import {Search} from "@element-plus/icons-vue";
import {reactive} from "vue";
import {useRouter} from "vue-router"
+import { ElMessage, ElMessageBox } from 'element-plus'
+import request from "@/utils/request"
-import { ref } from 'vue'
+import { ref, onMounted, onBeforeUnmount,onUnmounted } from 'vue';
+import { WebSocketHost ,host} from '@/utils/constants'
+import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
+const adjustedRects = ref([]);
+const currentGlassId = ref(null);
+const currenttemperingFeedSequence = ref(null);
const dialogFormVisible = ref(true)
const dialogFormVisiblea = ref(false)
+const blind = ref(false)
const getTableRow = (row,type) =>{
switch (type) {
@@ -21,58 +29,141 @@
}
}
}
-
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },
- data: [
- {
+let socket = null;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
+// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+const handleMessage = (data) => {
+ // 鏇存柊 tableData 鐨勬暟鎹�
+ if(data.overGlass!=null){
+ adjustedRects.value = data.overGlass[0].map(rect => {
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,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 * 0.24;
+ adjustedHeight = heighta * 0.16;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ // newX = 5190 - (rect.yCoordinate + rect.width);
+ } else {
+ adjustedWidth = heighta * 0.24;
+ adjustedHeight = widtha * 0.16;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
+ // newX = 5190 - (rect.yCoordinate + rect.height);
+ }
+ return {
+ ...rect,
+ xcoordinate: newX * 0.24,
+ ycoordinate: rect.xCoordinate * 0.16,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: rect.width,
+ heighta: rect.height,
+ };
+});
+ }
+};
+function updateRectColors() {
+ adjustedRects.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 8;
}
- ],
-})
+ });
+}
+function getRectColora(state) {
+ switch (state) {
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
+ case 8:
+ return '#911005';
+ }
+}
+function showDialog(rect) {
+ currentGlassId.value = rect.glassId;
+ currenttemperingFeedSequence.value = rect.temperingFeedSequence;
+ blind.value = true;
+}
+// 鐮存崯
+const handleDamage = async () => {
+ try {
+ const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
+ glassId: currentGlassId.value,
+ // temperingFeedSequence: currenttemperingFeedSequence.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="margin-top: 10px;">
<div>
- <el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
- <div style="display: flex;margin-top: 20px;">
- <div style="margin-left: 400px;font-size: 20px;">宸ョ▼鍙凤細P20240305001 </div>
- <div style="margin-left: 150px;font-size: 20px;">鐗堝浘缂栧彿锛�1</div>
- </div>
- <div>
- <div id="boxa" style="width: 700px;height: 220px;margin-left: 260px;">
- <div style="margin-top: 85px;"> NG202405060798A01-1</div>
- <div> 500脳1500</div>
- </div>
- </div>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <!-- <el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> -->
+ <div v-if="adjustedRects.length > 0">
+ <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
+ <el-scrollbar height="550px" width="1200px" 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: getRectColora(rect.state) }">
+ <div class="centered-text">
+ <div >{{ rect.glassId }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <!-- <div style="margin-top: 25px;margin-left: -60px;">{{ 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;">
+ <el-button type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;">
+ {{ $t('order.dilapidation') }}
+ </el-button>
+ </el-dialog>
</div>
</template>
@@ -87,4 +178,16 @@
margin-top: 70px;
margin-bottom: 50px;
}
+.rect {
+ border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
+ background-color: lightblue; /* 璁剧疆鐭╁舰鐨勮儗鏅壊 */
+}
+.centered-text {
+ /* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
+ /* display: flex; */
+ justify-content: center;
+ align-items: center;
+ height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
+ font-size: small;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0