From 52f694ab369861f644f8efab797a85776b73ee52 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 17:29:05 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/home/console.html |   66 +++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index cabf101..0a262e1 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>
@@ -204,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>
@@ -216,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>
@@ -238,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"
@@ -265,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>
@@ -316,6 +327,7 @@
                                     <td align="center">婊炵暀澶╂暟</td>
                                     <td align="center">鍟嗗搧缂栫爜</td>
                                     <td align="center">鍟嗗搧鍚嶇О</td>
+                                    <td align="center">鏁伴噺</td>
                                 </tr>
                                 </thead>
                                 <tbody id="retentionList">
@@ -337,6 +349,10 @@
                         </colgroup>
                         <tbody>
                         <tr>
+                            <td>绯荤粺绠�绉�</td>
+                            <td>浠撳偍绠$悊绯荤粺锛圵MS)</td>
+                        </tr>
+                        <tr>
                             <td>鐗堟湰鍙�</td>
                             <td>Version 1.0.0</td>
                         </tr>
@@ -344,12 +360,19 @@
                             <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-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>
@@ -359,12 +382,12 @@
                     <div class="layui-carousel admin-carousel admin-news" id="workplaceNewsCarousel">
                         <div carousel-item>
                             <div>
-                                <a href="http://192.168.1.22:8080/htwms" 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);">
                                     ASRS锛堣嚜鍔ㄥ寲绔嬩綋浠撳簱锛� - WMS</a>
                             </div>
                             <div>
-                                <a href="http://192.168.1.22:8080/htwcs" 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);">
                                     ASRS锛堣嚜鍔ㄥ寲绔嬩綋浠撳簱锛� - WCS 璁惧鎺у埗涓績</a>
                             </div>
@@ -431,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 {
@@ -485,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}}
@@ -497,7 +522,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}}
@@ -527,6 +552,7 @@
         <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>

--
Gitblit v1.9.1