From 7b2f457805eeb4d16c8e92dffae419665f81db02 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 16:34:53 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/home/console.html |   75 +++++++++++++++++--------------------
 1 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index af84531..0c3e630 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -188,13 +188,13 @@
             <div class="layui-card">
                 <div class="layui-card-header">
                     绯荤粺鐢ㄦ埛
-                    <span class="icon-text pull-right" lay-tips="鎸囨爣璇存槑" lay-direction="4" lay-offset="5px,5px">
-                        <i class="layui-icon layui-icon-tips"></i>
+                    <span class="icon-text pull-right" lay-tips="WMS 绯荤粺杩愯涓�......" lay-direction="4" lay-offset="5px,5px">
+                        <i class="layui-icon layui-icon-loading-1 layui-anim layui-anim-rotate layui-anim-loop"></i>
                     </span>
                 </div>
                 <div class="layui-card-body">
                     <p class="lay-big-font"><span id="usersQty">0</span> <span style="font-size: 24px;line-height: 1;">浣�</span></p>
-                    <p>閮ㄩ棬<span class="pull-right"><span id="deptQty">0</span> 涓�</span></p>
+                    <p>鎿嶄綔娆℃暟<span class="pull-right"><span id="optQty">0</span> 娆�</span></p>
                 </div>
             </div>
         </div>
@@ -265,7 +265,12 @@
             <div class="layui-row layui-col-space15">
                 <div class="layui-col-md6">
                     <div class="layui-card">
-                        <div class="layui-card-header">缁勬墭鍔ㄦ��</div>
+                        <div class="layui-card-header">
+                            缁勬墭鍔ㄦ��
+                            <span class="icon-text pull-right" lay-tips="钃濊壊浠h〃鏈叆搴�" lay-direction="4" lay-offset="5px,5px">
+                                <i class="layui-icon layui-icon-tips"></i>
+                            </span>
+                        </div>
                         <div class="layui-card-body dynamic-card-body mini-bar" style="height: 265px;">
                             <ul id="combList" class="layui-timeline layui-timeline-dynamic">
                             </ul>
@@ -336,27 +341,13 @@
                             <col>
                         </colgroup>
                         <tbody>
-<!--                        <script type="text/html" ew-tpl>-->
-<!--                            <tr>-->
-<!--                                <td>褰撳墠鐗堟湰</td>-->
-<!--                                <td>v{{layui.admin.version}} &emsp; <a href="https://easyweb.vip/doc/" target="_blank">鏇存柊鏃ュ織</a>-->
-<!--                                </td>-->
-<!--                            </tr>-->
-<!--                            <tr>-->
-<!--                                <td>鍩轰簬妗嗘灦</td>-->
-<!--                                <td>layui-v{{layui.v}}</td>-->
-<!--                            </tr>-->
-<!--                        </script>-->
                         <tr>
                             <td>鐗堟湰鍙�</td>
                             <td>Version 1.0.0</td>
                         </tr>
                         <tr>
-                            <td>绔嬪簱鍏ュ彛</td>
-                            <td>
-                                <a href="http://localhost:8080/wms" class="layui-btn layui-btn-sm layui-btn-danger" target="_blank">A-WMS</a>
-                                <a href="http://localhost:8080/wcs" target="_blank" class="layui-btn layui-btn-sm">WCS</a>
-                            </td>
+                            <td>浼樼偣鐗硅壊</td>
+                            <td>鏄撲笂鎵� / 鎿嶄綔鏁堢巼楂� / 鏁版嵁鍙婃椂 / 绠�绾�</td>
                         </tr>
                         </tbody>
                     </table>
@@ -373,19 +364,14 @@
                     <div class="layui-carousel admin-carousel admin-news" id="workplaceNewsCarousel">
                         <div carousel-item>
                             <div>
-                                <a href="http://www.layui.com/" target="_blank"
+                                <a href="http://192.168.1.22:8080/htwms" target="_blank"
                                    style="color:#fff;background-color: #009688;background-image: linear-gradient(to right,#009688,#5fb878);">
-                                    layui - 缁忓吀妯″潡鍖栧墠绔鏋�</a>
+                                    ASRS锛堣嚜鍔ㄥ寲绔嬩綋浠撳簱锛� - WMS</a>
                             </div>
                             <div>
-                                <a href="http://fly.layui.com/extend/" target="_blank"
+                                <a href="http://192.168.1.22:8080/htwcs" target="_blank"
                                    style="color:#fff;background-color: #009fde;background-image: linear-gradient(to right,#009fde,#00beff);">
-                                    layui绗笁鏂圭粍浠跺钩鍙�</a>
-                            </div>
-                            <div>
-                                <a href="https://fly.layui.com/" target="_blank"
-                                   style="color:#fff;background-color: #34363f;background-image: linear-gradient(to right,#34363f,#676c7c);">
-                                    layui妗嗘灦瀹樻柟绀惧尯</a>
+                                    ASRS锛堣嚜鍔ㄥ寲绔嬩綋浠撳簱锛� - WCS 璁惧鎺у埗涓績</a>
                             </div>
                         </div>
                     </div>
@@ -410,6 +396,15 @@
         var carousel = layui.carousel;
         var device = layui.device();
 
+
+        getHeaderData();
+        getBodyData();
+
+        setInterval(function () {
+            getHeaderData();
+            getBodyData();
+        }, 3000)
+
         // 娓叉煋杞挱
         carousel.render({
             elem: '#workplaceNewsCarousel',
@@ -420,8 +415,6 @@
             trigger: device.ios || device.android ? 'click' : 'hover',
             anim: 'fade'
         });
-
-        getHeaderData();
 
         // 澶�
         function getHeaderData() {
@@ -443,7 +436,7 @@
 
                         $('#usersQty').text(result.usersQty);
                         $('#deptQty').text(result.deptQty);
-
+                        $('#optQty').text(result.optQty);
                     } else if (res.code === 403) {
                         top.location.href = baseUrl + "/";
                     } else {
@@ -452,8 +445,6 @@
                 }
             })
         }
-
-        getBodyData();
 
         // 澶�
         function getBodyData() {
@@ -467,22 +458,22 @@
                         var tpl1 = $('#combTpl').html();
                         var template1 = Handlebars.compile(tpl1);
                         var html1 = template1(res.data);
-                        $('#combList').append(html1);
+                        $('#combList').html(html1);
                         // 璁㈠崟
                         var tpl2 = $('#orderTpl').html();
                         var template2 = Handlebars.compile(tpl2);
                         var html2 = template2(res.data);
-                        $('#pakoutList').append(html2);
+                        $('#pakoutList').html(html2);
                         // 瀹夊叏搴撳瓨
                         var tpl3 = $('#safeQuaTpl').html();
                         var template3 = Handlebars.compile(tpl3);
                         var html3 = template3(res.data);
-                        $('#safeQuaList').append(html3);
+                        $('#safeQuaList').html(html3);
                         // 搴撳瓨婊炵暀
                         var tpl4 = $('#retentionTpl').html();
                         var template4 = Handlebars.compile(tpl4);
                         var html4 = template4(res.data);
-                        $('#retentionList').append(html4);
+                        $('#retentionList').html(html4);
                     } else if (res.code === 403) {
                         top.location.href = baseUrl + "/";
                     } else {
@@ -499,8 +490,10 @@
         <li class="layui-timeline-item">
             <i class="layui-icon layui-timeline-axis {{active}}"></i>
             <div class="layui-timeline-content layui-text">
-                <div class="layui-timeline-title">{{matnr}} 骞舵澘 {{zpallet}} 鏁伴噺锛歿{anfme}}
-                <span class="pull-right">{{time}} </span></div>
+                <div class="layui-timeline-title">
+                    <span title="{{maktx}}">{{matnr}}</span> 骞舵澘 <span>{{zpallet}}</span> 鎵樼洏锛� 鏁伴噺锛歿{anfme}}
+                    <span class="pull-right">{{time}} </span>
+                </div>
             </div>
         </li>
     {{/each}}
@@ -511,7 +504,7 @@
             <td align="center">
                 <span class="layui-badge-red layui-badge-priority">{{anfme}}</span>
             </td>
-            <td><span class="layui-text"><a style="cursor: initial">{{loc_no}} <span style="color: #4c4c4c">鍑哄簱锛�</span> <span title="{{maktx}}">{{matnr}}</span></a></span></td>
+            <td><span class="layui-text"><a style="cursor: default">{{loc_no}} <span style="color: #4c4c4c">鍑哄簱锛�</span> <span title="{{maktx}}" style="cursor: default">{{matnr}}</span></a></span></td>
             <td align="center">
                 <span class="{{style}}">
                     {{wrkStsName}}

--
Gitblit v1.9.1