From 4f966da6047cdcd9c53e254c1f1c7bdd70af0b34 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 21 四月 2025 10:08:18 +0800
Subject: [PATCH] 1、卧式理片笼配置参数由配置yml文件改为数据库配置表获取 2、磨边后参数改造，解决plc查询数据异常问题 3、大理片笼配置参数由配置yml文件改为数据库配置表获取 4、钢化配置参数由配置yml文件改为数据库配置表获取 5、配置参数常量类配置修改，提供获取配置参数的方法
---
UI-Project/src/views/Caching/cachingbefore.vue | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index dc62469..ddc46f0 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -34,19 +34,18 @@
}
tableDataa.value = data.EdgStorageCageinfos[0]
tableDatab.value = data.taskMessage
- // adjustedRects.value = data.EdgStorageCageinfos[0].map(rect => ({
- // ...rect,
- // width: rect.width * 0.5 ,
- // id: rect.id * 10,
- // }));
-};
+ adjustedRects.value = data.EdgStorageCageinfos[0].map((rect, index) => ({
+ ...rect,
+ id: rect.id * 9,
+ showRect: !!data.EdgStorageCageinfos[0][index]?.details[0]
+ }));
+ };
// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
const backendTime = new Date(globalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
+ oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
@@ -99,7 +98,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鐮存崯
@@ -128,7 +126,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鎷胯蛋
@@ -157,7 +154,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 浠诲姟閲嶇疆
@@ -182,7 +178,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 浠诲姟鎴愬姛澶勭悊
@@ -207,7 +202,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鍒犻櫎
@@ -231,7 +225,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
const rowClassName = ({ row }) => {
@@ -326,13 +319,12 @@
}
});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
<template>
<div style="height: 500px;">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;">
<el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handlehistorical" type="primary">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handleptask()" type="warning">{{ $t('searchOrder.partask') }}</el-button>
<el-button style="margin-bottom: 15px;margin-left: 20px;" @click="successfull()" type="success">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
@@ -382,9 +374,9 @@
<el-table-column prop="thickness" align="center" min-width="80" />
<el-table-column fixed="right" align="center" width="150">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
- <el-button size="mini" type="text" plain @click="handledelete(scope.row)">{{ $t('searchOrder.delete')}} </el-button>
+ <el-button type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
+ <el-button type="text" plain @click="handledelete(scope.row)">{{ $t('searchOrder.delete')}} </el-button>
</template>
</el-table-column>
</el-table>
@@ -432,12 +424,13 @@
</el-card>
<div class="awatch">
<img src="../../assets/woshihuancun.png" alt="" style="width: 50%;height: 70%;margin-left: 30%;margin-top: 20px;position: relative;">
- <div style="position: relative; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;">
- <div
+ <div style="position: relative; width: 500px;height: 95px;margin-top: -142px;margin-left: 600px;">
+ <div
v-for="(rect, index) in adjustedRects"
- :key="rect"
+ v-show="rect.showRect"
+ :key="rect"
:style="{ position: 'absolute',
- top: `${rect.id}px`, left: `10px`, width: `${rect.width}px`, height: `5px`,
+ top: `${rect.id}px`, left: `10px`, width: `422px`, height: `3px`,
backgroundColor: '#409EFF'
}"
>
@@ -446,7 +439,7 @@
</div>
</div>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="90%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0