From 58e246019f9a022b0432b1e9a01798112117442e Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 26 七月 2024 16:38:37 +0800
Subject: [PATCH] 修改钢化版图颜色，调整报工管理样式
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 448 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 357 insertions(+), 91 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 38963a3..b9892b8 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -2,110 +2,360 @@
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 { ElMessage, ElMessageBox } from 'element-plus'
+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 blind = ref(false)
+const width = ref();
+const height = ref();
+const adjustedRects1 = ref([]);
+const adjustedRects2 = ref([]);
+const adjustedRectsa = ref([]);
+const adjustedRectsb = ref([]);
+const currentGlassId = ref(null);
+const currenttemperingFeedSequence = ref(null);
+const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
+const handleMessage = (data) => {
+// 杩涚倝涓�
+ if(data.intoGlass!=null){
+ adjustedRects1.value = data.intoGlass[0].map(rect => {
+ console.log( adjustedRects1.value);
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let newX = rect.yCoordinate;
+ if (rect.angle === 0) {
+ adjustedWidth = rect.height * 0.12;
+ adjustedHeight = rect.width * 0.1;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
+ newX = 5087 - (rect.xCoordinate + rect.height);
+ } else {
+ adjustedWidth = rect.width * 0.12;
+ adjustedHeight = rect.height * 0.1;
+ adjustedWidtha = rect.width;
+ adjustedHeighta = rect.height;
+ newX = 5087 - (rect.xCoordinate + rect.width);
+ }
+ return {
+ ...rect,
+ xcoordinate: newX * 0.12,
+ ycoordinate: rect.yCoordinate * 0.1,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+ });
+ }else{
+ adjustedRects1.value = ''
+ }
+ if(data.intoGlass2!=null){
+ adjustedRects2.value = data.intoGlass2[0].map(rect => {
+ console.log( adjustedRects2.value);
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let newX = rect.yCoordinate;
+ if (rect.angle === 0) {
+ adjustedWidth = rect.height * 0.12;
+ adjustedHeight = rect.width * 0.1;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
+ newX = 5087 - (rect.xCoordinate + rect.height);
+ } else {
+ adjustedWidth = rect.width * 0.12;
+ adjustedHeight = rect.height * 0.1;
+ adjustedWidtha = rect.width;
+ adjustedHeighta = rect.height;
+ newX = 5087 - (rect.xCoordinate + rect.width);
+ }
+ return {
+ ...rect,
+ xcoordinate: newX * 0.12,
+ ycoordinate: rect.yCoordinate * 0.1,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+ });
+ }else{
+ adjustedRects2.value = ''
+ }
+ // 杩涚倝鍓�
+ if(data.waitingGlass!=null){
+ adjustedRectsa.value = data.waitingGlass[0].map(rect => {
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ 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);
+ } else {
+ adjustedWidth = rect.height * 0.24;
+ adjustedHeight = rect.width * 0.16;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
+ newX = 5190 - (rect.yCoordinate + rect.height);
+ }
+ return {
+ ...rect,
+ x: newX * 0.24,
+ y: rect.xCoordinate * 0.16,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+});
+ }else{
+ adjustedRectsa.value = ''
+ }
+ // 宸插嚭鐐�
+ if(data.outGlass!=null){
+ adjustedRectsb.value = data.outGlass[0].map(rect => {
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ 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);
+ } else {
+ adjustedWidth = rect.height * 0.24;
+ adjustedHeight = rect.width * 0.16;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
+ newX = 5190 - (rect.yCoordinate + rect.height);
+ }
+ return {
+ ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
+ x: newX * 0.24,
+ y: rect.xCoordinate * 0.16,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+});
+ }else{
+ adjustedRectsb.value = ''
+ }
+};
+onMounted(() => {
+ initializeWebSocket(socketUrl, handleMessage);
+});
+function updateRectColors() {
+ adjustedRectsa.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 5;
}
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
+ });
+}
+function getRectColora(state) {
+ switch (state) {
+ case 0:
+ return '#7AC5CD';
+ case 1:
+ return '#95d475';
+ case -1:
+ return '#CDAF95';
+ case 5:
+ return '#911005';
}
}
-
-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: [
- {
+function getRectColorb(state) {
+ switch (state) {
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
+ case 5:
+ return '#911005';
+ }
+}
+// if (adjustedRectsb[0].engineerId != null) {
+// engineerIdDisplayb = adjustedRectsb[0].engineerId
+// }
+// if (adjustedRectsa[0].engineerId != null) {
+// engineerIdDisplaya = adjustedRectsa[0].engineerId
+// }
+// if (adjustedRects2[0].engineerId != null) {
+// engineerIdDisplay2 = adjustedRects2[0].engineerId
+// }
+// if (adjustedRects[0].engineerId != null) {
+// engineerIdDisplay = adjustedRects[0].engineerId
+// }
+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: 2,
+ workingProcedure: '閽㈠寲',
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ blind.value = false;
+ updateRectColors();
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.message);
}
- ],
-})
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+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="adjustedRects1.length > 0">
+ <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
+ <div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>
+ <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <div style="position: relative;max-width: 1400px;">
+ <div
+ v-for="(rect, index) in adjustedRects1"
+ :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 === 5 ? '#911005' : 'lightblue' }"
+ >
+ <div class="centered-text">
+ <div >{{ rect.glassId }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ 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].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
+ <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
+ <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <div style="position: relative;max-width: 1400px;">
+ <div
+ v-for="(rect, index) in adjustedRects2"
+ :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 === 5 ? '#911005' : 'lightblue' }"
+ >
+ <div class="centered-text">
+ <div >{{ rect.glassId }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ 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>
-</div>
+ <!-- 杩涚倝鍓� -->
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <div v-if="adjustedRectsa.length > 0">
+ <div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRectsa[0].engineerId }}-{{ adjustedRectsa[0].temperingLayoutId }} </div>
+ <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplaya }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
+ <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <div style="position: relative;max-width: 1400px;">
+ <div
+ v-for="(rect, index) in adjustedRectsa"
+ :key="index"
+ @click="showDialog(rect)"
+ class="rect"
+ :style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}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>
+ </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;height: 600px;" v-loading="loading">
+ <div v-if="adjustedRectsb.length > 0">
+ <div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRectsb[0].engineerId }}-{{ adjustedRectsb[0].temperingLayoutId }} </div>
+ <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplayb }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
+ <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <div style="position: relative;max-width: 1400px;">
+ <div
+ v-for="(rect, index) in adjustedRectsb"
+ :key="index"
+ @click="showDialog(rect)"
+ class="rect"
+ :style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
+ width: `${rect.width}px`, height: `${rect.height}px`,
+ backgroundColor: getRectColorb(rect.state) }">
+ <!-- backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }"> -->
+ <div class="centered-text">
+ <div >{{ rect.glassId }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ 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>
-
<style scoped>
#boxa{
border: 1px solid rgb(119, 116, 116);
@@ -171,4 +421,20 @@
}
}
}
+ .rect {
+ border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
+ background-color: lightblue; /* 璁剧疆鐭╁舰鐨勮儗鏅壊 */
+}
+#rect {
+ position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
+ /* 鍏朵粬鏍峰紡 */
+}
+.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