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 | 287 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 224 insertions(+), 63 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 30fe865..461d622 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,84 +1,246 @@
-<template>
-<!-- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading"> -->
- <div id="app" style="margin-top: 20px;">
- <div
- :style="{ width: `${olWidth}px`, height: `${olHeight}px`,position: 'relative' }"
- >
- <div
+<template>
+ <div style="height: 500px;">
+ <div style="display: flex;">
+ <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"
+ :disabled="disabled"
+ layout="prev, pager, next, jumper"
+ :total="totalPages"
+ @current-change="handleCurrentChange"
+ style="margin-top: 10px;"
+ />
+ </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="index"
+ :key="rect.glassId"
class="rect"
- :style="{ position: 'absolute', top: `${rect.y_axis}px`, left: `${rect.x_axis}px`, width: `${rect.width}px`, height: `${rect.height}px` }"
+ @click="showDialog(rect.glassId)"
+ :style="{ position: 'absolute',
+ 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" >NG24030401B01</div> -->
<div class="centered-text">
- <div>{{ rect.process_id }}</div>
- <div style="margin-top: 50px;margin-left: -85px;">{{ rect.width }}*{{ rect.height }}</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>
- </div>
-</template>
-
-<script setup>
-import { ref, onMounted } from 'vue';
+ </el-scrollbar>
+ <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
+ <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="!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/>
+ </el-icon>
+ {{ $t('order.takeaway') }}
+ </el-button>
+ </el-dialog>
+ </el-card>
+ </div>
+</template>
+<script setup lang="ts">
+import {ElMessage} from 'element-plus'
+import {computed, onMounted, onUnmounted, ref} from 'vue';
import request from "@/utils/request"
-const olWidth = ref();
-const olHeight = ref();
-const process_id = ref(); // 鐢ㄤ簬瀛樺偍process_id鐨勫搷搴斿紡寮曠敤
-// const rects = ref([]); // 鐢ㄤ簬瀛樺偍鐭╁舰鏁版嵁鐨勫搷搴斿紡寮曠敤
+import {host, WebSocketHost} from '@/utils/constants'
+import {useI18n} from 'vue-i18n'
+const {t} = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
+const blind = ref(false)
+const engineerId = ref();
+const patternSequence = ref();
+const currentGlassId = ref(null);
+const currentstate = ref(null);
const adjustedRects = ref([]);
-onMounted(async () => {
- try {
- const response = await request.post('/cacheGlass/taskCache/currentCutTerritory'); // 鏇挎崲涓轰綘鐨凙PI绔偣
- if (response.code === 200) {
- // const process_id = response.data[0].process_id
- const rawRects = response.data; // 璁剧疆鐭╁舰鏁版嵁
- console.log(response.data);
- const { olWidth: newolWidth, olHeight: newolHeight, process_id: newprocess_id } = response.data; // 鑾峰彇灏哄
- olWidth.value = newolWidth; // 璁剧疆瀹瑰櫒瀹藉害
- olHeight.value = newolHeight; // 璁剧疆瀹瑰櫒楂樺害
- process_id.value = newprocess_id;
-
- adjustedRects.value = rawRects.map(rect => ({
- ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x_axis: (rect.x_axis*100) * 0.005, // 灏唜鍊奸櫎浠�3
- y_axis: (rect.y_axis*100) * 0.005,
- width: (rect.width*100) * 0.004 ,
- height:( rect.height*100) * 0.004 ,
- }));
- console.log(rect);
-
- // console.log( (rect.width*100) / 300 );
- } else {
- // console.error('Failed to fetch rectangles from API.');
- console.error('Failed to fetch rects from API.');
+const raw = ref([]);
+let webSocket: WebSocket | null = null;
+const totalPages = ref(0);
+const pageSize = ref(1);
+const currentPage = ref('');
+const disabled = false;
+const size = 'small';
+const rawData = ref([]);
+// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glassId
+const currentGlassRect = computed(() => {
+ 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.glassId === glassId ? { ...rect, isActive: true } : rect
+ );
+}
+const handleDialogClose = () => {
+ adjustedRects.value = adjustedRects.value.map(rect => ({
+ ...rect,
+ isActive: false
+ }));
+}
+// 鐮存崯
+const handleDamage = async () => {
+ try {
+ const response = await request.post('/cacheGlass/taskCache/identControls', {
+ 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);
+ } else {
+ ElMessage.error(response.msg);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+ // 浜哄伐鎷胯蛋
+const handleManualTake = async () => {
+ try {
+ const response = await request.post('/cacheGlass/taskCache/identControls', {
+ 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);
+ } else {
+ ElMessage.error(response.msg);
+ }
+}
+catch (error) {
+ console.error(error);
+ }
+}
+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.currentCutDrawing;
+ rawData.value = response.data;
+ 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;
}
- } catch (error) {
- // console.error('Error fetching rectangles :', error);
- console.error('Error fetching rects :', error);
- }
-});
+};
+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,
+ 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) {
+ case 0:
+ return '#e1f3d8';
+ case 100:
+ return '#c8c9cc';
+ case 110:
+ return '#b3e19d';
+ case 120:
+ return '#f89898';
+ case 8:
+ return '#911005';
+ case 9:
+ 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.glassId === glassId) {
+ rect.state = status; // 鏇存柊鐭╁舰鐨勭姸鎬�
+ }
+ });
+}
</script>
-
<style scoped>
.rect {
border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
- background-color: lightblue; /* 璁剧疆鐭╁舰鐨勮儗鏅壊 */
}
.centered-text {
- /* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
- display: flex;
justify-content: center;
- align-items: center;
- height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
-}
+ align-items: center;
+ height: 100%;
+ /* font-size: large; */
+}
#rect {
position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
- /* 鍏朵粬鏍峰紡 */
}
#arrow {
@@ -91,7 +253,6 @@
border-top: 10px solid transparent; /* 涓婅竟妗� */
border-bottom: 10px solid transparent; /* 涓嬭竟妗� */
border-right: 20px solid #911005; /* 鍙宠竟妗嗭紝褰㈡垚绠ご */
- /* 鏍规嵁闇�瑕佽皟鏁磋竟妗嗗ぇ灏忓拰棰滆壊 */
}
#line {
--
Gitblit v1.8.0