update

潘钊
1 parent c9e2ea96
Showing 4 changed files with 61 additions and 13 deletions
src/main/resources/application-dev.properties
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/js/spatial_data.js
src/main/resources/static/real_control_v2/mapmonitor/real.html
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password= panzhao
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -26,7 +26,7 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/
-#http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
+#http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/
+http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
 http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
@@ -320,4 +320,10 @@
     background: rgba(255, 255, 255, 0.98);
     box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
     display: none;
+}
+
+.station-route-tree{
+    width: 100%;
+    height: 100%;
+    overflow: auto;
 }
 \ No newline at end of file
@@ -25,7 +25,7 @@ var gb_map_spatial_data = (function () {
                 return a.stationRouteCode - b.stationRouteCode;
             });
             //按线路分组
-            var lineStationArr = gb_common.groupBy(list, 'lineCode');
+            lineStationArr = gb_common.groupBy(list, 'lineCode');
             //再按上下行分组
             for (var lineCode in lineStationArr) {
                 lineStationArr[lineCode] = gb_common.groupBy(lineStationArr[lineCode], 'directions');
@@ -36,17 +36,21 @@ var gb_map_spatial_data = (function () {
     }
     var refresh = function () {
-        if(!triggerElem())
+        if (!triggerElem())
             return;
-        var chs = gb_map_overlay_mge.getCheckedDevice();
-        //要绘制的站点路由
-        var routes = {};
-        $.each(chs, function () {
-            routes[this.data.lineId+'_'+this.data.upDown]=1;
+        //绘制站点路由树
+        $('.station-route-tree').jstree({
+            'core': {
+                'data': get_st_route_tree_data()
+            },
+            'checkbox': {
+                'keep_selected_style': false,
+                'whole_node': false,
+                'tie_selection': false
+            },
+            'plugins': ['checkbox', 'state']
         });
-
-        console.log('chs', chs);
     }
     var triggerElem = function () {
@@ -63,6 +67,42 @@ var gb_map_spatial_data = (function () {
         return false;
     }
+    var get_st_route_tree_data = function () {
+        var treeData = [];
+
+        for (var lineCode in lineStationArr) {
+            name = gb_data_basic.codeToLine[lineCode].name;
+            treeData.push({
+                'text': name,
+                'children': [
+                    {
+                        'text': '上行',
+                        'children': grabs(lineStationArr[lineCode][0]),
+                    },
+                    {
+                        'text': '下行',
+                        'children': grabs(lineStationArr[lineCode][1]),
+                    }
+                ]
+            })
+        }
+        return treeData;
+    };
+
+    var grabs = function (array) {
+        if (!array)
+            return;
+        var rs = [];
+        $.each(array, function () {
+            rs.push({
+                'text': this.stationName,
+                'data': {},
+                'icon': false
+            });
+        });
+        return rs;
+    }
+
     return {
         refresh: refresh,
         init: init
@@ -30,7 +30,9 @@
 </div>
 <div class="real_spatial_panel uk-animation-scale">
+    <div class="station-route-tree">
+    </div>
 </div>
 <script src="/real_control_v2/mapmonitor/js/config.js"></script>