Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

zjj

2023-11-30 46d5aca49be78fccb2c2e64dc2332236085f67e2

Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

 src/main/webapp/views/deviceWatch/deviceWatch.html

@@ -24,6 +24,17 @@
            color: #303133;
        }

        .deviceContainer {
            display: flex;
            justify-content: space-around;
            flex-wrap: wrap;
        }

        .deviceBox {
            width: 600px;
            margin-top: 10px;
        }

        .devpBox {
            margin-top: 20px;
        }
@@ -42,12 +53,13 @@
        }

        .deviceItem {
            width: 300px;
            width: 200px;
            height: 40px;
        }

        .devpDeviceBox {
            width: 230px;
            margin-top: 10px;
        }

        .devpDeviceItem {
@@ -62,9 +74,8 @@
        <div slot="header" class="clearfix">
            <span>堆垛机</span>
        </div>
        <el-carousel :interval="4000" type="card" :height="crnListHeight">
            <el-carousel-item v-for="(item,index) in crnList" :key="index">
                <div ref="crnCarousel" class="deviceBox">
        <div class="deviceContainer">
            <div v-for="(item,index) in crnList" :key="index" class="deviceBox">
                    <div class="deviceHeader">{{item.crnNo}}号堆垛机</div>
                    <div class="deviceBody">
                        <div class="deviceItem">
@@ -165,17 +176,15 @@
                        </div>
                    </div>
                </div>
            </el-carousel-item>
        </el-carousel>
        </div>
    </el-card>

    <el-card class="box-card devpBox">
        <div slot="header" class="clearfix">
            <span>输送线</span>
        </div>
        <el-carousel :interval="4000" type="card" :height="devpListHeight">
            <el-carousel-item v-for="(val,index) in devpList" :key="index" w>
                <div style="display: flex;justify-content: space-around;width: 100%;">
        <div v-for="(val,index) in devpList" :key="index" w>
            <div style="display: flex;justify-content: space-around;width: 100%;margin-top: 20px;">
                    <div v-for="(item,idx) in val" :key="idx" class="devpDeviceBox">
                        <div class="deviceHeader">{{item.devNo}}号站点</div>
                        <div class="deviceBody">
@@ -222,8 +231,7 @@
                        </div>
                    </div>
                </div>
            </el-carousel-item>
        </el-carousel>
        </div>
    </el-card>
</div>
<script>
@@ -285,7 +293,7 @@
                        let list = []
                        let tmp = []
                        res.data.forEach((item,index) => {
                            if (index % 3 == 0) {
                            if (index % 5 == 0) {
                                if (tmp.length != 0) {
                                    list.push(tmp)
                                }

 src/main/webapp/views/index.html

@@ -25,7 +25,7 @@
  <!-- 头部 -->
  <div class="layui-header">
    <div class="layui-logo">
      <img src="../static/wms/image/logo.png" style="display: inline-block; width: 60%;height: auto">
      <img class="loginLogo" src="../static/wms/image/logo.png" style="display: inline-block; width: 60%;height: auto">
      <!--          <span style="margin-top: 0; letter-spacing: 10px">中扬立库</span>-->
      <!--          <img src="../static/wms/image/logo.svg"/>-->
      <!--          <cite>中扬 - Zoneyung</cite>-->
@@ -77,7 +77,7 @@
  <div class="layui-body"></div>
  <!-- 底部 -->
  <div class="layui-footer layui-text">
    copyright © 2023 浙江中扬立库技术有限公司 all rights reserved.
    <span class="copyright-text">copyright © 2023 浙江中扬立库技术有限公司 all rights reserved.</span>
    <span class="pull-right">Version 1.0.0</span>
  </div>

@@ -150,6 +150,17 @@
    });

    $.ajax({
      url: baseUrl+"/loginInformation",
      data: {},
      method: 'GET',
      success: function (res) {
        var data = res.data
        $(".copyright-text").text(data.loginCopyrightText);
        $(".loginLogo").attr("src", data.loginLogo);
      }
    });

    $.ajax({
      url: baseUrl + "/license/getLicenseDays",
      headers: {'token': localStorage.getItem('token')},
      method: 'POST',