Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-29 20d258abd2e5c0b9a6218f45718071225f8428de

Merge remote-tracking branch 'origin/master'

 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"])


// 查询数据

 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(); // 清除所有localStorage数据  
    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);
      }  

 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));
    }
}


 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);