From 09a010c5dc11c68a866a6075a74bd1bbefb4a9a8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:38:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Identify/identify.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index b68dcbc..9316fc9 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -38,13 +38,12 @@
</el-scrollbar>
</el-card>
</template>
-
<script setup lang="ts">
import { Delete, Upload } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ref, onMounted, onBeforeUnmount } from 'vue';
import request from "@/utils/request"
-import { WebSocketHost } from '@/utils/constants'
+import { WebSocketHost ,host} from '@/utils/constants'
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
const blind = ref(false)
const olWidth = ref();
@@ -77,12 +76,12 @@
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 ,
+ x_axis: (rect.x_axis*100) * 0.004, // 灏唜鍊奸櫎浠�3
+ y_axis: (rect.y_axis*100) * 0.004,
+ width: (rect.width*100) * 0.002 ,
widtha: rect.width ,
heighta: rect.height ,
- height:( rect.height*100) * 0.004 ,
+ height:( rect.height*100) * 0.002 ,
glass_state: rect.glass_state
}));
console.log(adjustedRects.value);
@@ -176,7 +175,7 @@
}
});
}
-const socketUrl = `ws://${WebSocketHost}:88/api/cacheGlass/api/talk/cacheGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
@@ -184,12 +183,12 @@
// adjustedRects.value = data.currentCutTerritory[0]
adjustedRects.value = data.currentCutTerritory[0].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 ,
+ x_axis: (rect.x_axis*100) * 0.004, // 灏唜鍊奸櫎浠�3
+ y_axis: (rect.y_axis*100) * 0.004,
+ width: (rect.width*100) * 0.002 ,
widtha: rect.width ,
heighta: rect.height ,
- height:( rect.height*100) * 0.004 ,
+ height:( rect.height*100) * 0.002 ,
glass_state: rect.glass_state
}));
// console.log("鏇存柊鍚庢暟鎹�", tableData);
--
Gitblit v1.8.0