From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identify.vue | 235 +++++++++++++++++++++++-----------------------------------
1 files changed, 93 insertions(+), 142 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index a63c022..461d622 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,8 +1,9 @@
<template>
<div style="height: 500px;">
<div style="display: flex;">
- <el-input v-model="inputValue" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')" @blur="handleBlur"/>
- <el-pagination
+ <el-input v-model="engineerId" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')" @blur="handleBlur"/>
+ <el-button type="primary" style="margin-left: 10px;margin-top: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
+ <el-pagination
v-model:current-page="currentPage"
:page-size="pageSize"
:size="size"
@@ -12,36 +13,46 @@
@current-change="handleCurrentChange"
style="margin-top: 10px;"
/>
- </div>
+ </div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
<el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
v-for="(rect, index) in adjustedRects"
- :key="rect.glass_id"
+ :key="rect.glassId"
class="rect"
- @click="showDialog(rect.glass_id)"
+ @click="showDialog(rect.glassId)"
:style="{ position: 'absolute',
- top: `${rect.y_axis}px`, left: `${rect.x_axis}px`, width: `${rect.width}px`, height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.glass_state)
+ top: `${rect.yaxisa}px`, left: `${rect.xaxisa}px`, width: `${rect.width}px`, height: `${rect.height}px`,
+ backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
}"
>
- <!-- 绠ご -->
- <!-- <div id="arrow"></div>
- <div id="line"></div> -->
<div class="centered-text">
- <div>{{ rect.glass_id }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <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>
</div>
</div>
</el-scrollbar>
<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
- <el-button :disabled="currentGlassRect?.glass_state === 8 || currentGlassRect?.glass_state === 9" type="warning"
+ <el-select
+ :placeholder="$t('workOrder.cway')"
+ clearable
+ style="width: 140px;margin-left: 10px;margin-bottom: 10px;"
+ v-model="patternSequence">
+ <el-option
+ v-for="item in optionsb"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ <el-button :disabled="!patternSequence || currentGlassRect?.state === 8 || currentGlassRect?.state === 9" type="warning"
plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
- <el-button :disabled="currentGlassRect?.glass_state === 9 || currentGlassRect?.glass_state === 8" type="danger"
+ <el-button :disabled="!patternSequence || currentGlassRect?.state === 9 || currentGlassRect?.state === 8" type="danger"
plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
<el-icon class="el-icon--right">
<Upload/>
@@ -61,11 +72,9 @@
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const blind = ref(false)
-const olWidth = ref();
-const olHeight = ref();
-const glass_id = ref();
-const inputValue = ref('');
-const currentGlassId = ref(null); // 瀛樺偍褰撳墠鐐瑰嚮鐭╁舰鐨� glass_id
+const engineerId = ref();
+const patternSequence = ref();
+const currentGlassId = ref(null);
const currentstate = ref(null);
const adjustedRects = ref([]);
const raw = ref([]);
@@ -76,15 +85,15 @@
const disabled = false;
const size = 'small';
const rawData = ref([]);
-// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glass_id
+// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glassId
const currentGlassRect = computed(() => {
- return adjustedRects.value.find(rect => rect.glass_id === currentGlassId.value);
+ return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
});
function showDialog(glassId: number) {
currentGlassId.value = glassId;
blind.value = true;
adjustedRects.value = adjustedRects.value.map(rect =>
- rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ rect.glassId === glassId ? { ...rect, isActive: true } : rect
);
}
const handleDialogClose = () => {
@@ -97,18 +106,18 @@
const handleDamage = async () => {
try {
const response = await request.post('/cacheGlass/taskCache/identControls', {
- glassId: currentGlassId.value,
- state: 8,
- line: 1001,
- workingProcedure: '鍒囧壊',
+ glassId: currentGlassId.value,
+ state: 8,
+ line: patternSequence.value,
+ remark: '鎺扮墖',
+ workingProcedure: '鍒囧壊',
})
if (response.code == 200) {
ElMessage.success(response.message);
blind.value = false;
+ patternSequence.value = ''
updateRectStatus(currentGlassId.value, 8);
- findEngineering()
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
}
@@ -121,16 +130,17 @@
const handleManualTake = async () => {
try {
const response = await request.post('/cacheGlass/taskCache/identControls', {
- glassId: currentGlassId.value,
- state: 9,
- line: 1001,
- workingProcedure: '鍒囧壊',
+ glassId: currentGlassId.value,
+ state: 9,
+ line: patternSequence.value,
+ workingProcedure: '鍒囧壊',
+ remark: '鎺扮墖',
})
if (response.code == 200) {
ElMessage.success(response.message);
blind.value = false;
+ patternSequence.value = ''
updateRectStatus(currentGlassId.value, 9);
- findEngineering()
} else {
ElMessage.error(response.msg);
}
@@ -139,61 +149,50 @@
console.error(error);
}
}
-const handleBlur = async () => {
- if (inputValue.value) {
- var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
+const sethistorical = async () => {
+ var url="/cacheGlass/taskCache/queryCutDrawingByEngineerId?engineerId="+engineerId.value+ "&patternSequence=" + 1;
const response = await request.post(url)
if (response.code === 200) {
- const rawRects = response.data[0];
+
+ const rawRects = response.data.currentCutDrawing;
rawData.value = response.data;
- totalPages.value = rawData.value.length;
+ totalPages.value = response.data.totalPatternSequence;
+ const scaleFactor = 1621.78/6000;
+ const scaleFactory = 750/3300;
+ adjustedRects.value = rawRects.map(rect => ({
+ ...rect,
+ xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
+ yaxisa: rect.yaxis * scaleFactory * 1.1,
+ width: rect.edgWidth * scaleFactor * 1.1,
+ widtha: rect.edgWidth ,
+ heighta: rect.edgHeight ,
+ height: rect.edgHeight * scaleFactory * 1.1,
+ state: rect.state
+ }));
+ currentPage.value = 1;
+ }
+};
+const handleCurrentChange = async(val: number) => {
+ currentPage.value = val;
+ var url="/cacheGlass/taskCache/queryCutDrawingByEngineerId?engineerId="+engineerId.value+ "&patternSequence=" + currentPage.value;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ const rawRects = response.data.currentCutDrawing;
+ console.log(response.data);
+ rawData.value = response.data;
const scaleFactor = 1621.78/6000;
const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
- x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * scaleFactory,
- width: rect.width * scaleFactor ,
- widtha: rect.width ,
- heighta: rect.height ,
- height: rect.height * scaleFactory,
- glass_state: rect.glass_state
- }));
- if (webSocket) {
- webSocket.close();
- webSocket = null;
- }
- currentPage.value = 1;
- }
- } else{
- connectWebSocket();
- }
-};
-const findEngineering = async () => {
- if (inputValue.value) {
- var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
- const response = await request.post(url)
- if (response.code === 200) {
- rawData.value = response.data;
- }
- } else{
- }
-};
-const handleCurrentChange = (val: number) => {
- currentPage.value = val;
- const page = currentPage.value - 1
- const scaleFactor = 1621.78/6000;
- const scaleFactory = 750/3300;
- adjustedRects.value = rawData.value[page]?.map(rect => ({
- ...rect,
- x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * scaleFactory,
- width: rect.width * scaleFactor ,
- widtha: rect.width ,
- heighta: rect.height ,
- height: rect.height * scaleFactory,
- glass_state: rect.glass_state
- }));
+ xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
+ yaxisa: rect.yaxis * scaleFactory * 1.1,
+ width: rect.edgWidth * scaleFactor * 1.1,
+ widtha: rect.edgWidth ,
+ heighta: rect.edgHeight ,
+ height: rect.edgHeight * scaleFactory * 1.1,
+ state: rect.state
+ }));
+ }
};
function getRectColor(state: number): string {
switch (state) {
@@ -211,72 +210,24 @@
return '#f3d19e';
}
}
+const optionsb = [
+ {
+ value: 1,
+ label: t('sorter.onesort'),
+ },
+ {
+ value: 2,
+ label: t('sorter.twosort'),
+ },
+]
// 鏇存柊鐭╁舰鐘舵��
function updateRectStatus(glassId: string, status: number) {
adjustedRects.value.forEach(rect => {
- if (rect.glass_id === glassId) {
- rect.glass_state = status; // 鏇存柊鐭╁舰鐨勭姸鎬�
+ if (rect.glassId === glassId) {
+ rect.state = status; // 鏇存柊鐭╁舰鐨勭姸鎬�
}
});
}
-const connectWebSocket = () => {
- if (!webSocket) {
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
- webSocket = new WebSocket(socketUrl);
- webSocket.onmessage = (event) => {
- const data = JSON.parse(event.data);
- const scaleFactor = 1621.78/6000;
- const scaleFactory = 750/3300;
- if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
- const newRects = data.currentCutTerritory[0].map(rect => {
- const existingRect = adjustedRects.value.find(r => r.glass_id === rect.glass_id);
-
- if (existingRect) {
- return {
- ...existingRect,
- x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * scaleFactory,
- width: rect.width * scaleFactor,
- height: rect.height * scaleFactory,
- widtha: rect.width,
- heighta: rect.height,
- glass_state: rect.glass_state,
- // 淇濇寔 isActive 鐘舵�佷笉鍙�
- };
- } else {
- // 濡傛灉涓嶅瓨鍦紝鍒欐坊鍔犳柊鐭╁舰锛岄粯璁� isActive 涓� false
- return {
- ...rect,
- x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * scaleFactory,
- width: rect.width * scaleFactor,
- height: rect.height * scaleFactory,
- widtha: rect.width,
- heighta: rect.height,
- glass_state: rect.glass_state,
- isActive: false,
- glass_id: rect.glass_id,
- };
- }
- });
- adjustedRects.value = newRects;
- } else if (data.currentCutTerritory == '') {
- adjustedRects.value = [];
- }
- };
- }
-};
-onMounted(() => {
- // 鍒濆鏃讹紝濡傛灉杈撳叆妗嗕负绌猴紝鍒欒繛鎺ebSocket
- if (!inputValue.value) {
- connectWebSocket();
- }
-});
-onUnmounted(() => {
- if (webSocket) {
- webSocket.close();
- }
-});
</script>
<style scoped>
.rect {
@@ -286,7 +237,7 @@
justify-content: center;
align-items: center;
height: 100%;
- font-size: small;
+ /* font-size: large; */
}
#rect {
position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
--
Gitblit v1.8.0