潘钊 / bsth_control · Commits

Commit 02132d33f65bec46a85900df5cdebf64083d00ca

Authored by 潘钊
1 parent 0a5d0580
build: skipped

update...

Inline Side-by-side
Showing 1 changed file with 28 additions and 20 deletions
src/main/resources/static/real_control_v2/alone_page/map/alone_wrap.html
  View file @02132d3
@@ -5,31 +5,37 @@ @@ -5,31 +5,37 @@
5 <meta charset="UTF-8"> 5 <meta charset="UTF-8">
6 <title>地图监控 v2.0</title> 6 <title>地图监控 v2.0</title>
7 <!-- uikit core style--> 7 <!-- uikit core style-->
8 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" />  
9 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="plugins"/>  
10 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="plugins"/> 8 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css"/>
  9 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css"
  10 + merge="plugins"/>
  11 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css"
  12 + merge="plugins"/>
11 <link rel="stylesheet" 13 <link rel="stylesheet"
12 href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="plugins"/> 14 href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="plugins"/>
13 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" merge="plugins"/>  
14 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" merge="plugins"/>  
15 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css" merge="plugins"/> 15 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css"
  16 + merge="plugins"/>
  17 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css"
  18 + merge="plugins"/>
  19 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css"
  20 + merge="plugins"/>
16 21
17 <!-- main style --> 22 <!-- main style -->
18 - <link rel="stylesheet" href="/real_control_v2/css/main.css" /> 23 + <link rel="stylesheet" href="/real_control_v2/css/main.css"/>
19 <!-- north style --> 24 <!-- north style -->
20 <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/> 25 <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
21 <!-- home style --> 26 <!-- home style -->
22 <link rel="stylesheet" href="/real_control_v2/css/home.css" merge="custom_style"/> 27 <link rel="stylesheet" href="/real_control_v2/css/home.css" merge="custom_style"/>
23 28
24 <!-- js tree --> 29 <!-- js tree -->
25 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.css" merge="plugins"/> 30 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.css" merge="plugins"/>
26 31
27 <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/> 32 <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
28 <!-- perfect-scrollbar style --> 33 <!-- perfect-scrollbar style -->
29 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/> 34 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css"
  35 + merge="plugins"/>
30 <!-- layer 3.0.3 --> 36 <!-- layer 3.0.3 -->
31 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css" merge="plugins"/>  
32 - <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css" merge="plugins"/> 37 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css" merge="plugins"/>
  38 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css" merge="plugins"/>
33 39
34 <!-- flatpickr --> 40 <!-- flatpickr -->
35 <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css" merge="plugins"/> 41 <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css" merge="plugins"/>
@@ -62,7 +68,7 @@ @@ -62,7 +68,7 @@
62 <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" merge="plugins"></script> 68 <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" merge="plugins"></script>
63 69
64 <!-- perfect-scrollbar --> 70 <!-- perfect-scrollbar -->
65 -<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" merge="plugins"></script> 71 +<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" merge="plugins"></script>
66 <!-- common js --> 72 <!-- common js -->
67 <script src="/real_control_v2/js/common.js"></script> 73 <script src="/real_control_v2/js/common.js"></script>
68 <!-- art-template 模版引擎 --> 74 <!-- art-template 模版引擎 -->
@@ -80,7 +86,7 @@ @@ -80,7 +86,7 @@
80 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.min.js" merge="uikit_js"></script> 86 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.min.js" merge="uikit_js"></script>
81 87
82 <!-- js tree --> 88 <!-- js tree -->
83 -<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js" merge="plugins" ></script> 89 +<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js" merge="plugins"></script>
84 <!-- layer 3.0.3 --> 90 <!-- layer 3.0.3 -->
85 <script src="/real_control_v2/assets/plugins/layer3.0.3/layer.js" merge="plugins"></script> 91 <script src="/real_control_v2/assets/plugins/layer3.0.3/layer.js" merge="plugins"></script>
86 92
@@ -95,12 +101,14 @@ @@ -95,12 +101,14 @@
95 101
96 </body> 102 </body>
97 <script> 103 <script>
98 - (function () {  
99 - gb_data_gps.fixedTimeRefresh();  
100 - //嵌入地图页面  
101 - $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {  
102 - $('.map-system-msg.flex-left').remove();  
103 - });  
104 - })(); 104 + gb_data_gps.fixedTimeRefresh();
  105 + //嵌入地图页面
  106 + $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
  107 + $('.map-system-msg.flex-left').remove();
  108 + });
  109 +
  110 + var isArray = function (obj) {
  111 + return Object.prototype.toString.call(obj) === '[object Array]';
  112 + };
105 </script> 113 </script>
106 </html> 114 </html>