From 7664b90f93c4862785b8c3c18ad26a0cf0eeec33 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 06 八月 2024 09:52:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/src/views/Identify/identify.vue | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index e7be5c2..59982e5 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,6 +1,20 @@
-<template>
+<template>
+ <div style="display: flex;">
+<el-input v-model="inputValue" style="margin-left: 15px;margin-top: 10px;width: 240px" placeholder="璇疯緭鍏ュ伐绋嬪彿" @blur="handleBlur"/>
+<el-pagination
+ v-model:current-page="currentPage3"
+ v-model:page-size="pageSize3"
+ :size="size"
+ :disabled="disabled"
+ :background="background"
+ layout="prev, pager, next, jumper"
+ :total="1000"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
- <el-scrollbar height="600px" >
+ <el-scrollbar height="550px" >
<div id="app" style="margin-top: 20px;">
<!-- <div
:style="{ width: `${olWidth}px`, height: `${olHeight}px`,position: 'relative',}"
@@ -41,7 +55,7 @@
<script setup lang="ts">
import { Delete, Upload } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { ref, onMounted, onBeforeUnmount,onUnmounted } from 'vue';
+import { ref, onMounted, onBeforeUnmount,onUnmounted,watchEffect } from 'vue';
import request from "@/utils/request"
import { WebSocketHost ,host} from '@/utils/constants'
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
@@ -53,7 +67,7 @@
const olHeight = ref();
const process_id = ref(); // 鐢ㄤ簬瀛樺偍process_id鐨勫搷搴斿紡寮曠敤
const glass_id = ref();
-// const rects = ref([]); // 鐢ㄤ簬瀛樺偍鐭╁舰鏁版嵁鐨勫搷搴斿紡寮曠敤
+const inputValue = ref('');
const currentGlassId = ref(null); // 瀛樺偍褰撳墠鐐瑰嚮鐭╁舰鐨� glass_id
const adjustedRects = ref([]);
// const handleBind = (row) => {
@@ -155,6 +169,42 @@
console.error(error);
}
}
+const handleBlur = async () => {
+ if (inputValue.value !== '') {
+ try {
+ var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
+ const response = await request.post(url)
+ if (response.data && response.data.currentCutTerritory) {
+ // 鍋囪杩斿洖鐨勬暟鎹渶瑕佽皟鏁村潗鏍囧拰灏哄
+ adjustedRects.value = response.data.currentCutTerritory.map(rect => ({
+ ...rect,
+ x_axis: 1360 - (rect.x_axis + rect.width) * 0.37,
+ y_axis: (rect.y_axis * 100) * 0.003,
+ width: (rect.width * 100) * 0.002,
+ height: (rect.height * 100) * 0.002,
+ widtha: rect.width ,
+ heighta: rect.height ,
+ glass_state: rect.glass_state
+ }));
+ }
+ } catch (error) {
+ console.error('璇锋眰鏁版嵁澶辫触:', error);
+ }
+ }
+};
+// const handleBlur = async () => {
+// if (inputValue.value !=''){
+// try {
+// var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
+// const response = await request.post(url)
+// console.log(response.data.length);
+// if (response.code == 200) {
+// adjustedRects.value = response.data
+// ElMessage.success(response.message);
+// } else {
+// ElMessage.error(response.msg);
+// }
+// }
function getRectColor(state: number): string {
switch (state) {
case 0:
@@ -205,6 +255,11 @@
closeWebSocket(socket);
}
});
+ watchEffect(() => {
+ if (inputValue.value === '') {
+ handleMessage();
+ }
+});
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
--
Gitblit v1.8.0