From 73fe3c5574c8fbb7b18fa9b76d53b918f6f921e1 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 12 十一月 2025 11:09:04 +0800
Subject: [PATCH] 更换前端打包方式，将ip地址配置提取到public
---
UI-Project/src/views/Identify/identifwu.vue | 96 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 18 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwu.vue b/UI-Project/src/views/Identify/identifwu.vue
index 6cfefd6..ed5edab 100644
--- a/UI-Project/src/views/Identify/identifwu.vue
+++ b/UI-Project/src/views/Identify/identifwu.vue
@@ -1,7 +1,10 @@
<template>
- <div style="height: 500px;">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;">
- <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}锛歿{ ava }}-{{ avanum }} </div>
+ <div style="height: 600px;">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 850px;">
+ <div style="display: flex;margin-left: 40%;margin-bottom: 5px;">
+ <div style="text-align: center;"> {{ $t('processCard.layoutID') }}锛歿{ ava }}-{{ avanum }} </div>
+ <el-button @click="handleAllDamage" style="margin-left: 80%;margin-top: -5px;">{{$t('order.dilapidation')}}</el-button>
+ </div>
<el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
@@ -14,9 +17,9 @@
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
}">
<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 style="font-size: 10px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 10px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -38,7 +41,7 @@
</div>
</template>
<script setup lang="ts">
-import {avatarEmits, ElMessage} from 'element-plus'
+import {avatarEmits, ElMessage, ElMessageBox } from 'element-plus'
import {onBeforeUnmount, computed, onMounted, onUnmounted, ref} from 'vue';
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
@@ -51,6 +54,8 @@
const adjustedRects = ref([]);
const ava = ref('');
const avanum = ref('');
+const realwidth = ref('');
+const realheight = ref('');
let socket = null;
const currentGlassRect = computed(() => {
return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
@@ -68,6 +73,47 @@
isActive: false
}));
}
+// 涓�閿牬鎹熸墍鏈夌幓鐠�
+const handleAllDamage = async () => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('order.dilapidationWhether'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ // 绛涢�夊嚭state涓嶆槸8鍜�9鐨勭幓鐠僆D
+ const glassIdList = adjustedRects.value
+ .filter(rect => rect.state !== 8 && rect.state !== 9)
+ .map(rect => rect.glassId);
+ if (glassIdList.length === 0) {
+ ElMessage.warning(t('order.noGlassToDamage')); // 娌℃湁鍙牬鎹熺殑鐜荤拑
+ return;
+ }
+ const response = await request.post('/cacheGlass/taskCache/identControlsByPatternSequence', {
+ glassIdList: glassIdList,
+ state: 8,
+ line: 1,
+ workingProcedure: '鍒囧壊',
+ remark: '鎺扮墖'
+ });
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ // 鏇存柊鎵�鏈夌幓鐠冪姸鎬�
+ glassIdList.forEach(glassId => {
+ updateRectStatus(glassId, 8);
+ });
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
+ ElMessage.error(t(''));
+ }
+};
// 鐮存崯
const handleDamage = async () => {
try {
@@ -140,7 +186,7 @@
}
});
}
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/currentCutDrawingOne`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/cacheGlass/api/talk/currentCutDrawingOne`;
const handleMessage = (data: any) => {
if (data.engineer != null) {
ava.value = data.engineer[0]
@@ -152,18 +198,32 @@
}else{
avanum.value = ''
}
- const scaleFactor = 1621.78 / 6000;
- const scaleFactory = 750 / 3300;
+ console.log(data.upPattenUsage);
+ console.log(data.currentCutTerritory);
+ if (data.upPattenUsage && data.upPattenUsage.length > 0) {
+ realwidth.value = data.upPattenUsage[0].width;
+ realheight.value = data.upPattenUsage[0].height;
+ const realx = realwidth.value;
+ const realy = realheight.value;
+ window.localStorage.setItem('widthreturna', realy)
+ const scaleFactora = 1621.78 / realx;
+ const scaleFactorya = 750 / realy;
+ window.localStorage.setItem('scaleFactorb', scaleFactora)
+ window.localStorage.setItem('scaleFactoryb', scaleFactorya)
+ }
if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
+ let scaleFactor = window.localStorage.getItem('scaleFactorb')
+ let scaleFactory = window.localStorage.getItem('scaleFactoryb')
+ let widthreturn = window.localStorage.getItem('widthreturna')
const newRects = data.currentCutTerritory[0].map(rect => {
const existingRect = adjustedRects.value.find(r => r.glassId === rect.glassId);
if (existingRect) {
return {
...existingRect,
- xAxisa: rect.xAxis * scaleFactor * 1.1,
- yAxisa: (3300 - (rect.yAxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
- width: rect.edgWidth * scaleFactor * 1.1,
- height: rect.edgHeight * scaleFactory * 1.1,
+ xAxisa: rect.xAxis * scaleFactor,
+ yAxisa: (widthreturn - (rect.yAxis + rect.edgHeight)) * scaleFactory,
+ width: rect.edgWidth * scaleFactor,
+ height: rect.edgHeight * scaleFactory,
widtha: rect.edgWidth,
heighta: rect.edgHeight,
state: rect.state,
@@ -173,10 +233,10 @@
// 濡傛灉涓嶅瓨鍦紝鍒欐坊鍔犳柊鐭╁舰锛岄粯璁� isActive 涓� false
return {
...rect,
- xAxisa: rect.xAxis * scaleFactor * 1.1,
- yAxisa: (3300 - (rect.yAxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
- width: rect.edgWidth * scaleFactor * 1.1,
- height: rect.edgHeight * scaleFactory * 1.1,
+ xAxisa: rect.xAxis * scaleFactor,
+ yAxisa: (widthreturn - (rect.yAxis + rect.edgHeight)) * scaleFactory,
+ width: rect.edgWidth * scaleFactor,
+ height: rect.edgHeight * scaleFactory,
widtha: rect.edgWidth,
heighta: rect.edgHeight,
state: rect.state,
--
Gitblit v1.8.0