Merge remote-tracking branch 'origin/master'

sec-beidou/src/main/resources/static/api/init.json

@@ -4,7 +4,7 @@
     "href": "page/device_overview"
   },
   "logoInfo": {
-    "title": "形变监测平台",
+    "title": "北斗管理平台",
     "image": "images/logo.png",
     "href": ""
   },
@@ -16,7 +16,7 @@
       "target": "_self",
       "child": [
         {
-          "title": "设备总览",
+          "title": "首页",
           "href": "page/device_overview",
           "icon": "fa fa-home",
           "target": "_self"
@@ -40,18 +40,6 @@
               "target": "_self"
             }
           ]
-        },
-		{
-		  "title": "北斗",
-		  "href": "",
-		  "icon": "fa fa-star-o",
-		  "target": "",
-		  "child": [
-		    {
-			  "title": "运行状态",
-			  "href": "page/gnss_status",
-			  "icon": "fa fa-tachometer",
-			  "target": "_self"
         },
         {
           "title": "配置管理",
@@ -104,90 +92,34 @@
               "target": "_self"
             }
           ]
-			}
-		  ]
         },
         {
-		  "title": "测斜仪",
+          "title": "解算结果",
-		  "href": "",
-		  "icon": "fa fa-area-chart",
-		  "target": "",
-		  "child": [
-		    {
-			  "title": "运行状态",
-			  "href": "",
-			  "icon": "fa fa-tachometer",
-			  "target": "_self"
-			},
-		    {
-		      "title": "配置管理",
-		      "href": "",
-		      "icon": "fa fa-gear",
-		      "target": "_self"
-		    }
-		  ]
-		},
-		{
-		  "title": "光伏DTU",
-		  "href": "",
-		  "icon": "fa fa-sun-o",
-		  "target": "",
-		  "child": [
-		    {
-			  "title": "运行状态",
-			  "href": "",
-			  "icon": "fa fa-tachometer",
-			  "target": "_self"
-			},
-		    {
-		      "title": "配置管理",
-		      "href": "",
-		      "icon": "fa fa-gear",
-		      "target": "_self",
-		      "child": [
-		        {
-		          "title": "通用参数",
-		          "href": "",
-		          "icon": "fa fa-minus",
-		          "target": "_self"
-		        },
-				{
-				  "title": "设备参数",
-				  "href": "",
-				  "icon": "fa fa-minus",
-				  "target": "_self"
-				}
-		      ]
-		    },
-			{
-			  "title": "设备消息",
           "href": "",
           "icon": "fa fa-file-text-o",
           "target": "_self",
           "child": [
             {
               "title": "消息摘要",
-			      "href": "",
+              "href": "page/gnss_msg",
               "icon": "fa fa-minus",
               "target": "_self"
             },
             {
               "title": "状态消息",
-				  "href": "",
+              "href": "page/gnss_msg_status",
               "icon": "fa fa-minus",
               "target": "_self"
             },
             {
               "title": "统计消息",
-				  "href": "",
+              "href": "page/gnss_msg_trx",
               "icon": "fa fa-minus",
               "target": "_self"
             }
           ]
         }
       ]
-		}
-      ]
     },
     {
       "title": "系统管理",
@@ -220,40 +152,6 @@
           "target": "_self"
         }
       ]
-    },
-    {
-      "title": "监测数据",
-      "icon": "fa fa-slideshare",
-      "href": "",
-      "target": "_self",
-      "child": [
-        {
-          "title": "北斗",
-          "href": "",
-          "icon": "fa fa-star-o",
-          "target": "",
-          "child": [
-            {
-              "title": "解算结果",
-              "href": "page/gnss_data_calc",
-              "icon": "fa fa-calculator",
-              "target": "_self"
-            },
-			{
-			  "title": "原始数据",
-			  "href": "page/gnss_data_raw",
-			  "icon": "fa fa-database",
-			  "target": "_self"
-			}
-          ]
-        },
-        {
-          "title": "测斜仪",
-          "href": "",
-          "icon": "fa fa-area-chart",
-          "target": "_self"
-        }
-      ]
     }
   ]
 }

sec-beidou/src/main/resources/templates/page/device_overview.html

@@ -1,8 +1,24 @@
 <style>
-    .top-panel {border:1px solid #eceff9;border-radius:5px;text-align:center;}
+    .top-panel {
-    .top-panel > .layui-card-body {height:60px;}
+        border: 1px solid #eceff9;
-    .top-panel-number {line-height:60px;font-size:30px;border-right:1px solid #eceff9;}
+        border-radius: 5px;
-    .top-panel-tips {line-height:30px;font-size:12px}
+        text-align: center;
+    }
+
+    .top-panel > .layui-card-body {
+        height: 60px;
+    }
+
+    .top-panel-number {
+        line-height: 60px;
+        font-size: 30px;
+        border-right: 1px solid #eceff9;
+    }
+
+    .top-panel-tips {
+        line-height: 30px;
+        font-size: 12px
+    }
 </style>
 
 <div class="layuimini-container layuimini-page-anim">
@@ -11,7 +27,7 @@
             <div class="layui-col-xs12 layui-col-md4">
 
                 <div class="layui-card top-panel">
-                    <div class="layui-card-header">北斗GNSS接收机</div>
+                    <div class="layui-card-header">设备数量</div>
                     <div class="layui-card-body">
                         <div class="layui-row layui-col-space5">
                             <div class="layui-col-xs9 layui-col-md8 top-panel-number">
@@ -29,43 +45,26 @@
             <div class="layui-col-xs12 layui-col-md4">
 
                 <div class="layui-card top-panel">
-                    <div class="layui-card-header">测斜仪统计</div>
+                    <div class="layui-card-header">告警统计</div>
                     <div class="layui-card-body">
                         <div class="layui-row layui-col-space5">
                             <div class="layui-col-xs9 layui-col-md8 top-panel-number">
-                    			<a style="color: #1aa094">520</a><br>
+                                <a style="color: #1aa094">告警总数</a><br>
                             </div>
                             <div class="layui-col-xs3 layui-col-md4">
-								装机量 <a style="color: #bd3004">2040</a><br>
+                                严重 <a style="color: #bd3004">2040</a><br>
-								在线数 <a style="color: #C0C0C0">2020</a>
+                                一般 <a style="color: #C0C0C0">2020</a>
                             </div>
                         </div>
                     </div>
                 </div>
 
             </div>
-            <div class="layui-col-xs12 layui-col-md4">
 
-                <div class="layui-card top-panel">
-                    <div class="layui-card-header">光伏DTU统计</div>
-                    <div class="layui-card-body">
-                    	<div class="layui-row layui-col-space5">
-                    		<div class="layui-col-xs9 layui-col-md8 top-panel-number">
-                    			<a style="color: #1aa094">5,020</a><br>
-                    		</div>
-                    		<div class="layui-col-xs3 layui-col-md4">
-								装机量 <a style="color: #bd3004">2040</a><br>
-								在线数 <a style="color: #C0C0C0">2020</a>
-                    		</div>
-                    	</div>
-                    </div>
         </div>
 
     </div>
-        </div>
+    <div id="map-container" style="height: 85vh;weight :100vw"></div>
-
-    </div>
-	<div id="map-container" style="height: 85vh;weight :100vw" ></div>
 </div>
 
 
@@ -73,7 +72,7 @@
     function initialize() {
         var map = new BMapGL.Map("map-container");            // 创建Map实例
         var point = new BMapGL.Point(116.404, 39.915); // 创建点坐标
-		map.centerAndZoom(point,15);
+        map.centerAndZoom(point, 15);
         map.enableScrollWheelZoom();
     }