update...

潘钊
1 parent be528b9b
Showing 8 changed files with 104 additions and 4 deletions
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
src/main/resources/static/real_control_v2/js/north/second_timer.js
src/main/resources/static/real_control_v2/js/north/tabs.js
src/main/resources/static/real_control_v2/main.html
@@ -176,6 +176,10 @@ public class GpsDataLoaderThread extends Thread {
                 String nbbm;
                 for (GpsEntity gps : list) {
  
+                    //没有设备号
+                    if (StringUtils.isBlank(gps.getDeviceId()))
+                        continue;
+
                     nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
                     if (StringUtils.isBlank(nbbm))
                         gps.setIncomplete(true);//标记为异常数据
@@ -7,7 +7,7 @@
     }
  
     .line-select.selected {
-        height: 190px;
+        height: 210px;
     }
  
     .line-select .company {
@@ -306,4 +306,7 @@ span.signal-state-speed-limit{
  
 .home-gps-table dl.offline dd:nth-of-type(1) a{
     color: #a3a2a2;
+}
+.uk-tab>li:nth-child(n+2)>a{
+    margin-left: 0 !important;
 }
 \ No newline at end of file
 .north {
-    height: 120px;
+    /*height: 120px;*/
     position: relative;
     transition: all .3s ease;
 }
@@ -7,6 +7,7 @@
 .north.main {
     background: linear-gradient(to right, #082F4A, #125688, #0a3f64);
     /*background-image: url('/assets/img/title-bg.jpg');*/
+    padding-bottom: 0;
 }
  
 .north.monitor {
@@ -65,10 +66,10 @@
 }
  
 .north .north-tabs {
-    position: absolute;
     width: 100%;
     bottom: 1px;
     margin-left: -14px;
+    margin-top: 35px;
 }
  
 .north .north-tabs .uk-tab {
@@ -81,7 +82,7 @@
 }
  
 .north .north-tabs .uk-tab > li.tab-line > a {
-    padding: 8px 0px 8px 12px;
+    padding: 8px 0px 8px 17px;
 }
  
 .north .north-tabs .uk-tab > li > a:hover,
@@ -352,4 +353,15 @@
 .user_detail_tip .qtip-content{
     width: 300px;
     height: 220px;
+}
+
+.op-beijingtime-time{
+    padding-left: 0px;
+    width: 107px;
+}
+
+.op-beijingtime-time>span{
+    font-size: 18px !important;
+    font-family: Microsoft Yahei !important;
+    color: blue !important;
 }
 \ No newline at end of file
@@ -55,6 +55,9 @@
               </li>
               {{/each}}
             </ul>
+            <a class="uk-navbar-brand op-beijingtime-time" >
+                <span></span>
+            </a>
             <div class="uk-navbar-content uk-navbar-flip  uk-hidden-small" style="padding-left: 0;">
                 <div class="uk-button-group">
                     <button class="uk-button uk-button-danger exit-system">退出线调</button>
+/**
+ * 工具栏上的时钟
+ * @type {{}}
+ */
+var gb_second_timer = (function () {
+
+    var now;
+    var _this;
+    var secondTimer;
+    var contextFlag;
+
+    var init = function () {
+        _this = $('.op-beijingtime-time>span')[0];
+        getServerTime(function (time) {
+            now = time;
+            $('div.north').bind("contextmenu", function () {
+                contextFlag = true;
+            });
+            setTime();
+
+            secondTimer = window.setInterval(function () {
+                if(0 == now.getSeconds() || true == contextFlag){
+                    minuteTimer();
+                    contextFlag = false;
+                }
+
+                now = new Date(now.getTime() + 1e3);
+                setTime();
+            }, 1e3);
+        });
+    };
+
+    var getServerTime = function (callback) {
+        function oncallback(jqXHR) {
+            var time = jqXHR && jqXHR.getResponseHeader("Date");
+            if (time)
+                callback(new Date(time))
+        }
+
+        if ("function" == typeof callback)
+            $.ajax({
+                url: "/real_control_v2/assets/imgs/time.gif",
+                type: "HEAD"
+            }).done(function (data, textStatus, jqXHR) {
+                oncallback(jqXHR)
+            }).fail(function (jqXHR, textStatus, errorThrown) {
+                oncallback(jqXHR)
+            })
+    };
+
+    var timeFormat = function(str) {
+        return ("0" + str).slice(-2)
+    };
+
+    var setTime = function () {
+        _this.innerHTML = timeFormat(now.getHours()) + ':' + timeFormat(now.getMinutes()) + '.' + timeFormat(now.getSeconds());
+    };
+
+    var minuteTimer = function () {
+        getServerTime(function(time) {
+            now = time;
+            setTime()
+        })
+    };
+
+    window.setTimeout(init, 6000);
+})();
 \ No newline at end of file
@@ -17,6 +17,7 @@ var gb_tabs = (function() {
             $('.north-tabs').html(tabHtmlStr);
             $('.main-container').html(tabContentHtmlStr);
  
+            setTimeout(renderStyle, 4000);
             //地图选项卡初始点击
             $('#north_tabs_map_btn').one('click', function () {
                 if(typeof(gb_map_overlay_mge)!="undefined"){
@@ -37,6 +38,15 @@ var gb_tabs = (function() {
         });
     };
  
+    function renderStyle(){
+        var rows = parseInt($('.north-tabs').height() / 32);
+        if(rows > 1){
+            var contHeight = 120 + ((rows - 1) * 36 - 15);
+            $('.main-container').css('height', 'calc(100% - '+contHeight+'px)');
+            $('.north .north-tabs').css('margin-top', '20px');
+        }
+    }
+
     //文件载入完毕
     res_load_ep.emitLater('load_tab');
  
@@ -163,6 +163,7 @@
 <!-- north js -->
 <script src="/real_control_v2/js/north/toolbar.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/north/tabs.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/north/second_timer.js" merge="custom_js"></script>
 <!-- home js -->
 <script src="/real_control_v2/js/home/layout.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/home/line_panel.js" merge="custom_js"></script>