From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identify.vue | 108 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 47 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 590269c..e785987 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -11,8 +11,8 @@
@current-change="handleCurrentChange"
/>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
- <el-scrollbar height="550px" width="1200px" style="background-color: #e9e9eb;">
+ <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"
@@ -35,12 +35,12 @@
</div>
</el-scrollbar>
<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
- <el-button type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
+ <el-button :disabled="currentGlassRect?.glass_state === 8 || currentGlassRect?.glass_state === 9" type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
- <el-button type="danger" plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
+ <el-button :disabled="currentGlassRect?.glass_state === 9 || currentGlassRect?.glass_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>
+ {{ $t('order.takeaway') }}</el-button>
</el-dialog>
</el-card>
</template>
@@ -60,20 +60,24 @@
const glass_id = ref();
const inputValue = ref('');
const currentGlassId = ref(null); // 瀛樺偍褰撳墠鐐瑰嚮鐭╁舰鐨� glass_id
+const currentstate = ref(null);
const adjustedRects = ref([]);
const raw = ref([]);
let webSocket: WebSocket | null = null;
const totalPages = ref(0);
const pageSize = ref(1);
-const currentPage = ref(1);
+const currentPage = ref('');
const disabled = false;
const size = 'small';
-const rawData = ref([]);
+const rawData = ref([]);
// const handleBind = (row) => {
// blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
// };
// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glass_id
-function showDialog(glassId: number) {
+const currentGlassRect = computed(() => {
+ return adjustedRects.value.find(rect => rect.glass_id === currentGlassId.value);
+});
+function showDialog(glassId: number) {
currentGlassId.value = glassId;
blind.value = true;
adjustedRects.value = adjustedRects.value.map(rect =>
@@ -89,20 +93,18 @@
// 鐮存崯
const handleDamage = async () => {
try {
- // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201;
- // console.log(url);
- // const response = await request.post(url)
const response = await request.post('/cacheGlass/taskCache/identControls', {
glassId: currentGlassId.value,
state: 8,
line: 1001,
- workingProcedure: '璇嗗埆',
+ workingProcedure: '鍒囧壊',
})
if (response.code == 200) {
ElMessage.success(response.message);
// window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 8);
+ findEngineering()
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
@@ -123,7 +125,7 @@
glassId: currentGlassId.value,
state: 9,
line: 1001,
- workingProcedure: '璇嗗埆',
+ workingProcedure: '鍒囧壊',
})
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
@@ -131,7 +133,8 @@
// window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 9);
- } else {
+ findEngineering()
+ } else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
@@ -141,25 +144,24 @@
console.error(error);
}
}
-const handleBlur = async () => {
+const handleBlur = async () => {
if (inputValue.value) {
var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
const response = await request.post(url)
if (response.code === 200) {
- console.log(response.data);
-
const rawRects = response.data[0];
rawData.value = response.data;
totalPages.value = rawData.value.length;
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 * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor ,
widtha: rect.width ,
heighta: rect.height ,
- height: rect.height * 0.165 ,
+ height: rect.height * scaleFactory,
glass_state: rect.glass_state
}));
// 濡傛灉WebSocket宸茶繛鎺ワ紝鍒欏叧闂�
@@ -167,46 +169,57 @@
webSocket.close();
webSocket = null;
}
- currentPage.value = 1;
+ 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;
+ // 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 * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor ,
widtha: rect.width ,
heighta: rect.height ,
- height: rect.height * 0.165 ,
+ height: rect.height * scaleFactory,
glass_state: rect.glass_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';
- // default:
- // return '#911005'; // 榛樿棰滆壊
- }
-}
+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';
+ }
+}
// 鏇存柊鐭╁舰鐘舵��
function updateRectStatus(glassId: string, status: number) {
adjustedRects.value.forEach(rect => {
@@ -221,8 +234,9 @@
webSocket = new WebSocket(socketUrl);
webSocket.onmessage = (event) => {
const data = JSON.parse(event.data);
- const scaleFactor = 1621.78 / 6000;
- if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
+ 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);
@@ -230,9 +244,9 @@
return {
...existingRect,
x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor,
- height: rect.height * 0.165,
+ height: rect.height * scaleFactory,
widtha: rect.width,
heighta: rect.height,
glass_state: rect.glass_state,
@@ -243,9 +257,9 @@
return {
...rect,
x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor,
- height: rect.height * 0.165,
+ height: rect.height * scaleFactory,
widtha: rect.width,
heighta: rect.height,
glass_state: rect.glass_state,
--
Gitblit v1.8.0