From d62a5f34ef60949ef6bef74fd9c48c20b4e65d83 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 09 八月 2024 13:19:37 +0800
Subject: [PATCH] 钢化模块旋转更改，下片台
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 104 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 85 insertions(+), 19 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 4e372e6..166ed4a 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -2,14 +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, onMounted, onBeforeUnmount } 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) {
@@ -24,27 +29,34 @@
}
}
}
-
+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;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
let newX = rect.yCoordinate;
- if (rect.angle === 0) {
- adjustedWidth = rect.width * 0.24;
- adjustedHeight = rect.height * 0.16;
- adjustedWidtha = rect.width;
- adjustedHeighta = rect.height;
- newX = 5190 - (rect.yCoordinate + rect.width);
+ 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 = rect.height * 0.24;
- adjustedHeight = rect.width * 0.16;
- adjustedWidtha = rect.height;
- adjustedHeighta = rect.width;
- newX = 5190 - (rect.yCoordinate + rect.height);
+ adjustedWidth = heighta * 0.24;
+ adjustedHeight = widtha * 0.16;
+ adjustedWidtha = heighta;
+ adjustedHeighta = widtha;
+ // newX = 5190 - (rect.yCoordinate + rect.height);
}
return {
...rect,
@@ -58,12 +70,60 @@
});
}
};
+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(() => {
- // fetchFlowCardId();
- // fetchTableData(); // 鑾峰彇鏁版嵁
- initializeWebSocket(socketUrl, handleMessage);
+ socket = initializeWebSocket(socketUrl, handleMessage);
});
-
+ onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
+ });
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
@@ -82,10 +142,11 @@
<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.state === 4 ? '#d1edc4' : '#f8e3c5' }">
+ backgroundColor: getRectColora(rect.state) }">
<div class="centered-text">
<div >{{ rect.glassId }}</div>
<div >{{ rect.flowCardId }}</div>
@@ -98,6 +159,11 @@
</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>
--
Gitblit v1.8.0