条码解析规则支持其他类型条码(L0000000000SB4371503H;E20201026 0365;B7H.22424.211821872020102603…

…000;R821872020102602187)

myproject/src/main/resources/ApplicationResources.properties

@@ -218,7 +218,7 @@ menu.bigdata.runStatus=Operation Stastics
 menu.bigdata.inOutList=Material receiving/retrieval log
 menu.bigdata.dataReport=Report
 menu.bigdata.dataLog=Material log
-menu.bigdata.errorLog=Error Log
+menu.bigdata.errorLog=Device Log
 menu.barCode.settings=Barcode Setting
 menu.box=SMD BOX
 menu.box.manage=SMD BOX management

myproject/src/main/resources/ApplicationResources_en.properties

@@ -218,7 +218,7 @@ menu.bigdata.runStatus=Operation Stastics
 menu.bigdata.inOutList=Material receiving/retrieval log
 menu.bigdata.dataReport=Report
 menu.bigdata.dataLog=Material log
-menu.bigdata.errorLog=Error Log
+menu.bigdata.errorLog=Device Log
 menu.barCode.settings=Barcode Setting
 menu.box=SMD BOX
 menu.box.manage=SMD BOX management

myproject/src/main/resources/ApplicationResources_zh.properties

@@ -175,7 +175,7 @@ menu.bigdata.runStatus=\u8FD0\u884C\u7EDF\u8BA1
 menu.bigdata.inOutList=\u51FA\u5165\u5E93\u8BB0\u5F55
 menu.bigdata.dataReport=\u6570\u636E\u62A5\u544A
 menu.bigdata.dataLog=\u7269\u6599\u65E5\u5FD7
-menu.bigdata.errorLog=\u5F02\u5E38\u5206\u6790
+menu.bigdata.errorLog=\u8BBE\u5907\u65E5\u5FD7
 menu.barCode.settings=\u6761\u7801\u8BBE\u7F6E
 menu.box=\u4E91\u6599\u4ED3
 menu.box.manage=\u6599\u4ED3\u7BA1\u7406

myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp

@@ -12,9 +12,27 @@
 <div class="row">
     <div class="col-md-12">
         <ul class="timeline">
+            <li class="timeline-blue">
+                <div class="timeline-time">
+								<span class="date">
+								2021 </span>
+								<span class="time">
+								04-28 </span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <div class="timeline-content">
+                        <ul>
+                            <li>条码解析规则支持其他类型条码(L0000000000SB4371503H;E20201026 0365;B7H.22424.211821872020102603000;R821872020102602187)</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-yellow timeline-noline">
             <div class="timeline-time">
-            <span class="date"> 2017 </span>
+            <span class="date"> 2020 </span>
             <span class="time"> 10-21 </span>
             </div>
             <div class="timeline-icon">

myproject/src/main/webapp/common/metroTopMenu.jsp

@@ -113,11 +113,6 @@
                 <fmt:message key="menu.bigdata.dataLog" /><span class="selected"></span>
             </a>
         </li>
-        <li class="classic-menu-dropdown">
-            <a href="${ctx}/dataLog/alarmInfoSearch.html" name="data">
-                <fmt:message key="menu.bigdata.errorLog" /><span class="selected"></span>
-            </a>
-        </li>
     </ul>
 </security:authorize>
     <%--system--%>
@@ -151,6 +146,12 @@
                 </a>
             </li>
         </security:authorize>
+
+        <li class="classic-menu-dropdown">
+            <a href="${ctx}/dataLog/alarmInfoSearch.html" name="system">
+                <fmt:message key="menu.bigdata.errorLog" /><span class="selected"></span>
+            </a>
+        </li>
     </ul>
 </div>