Commit 6d096dcefbc241e1f1f0b366f62c618d9e56c4d0

Authored by 潘钊
1 parent 14e3d147

屏蔽页面的异常速度

src/main/resources/static/pages/base/geo_data_edit/css/mian.css
@@ -734,11 +734,42 @@ div[id*='PanoramaFlashWraperTANGRAM']{ @@ -734,11 +734,42 @@ div[id*='PanoramaFlashWraperTANGRAM']{
734 text-align: center; 734 text-align: center;
735 color: red; 735 color: red;
736 } 736 }
737 -/*  
738 -div[id*='PanoramaFlashWraperTANGRAM']:before{  
739 - content: "如果你使用的是chrome浏览器,请在设置里允许当前页面IP启用flash";  
740 - position: absolute;  
741 - top: 50px;  
742 - left: calc(50% - 220px);  
743 - font-size: 18px;  
744 -}*/ 737 +
  738 +._line_name a{
  739 + color: #484848;
  740 +}
  741 +
  742 +.clock_enable_version:empty{
  743 + display: none;
  744 +}
  745 +
  746 +.line_change_panel ul>li>div{
  747 + display: inline-block;
  748 + font-size: 14px;
  749 +}
  750 +
  751 +.line_change_panel div.name{
  752 + width: 140px;
  753 +}
  754 +
  755 +.line_change_panel div.code{
  756 + font-size: 12px;
  757 + font-family: 'Roboto Mono',monospace;
  758 + color: #f0506e;
  759 + white-space: nowrap;
  760 + padding: 2px 6px;
  761 + background: #f8f8f8;
  762 +}
  763 +
  764 +.line_change_panel ul>li:hover{
  765 + background: #f8f8f8;
  766 + cursor: pointer;
  767 +}
  768 +
  769 +.line_change_panel .uk-list>li:nth-child(n+2),.line_change_panel .uk-list>li>ul{
  770 + margin-top: 0;
  771 +}
  772 +
  773 +.line_change_panel .uk-list>li{
  774 + padding: 5px;
  775 +}
745 \ No newline at end of file 776 \ No newline at end of file
src/main/resources/static/pages/base/geo_data_edit/js/change_line.js 0 → 100644
  1 +/**
  2 + * 线路切换面板
  3 + */
  4 +
  5 +var gb_change_line = (function () {
  6 +
  7 + var data;
  8 +
  9 + var init = function () {
  10 +
  11 + var ep = EventProxy.create("findLine", "findCompanyData", function (lines, comps) {
  12 + //根据公司权限过滤线路
  13 + var lineArray = [];
  14 + for(var i=0,line;line=lines[i++];){
  15 + if(comps.indexOf(line.company + '_' + line.brancheCompany)){
  16 + //拼音映射
  17 + lineArray.push({
  18 + name: line.name,
  19 + code: line.lineCode,
  20 + came: pinyin.getCamelChars(line.name),
  21 + full: pinyin.getFullChars(line.name).toUpperCase()
  22 + });
  23 + }
  24 + }
  25 +
  26 + data = lineArray;
  27 + console.log('lineArraylineArray', lineArray);
  28 +
  29 + //按更新时间排序
  30 + lineArray.sort(function (a, b) {
  31 + return b.updateDate - a.updateDate;
  32 + });
  33 +
  34 + //渲染页面
  35 + var htmlStr = template('geo_d_e_dropdown_list-temp', {list: lineArray.slice(0, 10), ellipsis: lineArray.length > 10});
  36 + $('.line_change_panel ul.uk-list').html(htmlStr);
  37 + });
  38 +
  39 + $.get('/line/all', {destroy_eq: 0}, function (rs) {
  40 + ep.emit('findLine', rs);
  41 + });
  42 +
  43 + $.get('/user/companyData', {}, function (rs) {
  44 + var filters = [];
  45 + for(var i=0,obj;obj=rs[i++];){
  46 +
  47 + for(var j=0,sCom;sCom=obj.children[j++];){
  48 + filters.push(obj.companyCode + '_' + sCom.code);
  49 + }
  50 + }
  51 + ep.emit('findCompanyData', filters);
  52 + });
  53 + };
  54 +
  55 + /**
  56 + * 线路搜索
  57 + */
  58 + var search_k;
  59 + var search_flag;
  60 + $('.line_change_panel #line_search_input').on('input', function () {
  61 + search_k = $(this).val();
  62 + if(search_flag)
  63 + return;
  64 + search_flag = true;
  65 +
  66 + setTimeout(function () {
  67 + _search(search_k);
  68 + search_flag = false;
  69 + }, 300);
  70 + });
  71 +
  72 + function _search(v) {
  73 + v = v.toUpperCase();
  74 + var rs = [], ellipsis;
  75 + for(var i=0,obj;obj=data[i++];){
  76 + if(obj.came.indexOf(v)!=-1
  77 + || obj.full.indexOf(v)!=-1
  78 + || obj.name.indexOf(v)!=-1)
  79 + rs.push(obj);
  80 +
  81 + if(rs.length >= 10){
  82 + ellipsis = true;
  83 + break;
  84 + }
  85 + }
  86 +
  87 + var htmlStr = template('geo_d_e_dropdown_list-temp', {list: rs, ellipsis: ellipsis});
  88 + $('.line_change_panel ul.uk-list').empty().html(htmlStr);
  89 + }
  90 +
  91 + /**
  92 + * 点击切换线路 data-code
  93 + */
  94 + $('.line_change_panel ul.uk-list').on('click', 'li[data-code]', function () {
  95 + var lineCode = $(this).data('code');
  96 + storage.setItem('geo_data_edit_line_code' , lineCode);
  97 + storage.removeItem('geo_data_edit_line_version');
  98 +
  99 + $loadPanel.show();
  100 + clearAll();
  101 + startup();
  102 + });
  103 +
  104 + return {
  105 + init: init
  106 + };
  107 +})();
0 \ No newline at end of file 108 \ No newline at end of file
src/main/resources/static/pages/base/geo_data_edit/js/road_route.js
@@ -28,7 +28,7 @@ var gb_road_route = function () { @@ -28,7 +28,7 @@ var gb_road_route = function () {
28 }); 28 });
29 29
30 //加载数据 30 //加载数据
31 - var version = storage.getItem("geo_data_edit_line_version"); 31 + var version = g_version;
32 gb_common.$get('/_geo_data/findGeoRoad', {lineCode: lineCode,version:version}, function (rs) { 32 gb_common.$get('/_geo_data/findGeoRoad', {lineCode: lineCode,version:version}, function (rs) {
33 rs.list.sort(function (a, b) { 33 rs.list.sort(function (a, b) {
34 return parseInt(a.sectionrouteCode) - parseInt(b.sectionrouteCode); 34 return parseInt(a.sectionrouteCode) - parseInt(b.sectionrouteCode);
@@ -88,7 +88,7 @@ var gb_road_route = function () { @@ -88,7 +88,7 @@ var gb_road_route = function () {
88 var focus = function (data) { 88 var focus = function (data) {
89 clearFocus(); 89 clearFocus();
90 //sectionCode 90 //sectionCode
91 - var elem = $('.up_down_route_list>li>.road_route .r_r_item a[data-code='+data.sectionCode+']'); 91 + var elem = $('.up_down_route_list>li.uk-active>.road_route .r_r_item a[data-code='+data.sectionCode+']');
92 elem = elem.parent(); 92 elem = elem.parent();
93 elem.addClass('ct_active'); 93 elem.addClass('ct_active');
94 94
src/main/resources/static/pages/base/geo_data_edit/js/station_route.js
@@ -5,7 +5,7 @@ var gb_station_route = function () { @@ -5,7 +5,7 @@ var gb_station_route = function () {
5 var station_maps; 5 var station_maps;
6 //绘制线路路由 6 //绘制线路路由
7 var init = function (cb) { 7 var init = function (cb) {
8 - var lineCode = storage.getItem("geo_data_edit_line_code"); 8 + var lineCode = g_line_code;
9 9
10 var ep = EventProxy.create("data", "temp", function (data, temp) { 10 var ep = EventProxy.create("data", "temp", function (data, temp) {
11 station_maps = data; 11 station_maps = data;
@@ -25,7 +25,7 @@ var gb_station_route = function () { @@ -25,7 +25,7 @@ var gb_station_route = function () {
25 cb && cb(); 25 cb && cb();
26 }); 26 });
27 27
28 - var version = storage.getItem("geo_data_edit_line_version"); 28 + var version = g_version;
29 //加载数据 29 //加载数据
30 gb_common.$get('/_geo_data/findGeoStations', {lineCode: lineCode, version: version}, function (rs) { 30 gb_common.$get('/_geo_data/findGeoStations', {lineCode: lineCode, version: version}, function (rs) {
31 rs.list.sort(function (a, b) { 31 rs.list.sort(function (a, b) {
@@ -35,6 +35,7 @@ var gb_station_route = function () { @@ -35,6 +35,7 @@ var gb_station_route = function () {
35 //线路当前启用的线路版本 35 //线路当前启用的线路版本
36 storage.setItem("geo_data_enable_version" , rs['currentVersion']); 36 storage.setItem("geo_data_enable_version" , rs['currentVersion']);
37 //当前编辑的线路版本 37 //当前编辑的线路版本
  38 + g_version = rs['editVersion'];
38 storage.setItem("geo_data_edit_line_version" , rs['editVersion']); 39 storage.setItem("geo_data_edit_line_version" , rs['editVersion']);
39 40
40 var data = {0:[],1:[]}; 41 var data = {0:[],1:[]};
src/main/resources/static/pages/base/geo_data_edit/js/submit.js
@@ -69,8 +69,8 @@ var gb_data_submit = function () { @@ -69,8 +69,8 @@ var gb_data_submit = function () {
69 data.stationName = $.trim(data.stationName); 69 data.stationName = $.trim(data.stationName);
70 70
71 UIkit.modal.confirm('确定新增站点【'+data.stationName+'】?').then(function() { 71 UIkit.modal.confirm('确定新增站点【'+data.stationName+'】?').then(function() {
72 - data.lineCode = storage.getItem('geo_data_edit_line_code');  
73 - data.versions = storage.getItem('geo_data_edit_line_version'); 72 + data.lineCode = g_line_code;
  73 + data.versions = g_version;
74 data.upDown = getUpDown(); 74 data.upDown = getUpDown();
75 data.prevRouteId = gb_station_route.getAddPrevId(); 75 data.prevRouteId = gb_station_route.getAddPrevId();
76 data.lng = data.gLonx; 76 data.lng = data.gLonx;
@@ -98,8 +98,8 @@ var gb_data_submit = function () { @@ -98,8 +98,8 @@ var gb_data_submit = function () {
98 var data = f.serializeJSON(); 98 var data = f.serializeJSON();
99 99
100 UIkit.modal.confirm('确定新增路段【'+data.sectionName+'('+data.crosesRoad+')】?').then(function() { 100 UIkit.modal.confirm('确定新增路段【'+data.sectionName+'('+data.crosesRoad+')】?').then(function() {
101 - data.lineCode = storage.getItem('geo_data_edit_line_code');  
102 - data.versions = storage.getItem('geo_data_edit_line_version'); 101 + data.lineCode = g_line_code;
  102 + data.versions = g_version;
103 data.upDown = getUpDown(); 103 data.upDown = getUpDown();
104 104
105 data.prevRouteId = gb_road_route.getAddPrevId(); 105 data.prevRouteId = gb_road_route.getAddPrevId();
@@ -162,11 +162,12 @@ var gb_data_submit = function () { @@ -162,11 +162,12 @@ var gb_data_submit = function () {
162 $(document).on('click', '#add_line_versions_modal ._submit', function (e) { 162 $(document).on('click', '#add_line_versions_modal ._submit', function (e) {
163 var f = $('form', '#add_line_versions_modal'); 163 var f = $('form', '#add_line_versions_modal');
164 var data = f.serializeJSON(); 164 var data = f.serializeJSON();
165 - data.lineCode = storage.getItem('geo_data_edit_line_code'); 165 + data.lineCode = g_line_code;
166 166
167 UIkit.modal.confirm('确定线路版本【'+data.name+'】?').then(function() { 167 UIkit.modal.confirm('确定线路版本【'+data.name+'】?').then(function() {
168 $loadPanel.show(); 168 $loadPanel.show();
169 gb_common.$post('/_geo_data/addNewLineVersion', data, function (rs) { 169 gb_common.$post('/_geo_data/addNewLineVersion', data, function (rs) {
  170 + g_version = rs['newVersion'];
170 storage.setItem("geo_data_edit_line_version", rs['newVersion']); 171 storage.setItem("geo_data_edit_line_version", rs['newVersion']);
171 clearAll(); 172 clearAll();
172 startup(); 173 startup();
src/main/resources/static/pages/base/geo_data_edit/js/version_manage.js
@@ -9,7 +9,7 @@ var gb_version_manage = function () { @@ -9,7 +9,7 @@ var gb_version_manage = function () {
9 9
10 var temps; 10 var temps;
11 var init = function (enableVersion) { 11 var init = function (enableVersion) {
12 - var lineCode = storage.getItem("geo_data_edit_line_code"); 12 + var lineCode = g_line_code;
13 13
14 var ep = EventProxy.create("data", "temp", function () { 14 var ep = EventProxy.create("data", "temp", function () {
15 if(!current){ 15 if(!current){
@@ -17,7 +17,7 @@ var gb_version_manage = function () { @@ -17,7 +17,7 @@ var gb_version_manage = function () {
17 } 17 }
18 18
19 //线路名称 19 //线路名称
20 - $('.main_left_panel>._line_info>._line_name>span').text(lineName); 20 + $('.main_left_panel>._line_info>._line_name>.dropdown_txt').text(lineName);
21 //当前版本 21 //当前版本
22 $('.main_left_panel ._version_dropdown_wrap>._version_text') 22 $('.main_left_panel ._version_dropdown_wrap>._version_text')
23 .html(current.name + '<i uk-icon="icon: chevron-down;ratio:.6"></i>').removeClass('e0 e1 e2').addClass('e' + current.status); 23 .html(current.name + '<i uk-icon="icon: chevron-down;ratio:.6"></i>').removeClass('e0 e1 e2').addClass('e' + current.status);
@@ -126,7 +126,7 @@ var gb_version_manage = function () { @@ -126,7 +126,7 @@ var gb_version_manage = function () {
126 $(document).on('click', v_e_edit_modal + ' button._submit', function () { 126 $(document).on('click', v_e_edit_modal + ' button._submit', function () {
127 var f = $('form', v_e_edit_modal); 127 var f = $('form', v_e_edit_modal);
128 var data = f.serializeJSON(); 128 var data = f.serializeJSON();
129 - data.lineCode = storage.getItem('geo_data_edit_line_code'); 129 + data.lineCode = g_line_code;
130 130
131 gb_common.$post('/_geo_data/addEnableInfo', data, function () { 131 gb_common.$post('/_geo_data/addEnableInfo', data, function () {
132 UIkit.modal(v_e_edit_modal).hide(); 132 UIkit.modal(v_e_edit_modal).hide();
@@ -257,7 +257,7 @@ var gb_version_manage = function () { @@ -257,7 +257,7 @@ var gb_version_manage = function () {
257 $(document).on('click', '#enable_line_versions_modal button._submit', function () { 257 $(document).on('click', '#enable_line_versions_modal button._submit', function () {
258 var f = $('form', '#enable_line_versions_modal'); 258 var f = $('form', '#enable_line_versions_modal');
259 var data = f.serializeJSON(); 259 var data = f.serializeJSON();
260 - data.lineCode = storage.getItem('geo_data_edit_line_code'); 260 + data.lineCode = g_line_code;
261 261
262 gb_common.$post('/_geo_data/addEnableInfo', data, function () { 262 gb_common.$post('/_geo_data/addEnableInfo', data, function () {
263 UIkit.modal('#enable_line_versions_modal').hide(); 263 UIkit.modal('#enable_line_versions_modal').hide();
src/main/resources/static/pages/base/geo_data_edit/main.html
@@ -25,7 +25,14 @@ @@ -25,7 +25,14 @@
25 <div class="main_left_panel"> 25 <div class="main_left_panel">
26 <div class="_line_info"> 26 <div class="_line_info">
27 <div class="_line_name"> 27 <div class="_line_name">
28 - <span></span> 28 + <a class="dropdown_txt"></a>
  29 + <div class="line_change_panel" uk-dropdown>
  30 + <div class="uk-inline">
  31 + <a class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></a>
  32 + <input class="uk-input" type="text" id="line_search_input">
  33 + </div>
  34 + <ul class="uk-list"></ul>
  35 + </div>
29 36
30 <a uk-icon="icon: trash" class="remove_line_version_icon uk-animation-slide-right-small" title="删除线路版本" style="display: none" uk-tooltip></a> 37 <a uk-icon="icon: trash" class="remove_line_version_icon uk-animation-slide-right-small" title="删除线路版本" style="display: none" uk-tooltip></a>
31 <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路版本" uk-tooltip></a> 38 <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路版本" uk-tooltip></a>
@@ -45,7 +52,6 @@ @@ -45,7 +52,6 @@
45 <li><a>上行</a></li> 52 <li><a>上行</a></li>
46 <li><a>下行</a></li> 53 <li><a>下行</a></li>
47 54
48 - <!--<span class="rt_show_version_txt uk-badge uk-disabled uk-animation-slide-top-small"></span>-->  
49 </ul> 55 </ul>
50 56
51 <ul class="uk-switcher uk-margin up_down_route_list"> 57 <ul class="uk-switcher uk-margin up_down_route_list">
@@ -92,6 +98,18 @@ @@ -92,6 +98,18 @@
92 {{/if}} 98 {{/if}}
93 </ul> 99 </ul>
94 </script> 100 </script>
  101 +
  102 +<script id="geo_d_e_dropdown_list-temp" type="text/html">
  103 + {{each list as obj i}}
  104 + <li data-code="{{obj.code}}">
  105 + <div class="name">{{obj.name}}</div>
  106 + <div class="code">{{obj.code}}</div>
  107 + </li>
  108 + {{/each}}
  109 + {{if ellipsis}}
  110 + <li>...</li>
  111 + {{/if}}
  112 +</script>
95 <!-- 百度 --> 113 <!-- 百度 -->
96 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script> 114 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
97 <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script> 115 <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
@@ -116,6 +134,7 @@ @@ -116,6 +134,7 @@
116 <!-- flatpickr --> 134 <!-- flatpickr -->
117 <script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script> 135 <script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
118 <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script> 136 <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
  137 +<script src="/assets/plugins/pinyin.js"></script>
119 138
120 <script> 139 <script>
121 var $loadPanel = $('body>.loading'); 140 var $loadPanel = $('body>.loading');
@@ -147,9 +166,15 @@ @@ -147,9 +166,15 @@
147 var res_load_ep = EventProxy.create('load_common_data', 'load_station_route','load_road_route' 166 var res_load_ep = EventProxy.create('load_common_data', 'load_station_route','load_road_route'
148 , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () { 167 , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () {
149 startup(); 168 startup();
  169 +
  170 + gb_change_line.init();
150 }); 171 });
151 172
  173 + var g_line_code;
  174 + var g_version;
152 var startup = function () { 175 var startup = function () {
  176 + g_line_code = storage.getItem('geo_data_edit_line_code');
  177 +
153 gb_main_ep = new EventProxy(); 178 gb_main_ep = new EventProxy();
154 var eq = gb_main_ep; 179 var eq = gb_main_ep;
155 180
@@ -221,6 +246,8 @@ @@ -221,6 +246,8 @@
221 <script src="/pages/base/geo_data_edit/js/map.js" ></script> 246 <script src="/pages/base/geo_data_edit/js/map.js" ></script>
222 <script src="/pages/base/geo_data_edit/js/submit.js" ></script> 247 <script src="/pages/base/geo_data_edit/js/submit.js" ></script>
223 <script src="/pages/base/geo_data_edit/js/search.js" ></script> 248 <script src="/pages/base/geo_data_edit/js/search.js" ></script>
  249 +<script src="/pages/base/geo_data_edit/js/change_line.js" ></script>
  250 +
224 <script type="text/javascript" 251 <script type="text/javascript"
225 src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script> 252 src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
226 </body> 253 </body>