From 7c06402a2a3f43a8ec2b713d456ef0a91edae931 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 06 四月 2021 23:20:12 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/home/console.html |  279 +++++++++++++++++++++++--------------------------------
 1 files changed, 115 insertions(+), 164 deletions(-)

diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 0a33902..0a262e1 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -40,7 +40,7 @@
         /** 灏忕粍鎴愬憳 */
         .console-user-group {
             position: relative;
-            padding: 10px 0 10px 60px;
+            padding: 10px 0 10px 40px;
         }
 
         .console-user-group .console-user-group-head {
@@ -49,8 +49,10 @@
             position: absolute;
             top: 50%;
             left: 12px;
-            margin-top: -16px;
+            margin-top: -10px;
             border-radius: 50%;
+            font-size: 18px;
+            font-weight: bolder;
         }
 
         .console-user-group .layui-badge {
@@ -135,10 +137,10 @@
 
         /** 浼樺厛绾у窘绔� */
         .layui-badge-priority {
-            border-radius: 50%;
-            width: 20px;
-            height: 20px;
-            padding: 0;
+            padding: 2px;
+            border-radius: 20%;
+            width: 30px;
+            height: 30px;
             line-height: 18px;
             border-width: 2px;
             font-weight: 600;
@@ -186,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>
@@ -202,7 +204,7 @@
         <div class="layui-col-sm6" style="padding-bottom: 0;">
             <div class="layui-row layui-col-space15">
                 <div class="layui-col-xs6 layui-col-sm3">
-                    <a class="console-app-group" lay-href="mat/mat.html?resourceId=20414" lay-text="浜у搧璧勬枡绠$悊">
+                    <a class="console-app-group" lay-href="mat/mat.html?resourceId=20414" lay-text="鍟嗗搧璧勬枡绠$悊">
                         <i class="console-app-icon layui-icon layui-icon-cart" style="color: #ff9c6e;"></i>
                         <div class="console-app-name">鍟嗗搧</div>
                     </a>
@@ -214,15 +216,15 @@
                     </div>
                 </div>
                 <div class="layui-col-xs6 layui-col-sm3">
-                    <div class="console-app-group" lay-href="user/user.html?resourceId=4" lay-text="绯荤粺鐢ㄦ埛">
-                        <i class="console-app-icon layui-icon layui-icon-group" style="font-size: 26px;padding-top: 3px;margin-right: 6px;"></i>
-                        <div class="console-app-name">鐢ㄦ埛</div>
+                    <div class="console-app-group" lay-href="custOrder/custOrder.html?resourceId=30442" lay-text="閿�鍞鍗�">
+                        <i class="console-app-icon layui-icon layui-icon-templeate-1" style="color: #5cdbd3;font-size: 30px;"></i>
+                        <div class="console-app-name">璁㈠崟</div>
                     </div>
                 </div>
                 <div class="layui-col-xs6 layui-col-sm3">
-                    <div class="console-app-group" lay-href="custOrder/custOrder.html?resourceId=30442" lay-text="閿�鍞鍗�">
+                    <div class="console-app-group" lay-href="pakout/pakout.html?resourceId=30435" lay-text="鎷h揣鍗曠鐞�">
                         <i class="console-app-icon layui-icon layui-icon-form" style="color: #b37feb;font-size: 30px;"></i>
-                        <div class="console-app-name">璁㈠崟</div>
+                        <div class="console-app-name">鎷h揣鍗�</div>
                     </div>
                 </div>
             </div>
@@ -236,11 +238,17 @@
                     </div>
                 </div>
                 <div class="layui-col-xs6 layui-col-sm3">
-                    <div class="console-app-group" lay-href="allo/allo.html?resourceId=20402" lay-text="璐т綅淇℃伅">
-                        <i class="console-app-icon layui-icon layui-icon-templeate-1" style="color: #5cdbd3;font-size: 36px;"></i>
-                        <div class="console-app-name">璐т綅</div>
+                    <div class="console-app-group" lay-href="user/user.html?resourceId=4" lay-text="绯荤粺鐢ㄦ埛">
+                        <i class="console-app-icon layui-icon layui-icon-group" style="font-size: 26px;padding-top: 3px;margin-right: 6px;"></i>
+                        <div class="console-app-name">鐢ㄦ埛</div>
                     </div>
                 </div>
+<!--                <div class="layui-col-xs6 layui-col-sm3">-->
+<!--                    <div class="console-app-group" lay-href="allo/allo.html?resourceId=20402" lay-text="璐т綅淇℃伅">-->
+<!--                        <i class="console-app-icon layui-icon layui-icon-templeate-1" style="color: #5cdbd3;font-size: 36px;"></i>-->
+<!--                        <div class="console-app-name">璐т綅</div>-->
+<!--                    </div>-->
+<!--                </div>-->
                 <div class="layui-col-xs6 layui-col-sm3">
                     <div class="console-app-group" lay-href="tag/tag.html?resourceId=20408" lay-text="褰掔被绠$悊">
                         <i class="console-app-icon layui-icon layui-icon-note"
@@ -263,7 +271,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>
@@ -295,7 +308,7 @@
                 </div>
                 <div class="layui-col-md12">
                     <div class="layui-card">
-                        <div class="layui-card-header">椤圭洰杩涘害</div>
+                        <div class="layui-card-header">婊炵暀搴撳瓨</div>
                         <div class="layui-card-body">
                             <table class="layui-table" lay-skin="line">
                                 <colgroup>
@@ -304,91 +317,20 @@
                                     <col/>
                                     <col/>
                                     <col/>
-                                    <col width="160"/>
+                                    <col width="300"/>
                                 </colgroup>
                                 <thead>
                                 <tr>
                                     <td></td>
-                                    <td>椤圭洰鍚嶇О</td>
-                                    <td align="center">寮�濮嬫椂闂�</td>
-                                    <td align="center">鎴嚦鏃堕棿</td>
-                                    <td align="center">鐘舵��</td>
-                                    <td align="center">杩涘害</td>
+                                    <td align="center">璐т綅</td>
+                                    <td align="center">缃叆鏃堕棿</td>
+                                    <td align="center">婊炵暀澶╂暟</td>
+                                    <td align="center">鍟嗗搧缂栫爜</td>
+                                    <td align="center">鍟嗗搧鍚嶇О</td>
+                                    <td align="center">鏁伴噺</td>
                                 </tr>
                                 </thead>
-                                <tbody>
-                                <tr>
-                                    <td>1</td>
-                                    <td><span class="layui-text"><a>浠撳簱绠$悊绯荤粺</a></span></td>
-                                    <td align="center">2020-03-01</td>
-                                    <td align="center">2020-06-01</td>
-                                    <td align="center"><span class="text-success">杩涜涓�</span></td>
-                                    <td>
-                                        <div class="layui-progress" lay-showPercent="yes">
-                                            <div class="layui-progress-bar" lay-percent="30%"></div>
-                                        </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>2</td>
-                                    <td><span class="layui-text"><a>妗f绠$悊绯荤粺</a></span></td>
-                                    <td align="center">2020-03-01</td>
-                                    <td align="center">2020-08-01</td>
-                                    <td align="center"><span class="text-success">杩涜涓�</span></td>
-                                    <td>
-                                        <div class="layui-progress" lay-showPercent="yes">
-                                            <div class="layui-progress-bar" lay-percent="10%"></div>
-                                        </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>3</td>
-                                    <td><span class="layui-text"><a>鍚庡彴绠$悊绯荤粺</a></span></td>
-                                    <td align="center">2020-01-01</td>
-                                    <td align="center">2020-05-01</td>
-                                    <td align="center"><span class="text-danger">宸插欢鏈�</span></td>
-                                    <td>
-                                        <div class="layui-progress" lay-showPercent="yes">
-                                            <div class="layui-progress-bar" lay-percent="60%"></div>
-                                        </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>4</td>
-                                    <td><span class="layui-text"><a>绮儏鐩戞祴绯荤粺</a></span></td>
-                                    <td align="center">2020-06-01</td>
-                                    <td align="center">2020-10-01</td>
-                                    <td align="center"><span class="text-warning">鏈紑濮�</span></td>
-                                    <td>
-                                        <div class="layui-progress" lay-showPercent="yes">
-                                            <div class="layui-progress-bar" lay-percent="0%"></div>
-                                        </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>5</td>
-                                    <td><span class="layui-text"><a>椤圭洰00000001</a></span></td>
-                                    <td align="center">2020-01-01</td>
-                                    <td align="center">2020-04-01</td>
-                                    <td align="center"><span class="text-muted">宸插畬鎴�</span></td>
-                                    <td>
-                                        <div class="layui-progress" lay-showPercent="yes">
-                                            <div class="layui-progress-bar" lay-percent="90%"></div>
-                                        </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>6</td>
-                                    <td><span class="layui-text"><a>椤圭洰00000002</a></span></td>
-                                    <td align="center">2020-01-01</td>
-                                    <td align="center">2020-03-01</td>
-                                    <td align="center"><span class="text-muted">宸插畬鎴�</span></td>
-                                    <td>
-                                        <div class="layui-progress" lay-showPercent="yes">
-                                            <div class="layui-progress-bar" lay-percent="100%"></div>
-                                        </div>
-                                    </td>
-                                </tr>
+                                <tbody id="retentionList">
                                 </tbody>
                             </table>
                         </div>
@@ -406,60 +348,32 @@
                             <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>鍗曢〉闈� / 鍝嶅簲寮� / 绠�绾� / 鏄撲笂鎵�</td>
+                            <td>绯荤粺绠�绉�</td>
+                            <td>浠撳偍绠$悊绯荤粺锛圵MS)</td>
                         </tr>
                         <tr>
-                            <td>鑾峰彇娓犻亾</td>
-                            <td>
-                                <a href="http://easyweb.vip" class="layui-btn layui-btn-sm layui-btn-danger"
-                                   target="_blank">鑾峰彇鎺堟潈</a>
-                                <a href="http://easyweb.vip/user/order" target="_blank" class="layui-btn layui-btn-sm">绔嬪嵆涓嬭浇</a>
-                            </td>
+                            <td>鐗堟湰鍙�</td>
+                            <td>Version 1.0.0</td>
+                        </tr>
+                        <tr>
+                            <td>浼樼偣鐗硅壊</td>
+                            <td>鏄撲笂鎵� / 鎿嶄綔鏁堢巼楂� / 鏁版嵁鍙婃椂 / 绠�绾�</td>
+                        </tr>
+                        <tr>
+                            <td>鍒朵綔鏂�</td>
+                            <td><a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a></td>
                         </tr>
                         </tbody>
                     </table>
                 </div>
             </div>
             <div class="layui-card">
-                <div class="layui-card-header">灏忕粍鎴愬憳</div>
-                <div class="layui-card-body">
-                    <div class="console-user-group">
-                        <img src="../../assets/images/head.jpg" class="console-user-group-head" alt=""/>
-                        <div class="console-user-group-name">鍛ㄦ槦鏄�</div>
-                        <div class="console-user-group-desc">浜у搧璐熻矗浜�</div>
-                        <span class="layui-badge layui-badge-green">鍦ㄧ嚎</span>
-                    </div>
-                    <div class="console-user-group">
-                        <img src="../../assets/images/head.jpg" class="console-user-group-head" alt=""/>
-                        <div class="console-user-group-name">鍛ㄦ槦鏄�</div>
-                        <div class="console-user-group-desc">椤圭洰璐熻矗浜�</div>
-                        <span class="layui-badge layui-badge-green">鍦ㄧ嚎</span>
-                    </div>
-                    <div class="console-user-group">
-                        <img src="../../assets/images/head.jpg" class="console-user-group-head" alt=""/>
-                        <div class="console-user-group-name">鍛ㄦ槦鏄�</div>
-                        <div class="console-user-group-desc">浜у搧璐熻矗浜�</div>
-                        <span class="layui-badge layui-badge-red">绂荤嚎</span>
-                    </div>
-                    <div class="console-user-group">
-                        <img src="../../assets/images/head.jpg" class="console-user-group-head" alt=""/>
-                        <div class="console-user-group-name">鍛ㄦ槦鏄�</div>
-                        <div class="console-user-group-desc">娴嬭瘯璐熻矗浜�</div>
-                        <span class="layui-badge layui-badge-red">绂荤嚎</span>
-                    </div>
+                <div class="layui-card-header">
+                    瀹夊叏搴撳瓨璀﹀憡
+                    <button class="layui-btn layui-btn-primary layui-btn-xs" style="float: right; margin: 11px 5px 0 0" lay-href="safeSto/safeSto.html?resourceId=30466" lay-text="瀹夊叏搴撳瓨">鏌ョ湅鏇村</button>
+                </div>
+                <div class="layui-card-body" id="safeQuaList">
                 </div>
             </div>
             <div class="layui-card">
@@ -468,19 +382,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.110.56: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.110.56: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>
@@ -505,6 +414,15 @@
         var carousel = layui.carousel;
         var device = layui.device();
 
+
+        getHeaderData();
+        getBodyData();
+
+        setInterval(function () {
+            getHeaderData();
+            getBodyData();
+        }, 3000)
+
         // 娓叉煋杞挱
         carousel.render({
             elem: '#workplaceNewsCarousel',
@@ -515,8 +433,6 @@
             trigger: device.ios || device.android ? 'click' : 'hover',
             anim: 'fade'
         });
-
-        getHeaderData();
 
         // 澶�
         function getHeaderData() {
@@ -538,7 +454,7 @@
 
                         $('#usersQty').text(result.usersQty);
                         $('#deptQty').text(result.deptQty);
-
+                        $('#optQty').text(result.optQty);
                     } else if (res.code === 403) {
                         top.location.href = baseUrl + "/";
                     } else {
@@ -547,8 +463,6 @@
                 }
             })
         }
-
-        getBodyData();
 
         // 澶�
         function getBodyData() {
@@ -562,12 +476,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').html(html3);
+                        // 搴撳瓨婊炵暀
+                        var tpl4 = $('#retentionTpl').html();
+                        var template4 = Handlebars.compile(tpl4);
+                        var html4 = template4(res.data);
+                        $('#retentionList').html(html4);
                     } else if (res.code === 403) {
                         top.location.href = baseUrl + "/";
                     } else {
@@ -584,8 +508,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}}
@@ -594,9 +520,9 @@
     {{#each pakoutList}}
         <tr>
             <td align="center">
-                <span class="layui-badge layui-badge-red layui-badge-priority">{{anfme}}</span>
+                <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> {{matnr}}</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}}
@@ -605,5 +531,30 @@
         </tr>
     {{/each}}
 </script>
+<script type="text/template" id="safeQuaTpl">
+    {{#each safeQuaList}}
+        <div class="console-user-group">
+            <div class="console-user-group-head">{{no}}</div>
+            <div class="console-user-group-name">{{node_name}}</div>
+            <div class="console-user-group-desc">{{maktx}}</div>
+            <span class="layui-badge layui-badge-red" style="letter-spacing: 1px">闇�鍏ュ簱锛歿{dValue}}</span>
+        </div>
+    {{/each}}
+</script>
+<script type="text/template" id="retentionTpl">
+    {{#each retentionList}}
+    <tr>
+        <td>{{no}}</td>
+        <td align="center"><span class="layui-text"><a>{{loc_no}}</a></span></td>
+        <td align="center">{{createTime}}</td>
+        <td align="center"><span style="font-weight: bold">{{stayDays}}</span> 澶�</td>
+        <td align="center"><span class="text-success">{{matnr}}</span></td>
+        <td align="center">
+            <span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{maktx}}</span>
+        </td>
+        <td align="center"><span style="font-weight: bold">{{anfme}}</span></td>
+    </tr>
+    {{/each}}
+</script>
 </body>
 </html>

--
Gitblit v1.9.1