From 20d258abd2e5c0b9a6218f45718071225f8428de Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 29 七月 2024 15:49:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Slicecage/slicecage.vue | 26 ++++++++++++++++++--------
UI-Project/src/views/ReportWork/reportWork.vue | 2 +-
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 2 +-
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 2 ++
4 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 69f60e3..2edca18 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -69,7 +69,7 @@
workingProcedure: '0',
});
const reportData = ref([])
-const timeRange = ref(["2022-01-01", "2022-01-01"])
+const timeRange = ref(["2022-01-01", "2025-01-01"])
// 鏌ヨ鏁版嵁
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 0d4e6cb..f15603c 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -176,12 +176,15 @@
// }
return 9;
});
-
- function cleanUp() {
- console.log('鎵ц娓呯悊鎿嶄綔');
-}
-// 鍋囪鎴戜滑姣�2鍒嗛挓鎵ц涓�娆℃竻鐞�
-setInterval(cleanUp, 2 * 60 * 1000);
+ setInterval(() => {
+ localStorage.clear(); // 娓呴櫎鎵�鏈塴ocalStorage鏁版嵁
+ console.log(11111);
+}, 60000);
+// function cleanUp() {
+// console.log('鎵ц娓呯悊鎿嶄綔');
+// }
+// // 鍋囪鎴戜滑姣�2鍒嗛挓鎵ц涓�娆℃竻鐞�
+// setInterval(cleanUp, 1 * 60 * 1000);
const getTableRow = (row,type) =>{
switch (type) {
@@ -507,16 +510,23 @@
console.error('鍙戠敓閿欒:', error);
}
};
+
+
function handleRowClick(row) {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
}
const handleChange = async () => {
try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/temperingSwitch')
+ const body = {
+ flag: ganghua.value, // 浣跨敤 ganghua.value 鑾峰彇褰撳墠寮�鍏崇殑鐘舵��
+ };
+
+ var url="/cacheVerticalGlass/bigStorageCageDetails/temperingSwitch?flag="+ganghua.value;
+ const response = await request.post(url)
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- // ganghua.value = response.data
+ ganghua.value = response.data
}else {
ElMessage.error(response.message);
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index 77c81be..7bf0afc 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -100,7 +100,7 @@
@ApiOperation("鏄惁閽㈠寲寮�鍏�")
@PostMapping("/temperingSwitch")
public Result temperingSwitch(Boolean flag) {
- return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.temperingSwitch(flag));
+ return Result.build(200, "淇敼鎴愬姛", bigStorageCageDetailsService.temperingSwitch(flag));
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
index d0a78db..a71d249 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -62,6 +62,8 @@
//閽㈠寲寮�鍏�
boolean temperingSwitch=false;
if(redisUtil.getCacheObject("temperingSwitch")==null){
+ redisUtil.setCacheObject("temperingSwitch", false);
+ }else{
temperingSwitch=redisUtil.getCacheObject("temperingSwitch");
}
jsonObject.append("temperingSwitch", temperingSwitch);
--
Gitblit v1.8.0