潘钊 / bsth_control · Commits

Commit 23259b59e0bf673caf3c3047262b6d905c5eab02

Authored by 潘钊
1 parent 3ba92f76

update...

Inline Side-by-side
Showing 14 changed files with 424 additions and 79 deletions
src/main/java/com/bsth/controller/geo_data/GeoDataController.java 0 → 100644
  View file @23259b5
  1 +package com.bsth.controller.geo_data;
  2 +
  3 +import org.springframework.web.bind.annotation.RequestMapping;
  4 +import org.springframework.web.bind.annotation.RestController;
  5 +
  6 +/**
  7 + * Created by panzhao on 2017/12/7.
  8 + */
  9 +@RestController
  10 +@RequestMapping("/_geo_data")
  11 +public class GeoDataController {
  12 +
  13 +
  14 +}
... ...
src/main/java/com/bsth/entity/geo_data/GeoStation.java 0 → 100644
  View file @23259b5
  1 +package com.bsth.entity.geo_data;
  2 +
  3 +/**
  4 + * Created by panzhao on 2017/12/7.
  5 + */
  6 +public class GeoStation {
  7 +
  8 + private int id;
  9 +
  10 +}
... ...
src/main/java/com/bsth/service/geo_data/GeoDataService.java 0 → 100644
  View file @23259b5
  1 +package com.bsth.service.geo_data;
  2 +
  3 +/**
  4 + * Created by panzhao on 2017/12/7.
  5 + */
  6 +public interface GeoDataService {
  7 +
  8 +
  9 +}
... ...
src/main/resources/static/pages/base/geo_data_edit/css/mian.css 0 → 100644
  View file @23259b5
  1 +/* ^_^ baidu map hide logo */
  2 +.anchorBL, .anchorBL, .amap-logo, .amap-copyright {
  3 + display: none;
  4 +}
  5 +
  6 +html,body{
  7 + height: 100%;
  8 +}
  9 +.ct_page{
  10 + padding: 0;
  11 + height: 100%;
  12 +}
  13 +
  14 +div#map_wrap{
  15 + height: 100%;
  16 +}
  17 +
  18 +.main_left_panel{
  19 + position: absolute;
  20 + z-index: 999;
  21 + height: calc(100% - 20px);
  22 + width: 300px;
  23 + background: #fffffff5;
  24 + top: 7px;
  25 + left: 5px;
  26 + box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
  27 +}
  28 +.main_lt_search_panel{
  29 + position: absolute;
  30 + z-index: 99;
  31 + top: 10px;
  32 + left: 330px;
  33 + background: #fffffff5;
  34 + box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
  35 +}
  36 +.main_rt_tools_panel{
  37 + position: absolute;
  38 + z-index: 99;
  39 + top: 7px;
  40 + right: 7px;
  41 + background: #ffffff;
  42 + box-shadow: -5px 4px 15px rgba(90, 90, 90, 0.48);
  43 + padding: 0 12px;
  44 + text-align: center;
  45 + border-radius: 7px;
  46 + height: 28px;
  47 +}
  48 +
  49 +.main_rt_tools_panel>._icon{
  50 + margin: 0 9px;
  51 +}
  52 +.search_input{
  53 + width: 250px;
  54 + height: 42px;
  55 +}
  56 +
  57 +.search_input::placeholder{
  58 + color: grey;
  59 + font-size: 12px;
  60 +}
  61 +
  62 +._line_info{
  63 + width: 100%;
  64 + height: 90px;
  65 + background: white;
  66 + box-shadow: 0px -2px 15px rgba(90, 90, 90, 0.48);
  67 +}
  68 +
  69 +._line_name{
  70 + padding: 10px 0 0 15px;
  71 + font-weight: 600;
  72 + font-family: 微软雅黑;
  73 + font-size: 18px;
  74 + color: #484848;
  75 + position: relative;
  76 +}
  77 +
  78 +._version_dropdown_wrap{
  79 + padding: 4px 0 0 15px;
  80 +}
  81 +._version_text{
  82 + font-size: 14px;
  83 + color: #0aae0a;
  84 +}
  85 +._version_dropdown_wrap li.uk-active>a{
  86 + color: #0aae0a;
  87 +}
  88 +.uk-nav-header:not(:first-child) {
  89 + margin-top: 10px;
  90 +}
  91 +.add_line_version_icon{
  92 + position: absolute;
  93 + right: 18px;
  94 + top: 10px;
  95 +}
  96 +.clock_enable_version{
  97 + padding: 4px 0 0 15px;
  98 + font-size: 13px;
  99 + color: #ef4f4f;
  100 +}
  101 +
  102 +.clock_enable_version>a.uk-icon{
  103 + vertical-align: top;
  104 + margin-top: 6px;
  105 +}
  106 +._route_info_wrap{
  107 + height: calc(100% - 100px);
  108 + padding-top: 10px;
  109 +}
  110 +
  111 +._route_info_wrap .uk-tab>li>a{
  112 + padding: 9px 5px;
  113 +}
  114 +._route_info_wrap>ul.uk-tab{
  115 + padding-left: 10px;
  116 +}
  117 +.rt_show_version_txt{
  118 + position: absolute;
  119 + right: 7px;
  120 + bottom: 7px;
  121 + font-size: 12px;
  122 +}
  123 +.rt_show_version_txt{
  124 + position: absolute;
  125 + right: 7px;
  126 + bottom: 7px;
  127 + font-size: 12px;
  128 + padding: 5px 8px;
  129 +}
  130 +.station_route>ul{
  131 + padding: 0 0 0 30px;
  132 + font-size: 14px;
  133 + width: calc(100% - 38px);
  134 +}
  135 +
  136 +.station_route>ul.uk-list>li:nth-child(n+2), .uk-list>li>ul {
  137 + margin-top: 6px;
  138 +}
  139 +
  140 +.station_route>ul>li>a{
  141 + color: #434343;
  142 +
  143 + overflow: hidden;
  144 + text-overflow: ellipsis;
  145 + white-space: nowrap;
  146 + display: inline-block;
  147 + width: calc(100% - 50px);
  148 +}
  149 +.ct_route_badge{
  150 + font-size: 11px;
  151 + background: #b6b6b6;
  152 + height: 18px;
  153 + border-radius: 5px;
  154 + vertical-align: top;
  155 + margin-top: 1px;
  156 + padding: 0 4px;
  157 + margin-right: 3px;
  158 + min-width: 18px;
  159 + margin-left: 22px;
  160 +}
  161 +
  162 +.ct_route_badge.start{
  163 + margin-left: 0px;
  164 +}
  165 +.ct_route_badge.end{
  166 + margin-left: 0px;
  167 +}
  168 +.road_route{
  169 + padding-left: 25px;
  170 + width: calc(100% - 25px);
  171 + font-size: 14px;
  172 + color: #242424;
  173 + border-top: 1px solid #d5d5d5;
  174 + padding-top: 10px;
  175 +}
  176 +._route_info_wrap>ul.uk-switcher{
  177 + overflow: auto;
  178 + height: calc(100% - 62px);
  179 + margin-bottom: 0;
  180 + position: relative;
  181 +}
  182 +
  183 +._route_info_wrap ul.uk-list li:nth-child(n+2) {
  184 + margin-top: 4px;
  185 +}
  186 +.pos_tb_icon{
  187 + position: absolute;
  188 + bottom: 15px;
  189 + right: 15px;
  190 +}
0 191 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/fragments/left_card.html 0 → 100644
  View file @23259b5
  1 +<!-- 左线路卡片面板 -->
0 2 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/fragments/map_op.html 0 → 100644
  View file @23259b5
  1 +<!--- 地图操作相关 -->
0 2 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/fragments/rt_tools.html 0 → 100644
  View file @23259b5
  1 +<!--- 右上工具栏 -->
0 2 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/js/common_data.js 0 → 100644
  View file @23259b5
  1 +<!-- 数据 -->
  2 +var gb_common_data = function () {
  3 +
  4 +
  5 + res_load_ep.emitLater('load_common_data');
  6 + return {};
  7 +}();
0 8 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/js/history_edit_logs.js 0 → 100644
  View file @23259b5
  1 +<!-- 历史编辑日志 -->
  2 +
  3 +var gb_history_edit_logs = function () {
  4 +
  5 +
  6 + res_load_ep.emitLater('load_history_edit_logs');
  7 + return {};
  8 +}();
0 9 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/js/map.js 0 → 100644
  View file @23259b5
  1 +<!-- 地图操作 -->
  2 +
  3 +var gb_ct_map = function () {
  4 +
  5 + //初始化地图
  6 + if(!window.BMap){
  7 + alert('地图没有加载成功，请确认是否能正常连接外网！！');
  8 + }
  9 + var gb_map_consts = {
  10 + mapContainer: '#map_wrap',
  11 + center_point: {
  12 + lng: 121.544336,
  13 + lat: 31.221315
  14 + }
  15 + };
  16 +
  17 + map = new BMap.Map($(gb_map_consts.mapContainer)[0]);
  18 + //中心点和缩放级别
  19 + map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 13);
  20 + map.enableScrollWheelZoom();
  21 +
  22 +
  23 +
  24 + res_load_ep.emitLater('load_map');
  25 + return {};
  26 +}();
0 27 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/js/station_route.js 0 → 100644
  View file @23259b5
  1 +<!-- 站点路由 -->
  2 +var gb_station_route = function () {
  3 +
  4 + res_load_ep.emitLater('load_station_route');
  5 + return {};
  6 +}();
0 7 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/js/version_manage.js 0 → 100644
  View file @23259b5
  1 +<!-- 版本管理 -->
  2 +
  3 +var gb_version_manage = function () {
  4 +
  5 + res_load_ep.emitLater('load_version_manage');
  6 + return {};
  7 +}();
0 8 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/main.html
  View file @23259b5
... ... @@ -10,68 +10,9 @@
10 10 <!-- tooltip css-->
11 11 <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css" />
12 12 <link rel="stylesheet" href="/real_control_v2/css/pace.css" />
13   - <style>
14   - /* ^_^ baidu map hide logo */
15   - .anchorBL, .anchorBL, .amap-logo, .amap-copyright {
16   - display: none;
17   - }
18 13  
19   - html,body{
20   - height: 100%;
21   - }
22   - .ct_page{
23   - padding: 0;
24   - height: 100%;
25   - }
26   -
27   - div#map_wrap{
28   - height: 100%;
29   - }
30   -
31   - .main_left_panel{
32   - position: absolute;
33   - z-index: 999;
34   - height: calc(100% - 20px);
35   - width: 300px;
36   - background: #fffffff5;
37   - top: 7px;
38   - left: 5px;
39   - box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
40   - }
41   - .main_lt_search_panel{
42   - position: absolute;
43   - z-index: 99;
44   - top: 10px;
45   - left: 330px;
46   - background: #fffffff5;
47   - box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
48   - }
49   - .main_rt_tools_panel{
50   - position: absolute;
51   - z-index: 99;
52   - top: 7px;
53   - right: 7px;
54   - background: #ffffff;
55   - box-shadow: -5px 4px 15px rgba(90, 90, 90, 0.48);
56   - padding: 0 12px;
57   - text-align: center;
58   - border-radius: 7px;
59   - height: 28px;
60   - }
61   -
62   - .main_rt_tools_panel>._icon{
63   - margin: 0 9px;
64   - }
65   - .search_input{
66   - width: 250px;
67   - height: 42px;
68   - }
69   -
70   - .search_input::placeholder{
71   - color: grey;
72   - font-size: 12px;
73   - }
74   - </style>
  14 + <!-- main css -->
  15 + <link rel="stylesheet" href="/pages/base/geo_data_edit/css/mian.css" />
75 16 </head>
76 17  
77 18 <body>
... ... @@ -80,7 +21,107 @@
80 21 </div>
81 22 <div class="main_left_panel">
82 23 <div class="_line_info">
  24 + <div class="_line_name">
  25 + 961路
  26 + <a uk-icon="icon: plus" class="add_line_version_icon" title="添加一个新的线路版本" uk-tooltip></a>
  27 + </div>
  28 + <div class="_version_dropdown_wrap">
  29 + <a class="_version_text">原始版本 <i uk-icon="icon: chevron-down;ratio:.6"></i></a>
  30 + <div uk-dropdown>
  31 + <ul class="uk-nav uk-dropdown-nav">
  32 + <li class="uk-nav-header">历史</li>
  33 + <li><a>原始版本</a></li>
  34 + <li class="uk-nav-divider"></li>
  35 + <li class="uk-nav-header">启用</li>
  36 + <li class="uk-active"><a>20171206线路改道</a></li>
  37 + <li class="uk-nav-header">未来</li>
  38 + <li><a>20180206线路改道</a></li>
  39 + </ul>
  40 + </div>
  41 + </div>
  42 + <span class="clock_enable_version">
  43 + <a uk-icon="icon: clock;ratio: .7" class=""></a> 25:30:20 启用（20180206线路改道）
  44 + </span>
  45 + </div>
  46 +
  47 + <div class="_route_info_wrap">
  48 + <ul uk-tab>
  49 + <li><a>上行</a></li>
  50 + <li><a>下行</a></li>
  51 +
  52 + <span class="rt_show_version_txt uk-badge uk-disabled">
  53 + 20180206线路改道
  54 + </span>
  55 + </ul>
83 56  
  57 + <ul class="uk-switcher uk-margin">
  58 + <li>
  59 + <div class="station_route">
  60 + <ul class="uk-list">
  61 + <li><span class="uk-badge ct_route_badge start">起点站</span><a>陆家嘴</a></li>
  62 + <li><span class="uk-badge ct_route_badge">2</span><a>陆家嘴环路丰和路</a></li>
  63 + <li><span class="uk-badge ct_route_badge">3</span><a>浦东南路浦东大道</a></li>
  64 + <li><span class="uk-badge ct_route_badge">4</span><a>浦东南路商城路</a></li>
  65 + <li><span class="uk-badge ct_route_badge">5</span><a>浦东南路潍坊路</a></li>
  66 + <li><span class="uk-badge ct_route_badge">6</span><a>浦东南路浦电路</a></li>
  67 + <li><span class="uk-badge ct_route_badge">7</span><a>浦东南路宁阳路</a></li>
  68 + <li><span class="uk-badge ct_route_badge">8</span><a>浦东南路浦建路</a></li>
  69 + <li><span class="uk-badge ct_route_badge">9</span><a>浦东南路浦三路</a></li>
  70 + <li><span class="uk-badge ct_route_badge">10</span><a>浦东南路高科西路(上海长途东站)</a></li>
  71 + <li><span class="uk-badge ct_route_badge">11</span><a>浦东南路洪山路</a></li>
  72 + <li><span class="uk-badge ct_route_badge">12</span><a>浦东南路上南路</a></li>
  73 + <li><span class="uk-badge ct_route_badge">13</span><a>耀华路历城路</a></li>
  74 + <li><span class="uk-badge ct_route_badge">14</span><a>耀华路长清路</a></li>
  75 + <li><span class="uk-badge ct_route_badge">15</span><a>耀华路济阳路</a></li>
  76 + <li><span class="uk-badge ct_route_badge end">终点站</span><a>通耀路耀龙路</a></li>
  77 + </ul>
  78 + </div>
  79 + <div class="road_route">
  80 + <ul class="uk-list">
  81 + <li>
  82 + (新浜)共青路
  83 + <ul class="uk-list">
  84 + <li>(新浜)共青路</li>
  85 + <li>(新浜)共青路</li>
  86 + <li>(新浜)共青路</li>
  87 + <li>(新浜)共青路</li>
  88 + </ul>
  89 + </li>
  90 + <li>
  91 + (方松)三新路
  92 + <ul class="uk-list">
  93 + <li>(方松)三新路</li>
  94 + <li>(方松)三新路</li>
  95 + <li>(方松)三新路</li>
  96 + <li>(方松)三新路</li>
  97 + </ul>
  98 + </li>
  99 + <li>
  100 + (松江)中山东路
  101 + <ul class="uk-list">
  102 + <li>(松江)中山东路</li>
  103 + <li>(松江)中山东路</li>
  104 + <li>(松江)中山东路</li>
  105 + <li>(松江)中山东路</li>
  106 + </ul>
  107 + </li>
  108 + <li>
  109 + (松江)中山东路
  110 + <ul class="uk-list">
  111 + <li>(松江)中山东路</li>
  112 + <li>(松江)中山东路</li>
  113 + <li>(松江)中山东路</li>
  114 + <li>(松江)中山东路</li>
  115 + </ul>
  116 + </li>
  117 + </ul>
  118 + </div>
  119 + </li>
  120 + <li></li>
  121 + </ul>
  122 + <div class="pos_tb_icon">
  123 + <a uk-icon="icon: chevron-down;"></a>
  124 + </div>
84 125 </div>
85 126 </div>
86 127 <div class="main_lt_search_panel">
... ... @@ -91,7 +132,7 @@
91 132 </div>
92 133 <div class="main_rt_tools_panel">
93 134 <a uk-icon="icon: info;ratio: .9" class="_icon"></a>
94   - <a uk-icon="icon: expand;ratio: .9" class="_icon"></a>
  135 + <a uk-icon="icon: expand;ratio: .9" class="_icon full_screen_icon"></a>
95 136 </div>
96 137 </div>
97 138 <!-- 百度 -->
... ... @@ -112,28 +153,39 @@
112 153 <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
113 154 <!-- qtip -->
114 155 <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" ></script>
  156 +
  157 +
115 158 <script>
116 159 top.document.title = "绘制线路";
117 160 // 关闭左侧栏
118 161 if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
  162 + //全屏
  163 + $('.full_screen_icon').on('click', function () {
  164 + window.parent.$('#geo_edit_wrap_iframe').addClass('full_screen');
  165 + });
  166 +
119 167  
120   - //初始化地图
121   - if(!window.BMap){
122   - alert('地图没有加载成功，请确认是否能正常连接外网！！');
123   - }
124   - var gb_map_consts = {
125   - mapContainer: '#map_wrap',
126   - center_point: {
127   - lng: 121.544336,
128   - lat: 31.221315
129   - }
130   - };
  168 + //文件加载
  169 + var res_load_ep = EventProxy.create('load_common_data', 'load_station_route'
  170 + , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () {
131 171  
132   - map = new BMap.Map($(gb_map_consts.mapContainer)[0]);
133   - //map.setMapStyle({style:'dark'});
134   - //中心点和缩放级别
135   - map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 13);
136   - map.enableScrollWheelZoom();
  172 + UIkit.notification('加载完成！！');
  173 + });
  174 +
  175 + //滚动条
  176 + $('._route_info_wrap>ul.uk-switcher').perfectScrollbar({suppressScrollX: true});
  177 +
  178 + //to top btttom
  179 + $('.pos_tb_icon a').on('click', function () {
  180 + UIkit.notification('top top...');
  181 + });
137 182 </script>
  183 +
  184 +<!--- js -->
  185 +<script src="/pages/base/geo_data_edit/js/common_data.js" ></script>
  186 +<script src="/pages/base/geo_data_edit/js/station_route.js" ></script>
  187 +<script src="/pages/base/geo_data_edit/js/version_manage.js" ></script>
  188 +<script src="/pages/base/geo_data_edit/js/history_edit_logs.js" ></script>
  189 +<script src="/pages/base/geo_data_edit/js/map.js" ></script>
138 190 </body>
139 191 </html>
140 192 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/uk3_wrap.html
  View file @23259b5
1   -<iframe src="/pages/base/geo_data_edit/main.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
2 1 \ No newline at end of file
  2 +<style>
  3 + iframe.full_screen{
  4 + width: 100%;
  5 + height: 100%;
  6 + position: fixed;
  7 + z-index: 9999999;
  8 + top: 0;
  9 + left: 0;
  10 + margin-left: 0 !important;
  11 + padding-left: 0;
  12 + padding-top: 0;
  13 + }
  14 +</style>
  15 +<iframe id="geo_edit_wrap_iframe" src="/pages/base/geo_data_edit/main.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
3 16 \ No newline at end of file
... ...