From 55aa572d4750c29b1bb6b21dae800a2dbe71a9d4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 13 十二月 2024 14:26:04 +0800
Subject: [PATCH] 删除废弃代码
---
UI-Project/src/views/Identify/identify.vue | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index dc32adf..7d51a4b 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,8 +1,7 @@
<template>
<div style="height: 500px;">
<div style="display: flex;">
- <el-input v-model="inputValue" style="margin-left: 15px;margin-top: 10px;width: 240px" placeholder="璇疯緭鍏ュ伐绋嬪彿"
- @blur="handleBlur"/>
+ <el-input v-model="inputValue" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')" @blur="handleBlur"/>
<el-pagination
v-model:current-page="currentPage"
:page-size="pageSize"
@@ -11,6 +10,7 @@
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">
@@ -58,7 +58,6 @@
import request from "@/utils/request"
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)
@@ -77,9 +76,6 @@
const disabled = false;
const size = 'small';
const rawData = ref([]);
-// const handleBind = (row) => {
-// blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-// };
// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glass_id
const currentGlassRect = computed(() => {
return adjustedRects.value.find(rect => rect.glass_id === currentGlassId.value);
@@ -88,7 +84,7 @@
currentGlassId.value = glassId;
blind.value = true;
adjustedRects.value = adjustedRects.value.map(rect =>
- rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ rect.glass_id === glassId ? { ...rect, isActive: true } : rect
);
}
const handleDialogClose = () => {
@@ -108,7 +104,6 @@
})
if (response.code == 200) {
ElMessage.success(response.message);
- // window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 8);
findEngineering()
@@ -125,9 +120,6 @@
// 浜哄伐鎷胯蛋
const handleManualTake = async () => {
try {
- // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200;
- // console.log(url);
- // const response = await request.post(url)
const response = await request.post('/cacheGlass/taskCache/identControls', {
glassId: currentGlassId.value,
state: 9,
@@ -135,19 +127,15 @@
workingProcedure: '鍒囧壊',
})
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- // window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 9);
findEngineering()
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -170,8 +158,7 @@
heighta: rect.height ,
height: rect.height * scaleFactory,
glass_state: rect.glass_state
- }));
- // 濡傛灉WebSocket宸茶繛鎺ワ紝鍒欏叧闂�
+ }));
if (webSocket) {
webSocket.close();
webSocket = null;
@@ -191,16 +178,13 @@
}
} else{
}
-};
-
+};
const handleCurrentChange = (val: number) => {
currentPage.value = val;
- // window.localStorage.setItem('pagenumber', currentPage.value).
const page = currentPage.value - 1
const scaleFactor = 1621.78/6000;
const scaleFactory = 750/3300;
adjustedRects.value = rawData.value[page]?.map(rect => ({
- // adjustedRects.value = rawRects.map(rect => ({
...rect,
x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
y_axis: rect.y_axis * scaleFactory,
@@ -287,31 +271,25 @@
if (!inputValue.value) {
connectWebSocket();
}
-});
-
+});
onUnmounted(() => {
if (webSocket) {
webSocket.close();
}
});
</script>
-
<style scoped>
.rect {
border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
- /* background-color: lightblue; 璁剧疆鐭╁舰鐨勮儗鏅壊 */
}
.centered-text {
- /* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
- /* display: flex; */
justify-content: center;
align-items: center;
- height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
+ height: 100%;
font-size: small;
}
#rect {
position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
- /* 鍏朵粬鏍峰紡 */
}
#arrow {
@@ -324,7 +302,6 @@
border-top: 10px solid transparent; /* 涓婅竟妗� */
border-bottom: 10px solid transparent; /* 涓嬭竟妗� */
border-right: 20px solid #911005; /* 鍙宠竟妗嗭紝褰㈡垚绠ご */
- /* 鏍规嵁闇�瑕佽皟鏁磋竟妗嗗ぇ灏忓拰棰滆壊 */
}
#line {
@@ -335,6 +312,5 @@
height: 2px; /* 鐩寸嚎鐨勯珮搴� */
width: 240px; /* 鐩寸嚎鐨勯暱搴︼紝鏍规嵁闇�瑕佽皟鏁� */
background-color: #911005; /* 鐩寸嚎鐨勯鑹� */
-}
-
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0