From 011efb45dd8929c8d6833ef6c726dd9081bc1537 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 19 三月 2021 14:37:05 +0800
Subject: [PATCH] 1.0.3 全局-发货通知相关功能

---
 src/main/webapp/views/index.html |  440 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 224 insertions(+), 216 deletions(-)

diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index f2224b0..1fb28a6 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -1,240 +1,248 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8">
-  <title>鑷姩浠撳偍 - 绠$悊绯荤粺</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-  <link rel="icon" type="image/x-icon" href="../static/image/log.png" />
-  <link rel="stylesheet" href="../static/layuiadmin/layui/css/layui.css" media="all">
-  <link rel="stylesheet" href="../static/layuiadmin/style/admin.css" media="all">
-  <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
-  <script type="text/javascript" src="../static/js/common.js"></script>
-  <script type="text/javascript" src="../static/layuiadmin/layui/layui.js"></script>
-  <style>
-    .layui-layout-admin .layui-footer {
-      box-sizing: border-box;
-      background-color: #fff;
-      z-index: 999;
-      height: 30px;
-      padding: 0;
-      font-size: 13px;
-      margin: 0;
-      line-height: 30px;
-    }
-    .layui-layout-admin .layui-footer a {
-      color: #3573ab;
-      font-weight: bold
-    }
+    <meta charset="utf-8">
+    <title>鑷姩浠撳偍 - 绠$悊绯荤粺</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="icon" type="image/x-icon" href="../static/image/log.png"/>
+    <link rel="stylesheet" href="../static/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../static/layuiadmin/style/admin.css" media="all">
+    <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript" src="../static/js/common.js"></script>
+    <script type="text/javascript" src="../static/layuiadmin/layui/layui.js"></script>
+    <style>
+        .layui-layout-admin .layui-footer {
+            box-sizing: border-box;
+            background-color: #fff;
+            z-index: 999;
+            height: 30px;
+            padding: 0;
+            font-size: 13px;
+            margin: 0;
+            line-height: 30px;
+        }
 
-    .layui-layout-admin .layui-logo {
-      letter-spacing: 2px;
-      font-size: 22px;
-      height: 110px;
-      padding: 20px 10px;
-      font-weight: bolder;
-      /*color: #2c7dc2;*/
-      color: #f3f3f3;
-      text-align: center;
-      line-height: 40px;
-    }
-    .layadmin-side-shrink .layui-layout-admin .layui-logo {
-      background-image: none;
-    }
-    .layui-side-menu .layui-nav {
-      margin-top: 110px;
-    }
-  </style>
+        .layui-layout-admin .layui-footer a {
+            color: #3573ab;
+            font-weight: bold
+        }
+
+        .layui-layout-admin .layui-logo {
+            letter-spacing: 2px;
+            font-size: 22px;
+            height: 110px;
+            padding: 20px 10px;
+            font-weight: bolder;
+            /*color: #2c7dc2;*/
+            color: #f3f3f3;
+            text-align: center;
+            line-height: 40px;
+        }
+
+        .layadmin-side-shrink .layui-layout-admin .layui-logo {
+            background-image: none;
+        }
+
+        .layui-side-menu .layui-nav {
+            margin-top: 110px;
+        }
+    </style>
 </head>
 <body class="layui-layout-body">
 
-  <div id="LAY_app">
+<div id="LAY_app">
     <div class="layui-layout layui-layout-admin">
-      <div class="layui-header">
-        <!-- 澶撮儴鍖哄煙 -->
-        <ul id="cool-header-left" class="layui-nav layui-layout-left">
-          <li class="layui-nav-item layadmin-flexible" lay-unselect>
-            <a href="javascript:;" layadmin-event="flexible" title="渚ц竟浼哥缉">
-              <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
-            </a>
-          </li>
-          <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>-->
-            <!--<a lay-href="report/viewLocMap.html?resourceId=10286" title="Map">-->
-              <!--<i class="layui-icon layui-icon-website"></i>-->
-            <!--</a>-->
-          <!--</li>-->
-          <li class="layui-nav-item" lay-unselect>
-            <a href="javascript:;" layadmin-event="refresh" title="鍒锋柊">
-              <i class="layui-icon layui-icon-refresh-3"></i>
-            </a>
-          </li>
-          <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>-->
-            <!--<input type="text" placeholder="鎼滅储..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="template/search.html?keywords=">-->
-          <!--</li>-->
-        </ul>
-        <ul id="cool-header-right" class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
-          
-          <li class="layui-nav-item layui-hide-xs" lay-unselect>
-            <a href="javascript:;" layadmin-event="theme">
-              <i class="layui-icon layui-icon-theme"></i>
-            </a>
-          </li>
-          <li class="layui-nav-item layui-hide-xs" lay-unselect>
-            <a id="activation-icon" href="javascript:;" layadmin-event="note">
-              <i class="layui-icon layui-icon-note"></i>
-            </a>
-          </li>
-          <li class="layui-nav-item layui-hide-xs" lay-unselect>
-            <a href="javascript:;" layadmin-event="fullscreen">
-              <i class="layui-icon layui-icon-screen-full"></i>
-            </a>
-          </li>
-          <li class="layui-nav-item" lay-unselect>
-            <a href="javascript:;">
-              <cite id="person-username">绠$悊鍛�</cite>
-            </a>
-            <dl class="layui-nav-child">
-              <dd><a lay-href="detail.html">鍩烘湰璧勬枡</a></dd>
-              <!--<dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>-->
-              <hr>
-              <dd style="text-align: center;"><a id="logout" href="/">閫�鍑�</a></dd>
-            </dl>
-          </li>
-        </ul>
-      </div>
-      
-      <!-- 渚ц竟鑿滃崟 -->
-      <div class="layui-side layui-side-menu">
-        <div class="layui-side-scroll">
-          <div class="layui-logo" lay-href="home/console.html">
-            <img src="../static/image/logo.png" style="display: inline-block; width: 90%;height: auto">
-            <span style="margin-top: 0">涓壃绔嬪簱</span>
-          </div>
+        <div class="layui-header">
+            <!-- 澶撮儴鍖哄煙 -->
+            <ul id="cool-header-left" class="layui-nav layui-layout-left">
+                <li class="layui-nav-item layadmin-flexible" lay-unselect>
+                    <a href="javascript:;" layadmin-event="flexible" title="渚ц竟浼哥缉">
+                        <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
+                    </a>
+                </li>
+                <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>-->
+                <!--<a lay-href="report/viewLocMap.html?resourceId=10286" title="Map">-->
+                <!--<i class="layui-icon layui-icon-website"></i>-->
+                <!--</a>-->
+                <!--</li>-->
+                <li class="layui-nav-item" lay-unselect>
+                    <a href="javascript:;" layadmin-event="refresh" title="鍒锋柊">
+                        <i class="layui-icon layui-icon-refresh-3"></i>
+                    </a>
+                </li>
+                <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>-->
+                <!--<input type="text" placeholder="鎼滅储..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="template/search.html?keywords=">-->
+                <!--</li>-->
+            </ul>
+            <ul id="cool-header-right" class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
 
-          <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
-          </ul>
+                <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <a href="javascript:;" layadmin-event="theme">
+                        <i class="layui-icon layui-icon-theme"></i>
+                    </a>
+                </li>
+                <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <a id="activation-icon" href="javascript:;" layadmin-event="note">
+                        <i class="layui-icon layui-icon-note"></i>
+                    </a>
+                </li>
+                <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <a href="javascript:;" layadmin-event="fullscreen">
+                        <i class="layui-icon layui-icon-screen-full"></i>
+                    </a>
+                </li>
+                <li class="layui-nav-item" lay-unselect>
+                    <a href="javascript:;">
+                        <cite id="person-username">绠$悊鍛�</cite>
+                    </a>
+                    <dl class="layui-nav-child">
+                        <dd><a lay-href="detail.html">鍩烘湰璧勬枡</a></dd>
+                        <!--<dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>-->
+                        <hr>
+                        <dd style="text-align: center;"><a id="logout" href="/">閫�鍑�</a></dd>
+                    </dl>
+                </li>
+            </ul>
         </div>
-      </div>
-      <!-- 椤甸潰鏍囩 -->
-      <div class="layadmin-pagetabs" id="LAY_app_tabs">
-        <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
-        <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
-        <div class="layui-icon layadmin-tabs-control layui-icon-down">
-          <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
-            <li class="layui-nav-item" lay-unselect>
-              <a href="javascript:;"></a>
-              <dl class="layui-nav-child layui-anim-fadein">
-                <dd layadmin-event="closeThisTabs"><a href="javascript:;">鍏抽棴褰撳墠鏍囩椤�</a></dd>
-                <dd layadmin-event="closeOtherTabs"><a href="javascript:;">鍏抽棴鍏跺畠鏍囩椤�</a></dd>
-                <dd layadmin-event="closeAllTabs"><a href="javascript:;">鍏抽棴鍏ㄩ儴鏍囩椤�</a></dd>
-              </dl>
-            </li>
-          </ul>
-        </div>
-        <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
-          <ul class="layui-tab-title" id="LAY_app_tabsheader">
-            <li lay-id="home/console.html" lay-attr="home/console.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li>
-          </ul>
-        </div>
-      </div>
 
-      <!-- 涓讳綋鍐呭 -->
-      <div class="layui-body" id="LAY_app_body">
-        <div class="layadmin-tabsbody-item layui-show">
-          <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
-        </div>
-      </div>
+        <!-- 渚ц竟鑿滃崟 -->
+        <div class="layui-side layui-side-menu">
+            <div class="layui-side-scroll">
+                <div class="layui-logo" lay-href="home/console.html">
+                    <img src="../static/image/logo.png" style="display: inline-block; width: 90%;height: auto">
+                    <span style="margin-top: 0">涓壃绔嬪簱</span>
+                </div>
 
-      <div class="layui-footer">
-        Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a>  淇濈暀鎵�鏈夋潈鍒�
-      </div>
-      <!-- 杈呭姪鍏冪礌锛屼竴鑸敤浜庣Щ鍔ㄨ澶囦笅閬僵 -->
-      <div class="layadmin-body-shade" layadmin-event="shade"></div>
+                <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu"
+                    lay-filter="layadmin-system-side-menu">
+                </ul>
+            </div>
+        </div>
+        <!-- 椤甸潰鏍囩 -->
+        <div class="layadmin-pagetabs" id="LAY_app_tabs">
+            <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
+            <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
+            <div class="layui-icon layadmin-tabs-control layui-icon-down">
+                <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
+                    <li class="layui-nav-item" lay-unselect>
+                        <a href="javascript:;"></a>
+                        <dl class="layui-nav-child layui-anim-fadein">
+                            <dd layadmin-event="closeThisTabs"><a href="javascript:;">鍏抽棴褰撳墠鏍囩椤�</a></dd>
+                            <dd layadmin-event="closeOtherTabs"><a href="javascript:;">鍏抽棴鍏跺畠鏍囩椤�</a></dd>
+                            <dd layadmin-event="closeAllTabs"><a href="javascript:;">鍏抽棴鍏ㄩ儴鏍囩椤�</a></dd>
+                        </dl>
+                    </li>
+                </ul>
+            </div>
+            <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
+                <ul class="layui-tab-title" id="LAY_app_tabsheader">
+                    <li lay-id="home/console.html" lay-attr="home/console.html" class="layui-this"><i
+                            class="layui-icon layui-icon-home"></i></li>
+                </ul>
+            </div>
+        </div>
+
+        <!-- 涓讳綋鍐呭 -->
+        <div class="layui-body" id="LAY_app_body">
+            <div class="layadmin-tabsbody-item layui-show">
+                <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
+            </div>
+        </div>
+
+        <div class="layui-footer">
+            Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a>
+            淇濈暀鎵�鏈夋潈鍒�
+        </div>
+        <!-- 杈呭姪鍏冪礌锛屼竴鑸敤浜庣Щ鍔ㄨ澶囦笅閬僵 -->
+        <div class="layadmin-body-shade" layadmin-event="shade"></div>
     </div>
-  </div>
+</div>
 
-  <script>
-  layui.config({
-    base: '../static/layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-  }).extend({
-    index: 'lib/index' //涓诲叆鍙fā鍧�
-  }).use(['index','element'], function () {
-      var element = layui.element;
-      var $ = layui.jquery;
+<script>
+    layui.config({
+        base: '../static/layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+        tableMerge: 'tableMerge',
+    }).use(['index', 'element', 'tableMerge'], function () {
+        var element = layui.element;
+        var $ = layui.jquery;
 
-      // 鏇挎崲閫�鍑烘寜閽彉閲�
-      var logout = document.getElementById('logout');
-      var url = logout.getAttribute('href');
-      logout.setAttribute('href', baseUrl + url);
+        // 鏇挎崲閫�鍑烘寜閽彉閲�
+        var logout = document.getElementById('logout');
+        var url = logout.getAttribute('href');
+        logout.setAttribute('href', baseUrl + url);
 
-      $('#person-username').text(localStorage.getItem('username'));
+        $('#person-username').text(localStorage.getItem('username'));
 
-      $(function () {
-          if ("" === localStorage.getItem('token')){
-              top.location.href = baseUrl+"/login";
-          }
-
-          // 婵�娲荤爜楠岃瘉
-          $.ajax({
-            url: baseUrl+"/system/activation/auth",
-            dataType:'json',
-            method: 'GET',
-            async: false,
-            success: function (res) {
-              if (res.code === 200) {
-                $("#activation-icon").hide();
-              } else {
-                $("#activation-icon").click();
-              }
+        $(function () {
+            if ("" === localStorage.getItem('token')) {
+                top.location.href = baseUrl + "/login";
             }
-          });
 
-          getMenu()
-
-          // 娉ㄩ攢
-          $(document).on('click','#logout',function () {
-              localStorage.removeItem("token");
-          });
-
-      });
-
-      // 鍔犺浇鑿滃崟
-      function getMenu() {
-        $.ajax({
-          url: baseUrl+ "/menu/auth",
-          headers: {'token': localStorage.getItem('token')},
-          method: 'POST',
-          success: function (res) {
-            if (res.code === 200){
-              var menuHtml = "";
-              if (res.data != null){
-                for (var i = 0; i < res.data.length; i++) {
-                  menuHtml += '<li data-name="' + res.data[i].menuCode +'" class="layui-nav-item">\n';
-                  menuHtml += '<a href="javascript:;" lay-tips=' +res.data[i].menu+ ' lay-direction="2">\n';
-                  menuHtml += '<i class="layui-icon '+ res.data[i].menuIcon +'"></i>\n';
-                  menuHtml += ' <cite>' +res.data[i].menu+ '</cite>\n';
-                  menuHtml += '</a>\n';
-                  menuHtml += '<dl class="layui-nav-child">\n';
-                  for (var j = 0; j < res.data[i].subMenu.length; j++) {
-                    menuHtml += '<dd><a lay-href="' +res.data[i].subMenu[j].code+ '?resourceId='+ res.data[i].subMenu[j].id + '">' + res.data[i].subMenu[j].name + '</a></dd>\n';
-                  }
-                  menuHtml += '</dl>\n';
-                  menuHtml += '</li>\n';
+            // 婵�娲荤爜楠岃瘉
+            $.ajax({
+                url: baseUrl + "/system/activation/auth",
+                dataType: 'json',
+                method: 'GET',
+                async: false,
+                success: function (res) {
+                    if (res.code === 200) {
+                        $("#activation-icon").hide();
+                    } else {
+                        $("#activation-icon").click();
+                    }
                 }
-              }
-              $('#LAY-system-side-menu').append(menuHtml);
-              element.init();
-            } else if (res.code === 403){
-              top.location.href = baseUrl+"/login";
-            }else {
-              layer.alert(res.msg)
-            }
-          }
+            });
+
+            getMenu()
+
+            // 娉ㄩ攢
+            $(document).on('click', '#logout', function () {
+                localStorage.removeItem("token");
+            });
+
         });
-      }
-  });
-  </script>
+
+        // 鍔犺浇鑿滃崟
+        function getMenu() {
+            $.ajax({
+                url: baseUrl + "/menu/auth",
+                headers: {'token': localStorage.getItem('token')},
+                method: 'POST',
+                success: function (res) {
+                    if (res.code === 200) {
+                        var menuHtml = "";
+                        if (res.data != null) {
+                            for (var i = 0; i < res.data.length; i++) {
+                                menuHtml += '<li data-name="' + res.data[i].menuCode + '" class="layui-nav-item">\n';
+                                menuHtml += '<a href="javascript:;" lay-tips=' + res.data[i].menu + ' lay-direction="2">\n';
+                                menuHtml += '<i class="layui-icon ' + res.data[i].menuIcon + '"></i>\n';
+                                menuHtml += ' <cite>' + res.data[i].menu + '</cite>\n';
+                                menuHtml += '</a>\n';
+                                menuHtml += '<dl class="layui-nav-child">\n';
+                                for (var j = 0; j < res.data[i].subMenu.length; j++) {
+                                    menuHtml += '<dd><a lay-href="' + res.data[i].subMenu[j].code + '?resourceId=' + res.data[i].subMenu[j].id + '">' + res.data[i].subMenu[j].name + '</a></dd>\n';
+                                }
+                                menuHtml += '</dl>\n';
+                                menuHtml += '</li>\n';
+                            }
+                        }
+                        $('#LAY-system-side-menu').append(menuHtml);
+                        element.init();
+                    } else if (res.code === 403) {
+                        top.location.href = baseUrl + "/login";
+                    } else {
+                        layer.alert(res.msg)
+                    }
+                }
+            });
+        }
+    });
+</script>
 </body>
 </html>
 

--
Gitblit v1.9.1