Commit a6baf4ca43e7cbb262608c62847f6735f86855e3

Authored by 潘钊
1 parent d274d563

update...

src/main/resources/static/real_control_v2/css/handicapped_style.css 0 → 100644
  1 +/** 为残疾人提供的一份样式 , .ct_table.line-schedule-table dl dt*/
  2 +
  3 +.ct_table.line-schedule-table dl dd{
  4 + border-right-color: #000000 !important;
  5 + border-top: 1px solid #000000 !important;
  6 + color: #000000;
  7 +}
  8 +
  9 +.schedule-body .ct_table.line-schedule-table dl:nth-child(even){
  10 + background: rgba(114, 197, 210, 0.33) !important;
  11 +}
  12 +
  13 +.tl-yzx{
  14 + background: rgb(151, 151, 223) !important;
  15 +}
  16 +
  17 +.tl-zzzx {
  18 + background: rgb(152, 217, 54) !important;
  19 +}
  20 +
  21 +.tl-xxfc {
  22 + background: rgb(15, 220, 220) !important;
  23 +}
  24 +
  25 +.ct_table>.ct_table_body{
  26 + border-bottom: 1px solid #000000 !important;
  27 +}
src/main/resources/static/real_control_v2/css/main.css
@@ -1699,4 +1699,13 @@ dl.active>dd.disabled{ @@ -1699,4 +1699,13 @@ dl.active>dd.disabled{
1699 1699
1700 .display_hide{ 1700 .display_hide{
1701 display: none; 1701 display: none;
  1702 +}
  1703 +
  1704 +.ct_eye_icon{
  1705 + font-size: 16px;
  1706 + cursor: pointer;
  1707 +}
  1708 +
  1709 +.ct_eye_icon.active{
  1710 + color: #444;
1702 } 1711 }
1703 \ No newline at end of file 1712 \ No newline at end of file
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
@@ -197,15 +197,19 @@ @@ -197,15 +197,19 @@
197 return; 197 return;
198 } 198 }
199 199
200 - if(!data.adjustExps && (data.status==-1  
201 - || (data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out'))){ 200 + //正常班次里程修改为0
  201 + var normalDestory = data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out';
  202 + //修改里程
  203 + var editJhlc = data.jhlc != sch.jhlc && data.jhlc != 0;
  204 + if(!data.adjustExps && (data.status==-1 || normalDestory || editJhlc)){
202 notify_err("当前操作需要选择调整原因!"); 205 notify_err("当前操作需要选择调整原因!");
203 return; 206 return;
204 } 207 }
205 208
206 //里程有修改 209 //里程有修改
207 - if(data.jhlc != sch.jhlc && data.jhlc != 0){  
208 - var confHtml = '<h4 style="color: #c04c4c;margin-bottom: 9px;">确认要将班次里程由'+sch.jhlc+' 修改为'+data.jhlc+' </h4><small>备注:</small>'; 210 + //if(data.jhlc != sch.jhlc && data.jhlc != 0){
  211 +
  212 + /*var confHtml = '<h4 style="color: #c04c4c;margin-bottom: 9px;">确认要将班次里程由'+sch.jhlc+' 修改为'+data.jhlc+' </h4><small>备注:</small>';
209 UIkit.modal.prompt(confHtml, data.remarks, function(remarks){ 213 UIkit.modal.prompt(confHtml, data.remarks, function(remarks){
210 if(remarks){ 214 if(remarks){
211 //在这里写操作日志 215 //在这里写操作日志
@@ -221,10 +225,10 @@ @@ -221,10 +225,10 @@
221 Ok: '确定修改公里并保存', 225 Ok: '确定修改公里并保存',
222 Cancel: '取消' 226 Cancel: '取消'
223 } 227 }
224 - });  
225 - }  
226 - else  
227 - postData(data); 228 + });*/
  229 + //}
  230 + //else
  231 + postData(data);
228 }); 232 });
229 233
230 var postData = function (data) { 234 var postData = function (data) {
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 </a> 23 </a>
24 </div> 24 </div>
25 </div> 25 </div>
  26 + <i class="uk-icon-eye uk-icon-hover ct_eye_icon"></i>
26 <div class="search_sch_panel"> 27 <div class="search_sch_panel">
27 <form class="uk-form" onsubmit="javascript:return false;"> 28 <form class="uk-form" onsubmit="javascript:return false;">
28 <div class="uk-autocomplete sch-search-autocom"> 29 <div class="uk-autocomplete sch-search-autocom">
src/main/resources/static/real_control_v2/js/line_schedule/legend.js
@@ -8,7 +8,7 @@ var gb_sch_legend = (function () { @@ -8,7 +8,7 @@ var gb_sch_legend = (function () {
8 var animationend = 'webkitAnimationEnd animationend'; 8 var animationend = 'webkitAnimationEnd animationend';
9 var initLegend = function (cont) { 9 var initLegend = function (cont) {
10 //双击展开 10 //双击展开
11 - $('.schedule-wrap i.uk-icon-question-circle', cont).dblclick(openLegend); 11 + /*$('.schedule-wrap i.uk-icon-question-circle', cont).dblclick(openLegend);
12 12
13 //关闭事件 13 //关闭事件
14 $('.schedule-wrap .fixed_legend_close', cont).on('click', function () { 14 $('.schedule-wrap .fixed_legend_close', cont).on('click', function () {
@@ -35,13 +35,34 @@ var gb_sch_legend = (function () { @@ -35,13 +35,34 @@ var gb_sch_legend = (function () {
35 35
36 var flag=storage.getItem(locaKey); 36 var flag=storage.getItem(locaKey);
37 if(flag && flag==1) 37 if(flag && flag==1)
38 - openLegend(); 38 + openLegend();*/
  39 +
  40 + //eye init
  41 + var eyeState = storage.getItem('eye_state');
  42 + if(eyeState && eyeState==1)
  43 + $(eye_dom).eq(0).trigger('click');
39 }; 44 };
40 45
  46 + var eye_dom = '.schedule-wrap i.ct_eye_icon';
  47 + $(document).on('click', eye_dom, changeHandicappedStyle);
  48 + function changeHandicappedStyle() {
  49 + if($(this).hasClass('active')){
  50 + $(eye_dom).removeClass('active');
  51 + $('#handicappedStyleLink', 'head').remove();
  52 + storage.setItem('eye_state', 0);
  53 + }
  54 + else{
  55 + $(eye_dom).addClass('active');
  56 + $("<link>").attr({rel: "stylesheet", type: "text/css", href: "/real_control_v2/css/handicapped_style.css",
  57 + id: 'handicappedStyleLink'
  58 + }).appendTo("head");
  59 + storage.setItem('eye_state', 1);
  60 + }
  61 + }
41 62
42 //展开图例 63 //展开图例
43 var openLegend = function () { 64 var openLegend = function () {
44 - $('.qtip.sch-tl-tip').qtip('destroy', true); 65 + /*$('.qtip.sch-tl-tip').qtip('destroy', true);
45 66
46 //隐藏ICON 67 //隐藏ICON
47 $('.schedule-wrap i.uk-icon-question-circle').hide(); 68 $('.schedule-wrap i.uk-icon-question-circle').hide();
@@ -58,7 +79,7 @@ var gb_sch_legend = (function () { @@ -58,7 +79,7 @@ var gb_sch_legend = (function () {
58 $('.schedule-wrap .fixed_legend').css('display', 'inline-block'); 79 $('.schedule-wrap .fixed_legend').css('display', 'inline-block');
59 80
60 //记录状态 81 //记录状态
61 - storage.setItem(locaKey, 1); 82 + storage.setItem(locaKey, 1);*/
62 }; 83 };
63 84
64 return { 85 return {
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -105,8 +105,10 @@ var gb_schedule_table = (function () { @@ -105,8 +105,10 @@ var gb_schedule_table = (function () {
105 //标记路牌最后一个班次 105 //标记路牌最后一个班次
106 markerLastByLine(lineCode); 106 markerLastByLine(lineCode);
107 //初始化图例相关,dbclick 不能代理事件 107 //初始化图例相关,dbclick 不能代理事件
108 - gb_sch_legend.init(this); 108 + //gb_sch_legend.init(this);
109 }); 109 });
  110 + //初始化图例
  111 + gb_sch_legend.init();
110 var content = $('.line_schedule .ct_table_wrap'); 112 var content = $('.line_schedule .ct_table_wrap');
111 //初始化滚动条 113 //初始化滚动条
112 content.perfectScrollbar({suppressScrollX: true}); 114 content.perfectScrollbar({suppressScrollX: true});
src/main/resources/static/real_control_v2/js/utils/ct_table.js
@@ -49,7 +49,7 @@ var gb_ct_table = (function() { @@ -49,7 +49,7 @@ var gb_ct_table = (function() {
49 $tbody.empty().append(dls); 49 $tbody.empty().append(dls);
50 //console.log('replaceAfter..', replaceAfter); 50 //console.log('replaceAfter..', replaceAfter);
51 replaceAfter && replaceAfter($tbody); 51 replaceAfter && replaceAfter($tbody);
52 - } 52 + };
53 53
54 function toggleOrder(that) { 54 function toggleOrder(that) {
55 var order = $(that).data('order'); 55 var order = $(that).data('order');