大屏适配修改

skyouc

2025-06-20 65fd6576b61848c95681356c680c63fc010a0d5e

大屏适配修改

 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 {

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