From 0d8edc55b0001c0cdd441b894aea5fcf2f880118 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 22 七月 2024 10:06:03 +0800
Subject: [PATCH] 大理片笼新增指定钢化，钢化模块调整样式
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 273 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 181 insertions(+), 92 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 38963a3..101663e 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -2,110 +2,182 @@
import {Search} from "@element-plus/icons-vue";
import {reactive} from "vue";
import {useRouter} from "vue-router"
-
-import { ref } from 'vue'
-
-const dialogFormVisible = ref(true)
-const dialogFormVisiblea = ref(false)
-
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
- break
+import request from "@/utils/request"
+import { ref, onMounted, onBeforeUnmount } from 'vue';
+import { WebSocketHost ,host} from '@/utils/constants'
+import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
+ import { useI18n } from 'vue-i18n'
+ const { t } = useI18n()
+ let language = ref(localStorage.getItem('lang') || 'zh')
+const dialogFormVisible = ref(false)
+const dialogFormVisiblea = ref(true)
+const dialogFormVisibleb = ref(false)
+const width = ref();
+const height = ref();
+const adjustedRects = ref([]);
+const adjustedRects2 = ref([]);
+const adjustedRectsa = ref([]);
+const adjustedRectsb = ref([]);
+const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
+const handleMessage = (data) => {
+// 杩涚倝涓�
+ if(data.intoGlass!=null){
+ adjustedRects.value = data.intoGlass[0].map(rect => ({
+ ...rect,
+ xcoordinate: rect.xCoordinate * 0.3,
+ ycoordinate: rect.yCoordinate * 0.3,
+ width: rect.width * 0.2,
+ height: rect.height * 0.2,
+ widtha: rect.width,
+ heighta: rect.height,
+ }));
}
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
+ if(data.intoGlass2!=null){
+ adjustedRects2.value = data.intoGlass2[0].map(rect => ({
+ ...rect,
+ xcoordinate: rect.xCoordinate * 0.3,
+ ycoordinate: rect.yCoordinate * 0.3,
+ width: rect.width * 0.2,
+ height: rect.height * 0.2,
+ widtha: rect.width,
+ heighta: rect.height,
+ }));
}
- }
-}
-
-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: [
- {
+ // 杩涚倝鍓�
+ if(data.waitingGlass!=null){
+ adjustedRectsa.value = data.waitingGlass[0].map(rect => ({
+ ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
+ x: rect.xCoordinate * 0.4,
+ y: rect.yCoordinate * 0.4,
+ width: rect.width * 0.4,
+ height: rect.height * 0.4,
+ widtha: rect.width,
+ heighta: rect.height,
+ state: rect.state,
+ }));
}
- ],
-})
+ // 宸插嚭鐐�
+ if(data.outGlass!=null){
+ adjustedRectsb.value = data.outGlass[0].map(rect => ({
+ ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
+ x: rect.xCoordinate * 0.4,
+ y: rect.yCoordinate * 0.4,
+ width: rect.width * 0.4,
+ height: rect.height * 0.4,
+ widtha: rect.width,
+ heighta: rect.height,
+ state: rect.state
+ }));
+ console.log(data.outGlass[0]);
+ }
+};
+onMounted(() => {
+ initializeWebSocket(socketUrl, handleMessage);
+});
+onBeforeUnmount(() => {
+ console.log("鍏抽棴浜�")
+ closeWebSocket();
+});
</script>
-
<template>
<div style="margin-top: 10px;">
- <el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true;dialogFormVisiblea = false">鎽嗙墖鐗堝浘</el-button>
- <el-button id="searchButton" type="success" @click="dialogFormVisiblea = true;dialogFormVisible = false">宸插嚭鐐夌幓鐠�</el-button>
+ <el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true;dialogFormVisible = false;dialogFormVisibleb = false;" >{{ $t('processCard.beforefurnace') }}</el-button>
+ <el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true;dialogFormVisiblea = false;dialogFormVisibleb = false;">{{ $t('processCard.intofurnace') }}</el-button>
+ <el-button id="searchButton" type="success" @click="dialogFormVisibleb = true;dialogFormVisible = false;dialogFormVisiblea = false">{{ $t('processCard.outfurnace') }}</el-button>
<div v-if="dialogFormVisible" >
- <el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
- <div style="display: flex;margin-bottom: 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: 400px;height: 120px;margin-left: 260px;">
- <div style="margin-top: 35px;"> NG202405060798A01-1</div>
- <div> 500脳1500</div>
- </div>
- <div id="boxa" style="width: 400px;height: 120px;">
- <div style="margin-top: 35px;"> NG202405060798A01-1</div>
- <div> 500脳1500</div>
- </div>
- </div>
- <div style="margin-top: 20px;">
- <div id="boxa" style="width: 400px;height: 120px;margin-left: 260px;">
- <div style="margin-top: 35px;"> NG202405060798A01-1</div>
- <div> 500脳1500</div>
- </div>
- <div id="boxb" style="width: 400px;height: 120px;">
- <div style="margin-top: 35px;"> NG202405060798A01-1</div>
- <div> 500脳1500</div>
- </div>
- </div>
- </el-card>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+<div style="width: 49%;float: left;background-color: #f4f4f5;height: 550px;">
+ <div v-if="adjustedRects.length > 0">
+ <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRects[0].flowCardId }}</div>
+ <el-scrollbar height="630px">
+ <div style="position: relative;width: 1400px;">
+ <div
+ v-for="(rect, index) in adjustedRects"
+ :key="index"
+ class="rect"
+ :style="{ position: 'absolute', top: `${rect.ycoordinate}px`, left: `${rect.xcoordinate}px`, width: `${rect.width}px`, height: `${rect.height}px` }"
+ >
+ <div class="centered-text">
+ <div >{{ rect.glassId }}</div>
+ <div style="text-align: center;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ </div>
+ </div>
+ </div>
+ </el-scrollbar>
+ </div>
+ </div>
+<div style="width: 49%;float: right;background-color: #f4f4f5;height: 550px;">
+ <div v-if="adjustedRects2.length > 0">
+ <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRects2[0].flowCardId }}</div>
+ <el-scrollbar height="550px">
+ <div style="position: relative;width: 1400px;">
+ <div
+ v-for="(rect, index) in adjustedRects2"
+ :key="index"
+ class="rect"
+ :style="{ position: 'absolute', top: `${rect.ycoordinate}px`, left: `${rect.xcoordinate}px`, width: `${rect.width}px`, height: `${rect.height}px` }"
+ >
+ <div class="centered-text">
+ <div >{{ rect.glassId }}</div>
+ <div style="text-align: center;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ </div>
+ </div>
+ </div>
+ </el-scrollbar>
+ </div>
+</div>
+ </el-card>
</div>
<div v-if="dialogFormVisiblea">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
- <el-scrollbar height="630px">
- <div id="home-card">
- <div id="home-item" v-for="n in 20" :key="n">
- <div id="box" style="width: 100px;height: 165px;">100*65</div>
- <div id="box" style="width: 107px;height: 150px;">107*60</div>
- <div id="box" style="width: 107px;height: 155px;">109*60</div>
- </div>
- </div>
- </el-scrollbar>
- </el-card>
+ <!-- 杩涚倝鍓� -->
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
+ <div v-if="adjustedRectsa.length > 0">
+ <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRectsa[0].flowCardId }}</div>
+ <el-scrollbar height="550px">
+ <div style="position: relative;width: 100%;height: 100%;">
+ <div
+ v-for="(rect, index) in adjustedRectsa"
+ :key="index"
+ class="rect"
+ :style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
+ width: `${rect.width}px`, height: `${rect.height}px`,
+ backgroundColor: rect.state === 0 ? '#dedfe0' : '#d1edc4' }">
+ <div class="centered-text">
+ <div>{{ rect.glassId }}</div>
+ <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ </div>
+ </div>
+ </div>
+ </el-scrollbar>
+ </div>
+ </el-card>
+</div>
+<div v-if="dialogFormVisibleb">
+ <!-- 宸插嚭鐐� -->
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
+ <div v-if="adjustedRectsb.length > 0">
+ <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRectsb[0].flowCardId }}</div>
+ <el-scrollbar height="550px">
+ <div style="position: relative;width: 1400px;">
+ <div
+ v-for="(rect, index) in adjustedRectsb"
+ :key="index"
+ class="rect"
+ :style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
+ width: `${rect.width}px`, height: `${rect.height}px`,
+ backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }">
+ <div class="centered-text">
+ <div >{{ rect.glassId }}</div>
+ <div style="text-align: center;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ </div>
+ </div>
+ </div>
+ </el-scrollbar>
+ </div>
+ </el-card>
</div>
</div>
-
</template>
-
<style scoped>
#boxa{
border: 1px solid rgb(119, 116, 116);
@@ -171,4 +243,21 @@
}
}
}
+ .rect {
+ border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
+ background-color: lightblue; /* 璁剧疆鐭╁舰鐨勮儗鏅壊 */
+}
+#rect {
+ position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
+ /* 鍏朵粬鏍峰紡 */
+}
+.centered-text {
+ /* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
+ /* display: flex; */
+ justify-content: center;
+ text-align: center;
+ align-items: center;
+ height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
+ margin-top: 60%
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0