From 65fd6576b61848c95681356c680c63fc010a0d5e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 20 六月 2025 14:45:01 +0800
Subject: [PATCH] 大屏适配修改
---
construction-data/src/components/datav/index.vue | 42 +++++++++-----------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java | 21 +++++++---
2 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/construction-data/src/components/datav/index.vue b/construction-data/src/components/datav/index.vue
index 780d034..6352579 100644
--- a/construction-data/src/components/datav/index.vue
+++ b/construction-data/src/components/datav/index.vue
@@ -75,14 +75,14 @@
</el-row>
<el-row type="flex" align="center" id="datav">
<dv-border-box-11 title="鎾澧�" class="pick-wall" >
- <el-row type="flex" align="center" justify="center" class="pick-wall-circle" >
- <el-col :span="1">
- <p class="pick-wall-tip"></p>
- </el-col>
- <el-col :span="22">
- <p>缁胯壊锛氫换鍔″凡瀹屾垚 榛勮壊锛氱瓑寰呬腑 绾㈣壊锛氭挱绉嶄腑</p>
- </el-col>
- </el-row>
+<!-- <el-row type="flex" align="center" justify="center" class="pick-wall-circle" >-->
+<!-- <el-col :span="1">-->
+<!-- <p class="pick-wall-tip"></p>-->
+<!-- </el-col>-->
+<!-- <el-col :span="22">-->
+<!-- <p>缁胯壊锛氫换鍔″凡瀹屾垚 榛勮壊锛氱瓑寰呬腑 绾㈣壊锛氭挱绉嶄腑</p>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
<div class="pick-wall-box">
<el-col :span="6" v-for="(item, index) in seedBracket" :key="index" @click.native="lightClick(item)">
<div class="seed-bracket" :style="getLightStatus(item)" />
@@ -420,8 +420,6 @@
</script>
<style lang="less">
-
-
@media screen and (max-width: 1920px){
#data-view {
width: 100%;
@@ -441,14 +439,10 @@
margin: 5px 0;
}
-
-
.pick-order-detl {
padding: 0 15px;
-
.detl-box-border {
- height: 59vh;
-
+ height: 55vh;
.detl-box-padding {
height: 65px
}
@@ -459,10 +453,8 @@
text-align: center;
color: white;
margin: 20vh;
-
.container {
padding: 45px 60px;
-
.btn {
width: 30vh;height: 7vh;font-size: 23px;
}
@@ -492,7 +484,7 @@
.pick-wall {
padding: 60px 10px 10px 10px;
- height: 68vh;
+ height: 47vh;
.pick-wall-box {
.seed-bracket {
@@ -512,6 +504,10 @@
width: 1px;
background: #03d3ec;
border-left: 5px solid #50bfff
+ }
+
+ span {
+ margin: 2px;
}
}
}
@@ -555,7 +551,7 @@
.order-box-row {
width: 84vh;
- height: 38vh;
+ height: 33vh;
.order-box {
padding:0px 30px;
@@ -579,16 +575,16 @@
}
}
-
-
-
.ship-order-list {
font-size: 18px; color: white;
}
}
}
.empty-padding {
- padding-top: 65px;
+ padding-top: 105px;
+ .el-empty__image {
+ height: 100px;
+ }
}
}
.order-detl-list {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
index 323c180..2c7cc86 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
@@ -48,6 +48,13 @@
@Autowired
private WaveService waveService;
+
+ /**
+ * @author Ryan
+ * @date 2025/6/20
+ * @description: 鍏ュ簱浠诲姟宸插畬鎴�
+ * @version 1.0
+ */
@Scheduled(cron = "0/15 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void inExecute() {
@@ -158,6 +165,13 @@
}
}
+
+ /**
+ * @author Ryan
+ * @date 2025/6/20
+ * @description: 鍑哄簱浠诲姟瀹屾垚
+ * @version 1.0
+ */
@Scheduled(cron = "0/10 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void outExecute() {
@@ -181,33 +195,26 @@
// if (diff < taskLogDiffDays) {
// continue;
// }
-
Long hostId = task.getHostId();
-
//淇濆瓨浠诲姟鏄庣粏鍘嗗彶妗�
List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
if (taskDetls.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦�");
}
-
boolean flag = false;
for (TaskDetl taskDetl : taskDetls) {
if (taskDetl.getWaveId() == null) {
continue;
}
-
Wave wave = waveService.getById(taskDetl.getWaveId());
if (wave != null) {
flag = true;//娉㈡鏈畬鎴�
break;
}
}
-
if (flag) {
continue;
}
-
-
//淇濆瓨浠诲姟鍘嗗彶妗�
TaskLog taskLog = new TaskLog();
taskLog.sync(task);
--
Gitblit v1.9.1