Commit 22320eab8ce898ee8111bf8678201fcf755911fb
1 parent
58044ae7
页面优化
Showing
6 changed files
with
16 additions
and
20 deletions
src/main/resources/static/real_control_v2/main.html
| @@ -384,8 +384,8 @@ | @@ -384,8 +384,8 @@ | ||
| 384 | <div class="multi_plat_msg_pop_klyj" ></div> | 384 | <div class="multi_plat_msg_pop_klyj" ></div> |
| 385 | <script id="klyj_plat_msg_template" type="text/html"> | 385 | <script id="klyj_plat_msg_template" type="text/html"> |
| 386 | <div class="multi_plat_config" data-type="{{type}}" data-uuid="{{uuid}}"> | 386 | <div class="multi_plat_config" data-type="{{type}}" data-uuid="{{uuid}}"> |
| 387 | - <div class="msg-popup warning-color" style="text-align: center;min-height: 0;"> <span>智能调度助手分析</span></div> | ||
| 388 | - <div id="depsepDiv" class="msg-popup warning-color" style="white-space: pre-line;"></div> | 387 | + <!-- <div class="msg-popup warning-color" style="text-align: center;min-height: 0;"> <span>智能调度助手分析</span></div> |
| 388 | + <div id="depsepDiv" class="msg-popup warning-color" style="white-space: pre-line;"></div>--> | ||
| 389 | <div id ={{uuid}} class="timer"></div> | 389 | <div id ={{uuid}} class="timer"></div> |
| 390 | <div class="msg-popup warning-color"> | 390 | <div class="msg-popup warning-color"> |
| 391 | <div class="msg-times" style="cursor: pointer;">×</div> | 391 | <div class="msg-times" style="cursor: pointer;">×</div> |
src/main/resources/static/real_control_v2/zndd/type/djg1.html
| 1 | -<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal"> | 1 | +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal-v2"> |
| 2 | <div class="uk-modal-dialog" style="width: 1500px;"> | 2 | <div class="uk-modal-dialog" style="width: 1500px;"> |
| 3 | <a href="" class="uk-modal-close uk-close"></a> | 3 | <a href="" class="uk-modal-close uk-close"></a> |
| 4 | <div class="uk-modal-header"> | 4 | <div class="uk-modal-header"> |
| @@ -46,7 +46,7 @@ | @@ -46,7 +46,7 @@ | ||
| 46 | 46 | ||
| 47 | <script> | 47 | <script> |
| 48 | (function () { | 48 | (function () { |
| 49 | - var modal = '#schedule-addsch-modal', | 49 | + var modal = '#schedule-addsch-modal-v2', |
| 50 | sch, stationRoutes, parks, information, carsArray, st_park_data,conf; | 50 | sch, stationRoutes, parks, information, carsArray, st_park_data,conf; |
| 51 | 51 | ||
| 52 | $(modal).on('init', function (e, data) { | 52 | $(modal).on('init', function (e, data) { |
src/main/resources/static/real_control_v2/zndd/type/dkl.html
| 1 | -<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal"> | 1 | +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal-v2"> |
| 2 | <div class="uk-modal-dialog" style="width: 1400px;"> | 2 | <div class="uk-modal-dialog" style="width: 1400px;"> |
| 3 | <a href="" class="uk-modal-close uk-close"></a> | 3 | <a href="" class="uk-modal-close uk-close"></a> |
| 4 | <div class="uk-modal-header"> | 4 | <div class="uk-modal-header"> |
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | var timemm = 1000 * 30 ; //定时器 自动执行 | 51 | var timemm = 1000 * 30 ; //定时器 自动执行 |
| 52 | 52 | ||
| 53 | (function () { | 53 | (function () { |
| 54 | - var modal = '#schedule-addsch-modal', | 54 | + var modal = '#schedule-addsch-modal-v2', |
| 55 | sch, stationRoutes, parks, information, carsArray, st_park_data,conf; | 55 | sch, stationRoutes, parks, information, carsArray, st_park_data,conf; |
| 56 | 56 | ||
| 57 | $(modal).on('init', function (e, data) { | 57 | $(modal).on('init', function (e, data) { |
src/main/resources/static/real_control_v2/zndd/type/fcjg.html
| 1 | -<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal"> | 1 | +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal-v2"> |
| 2 | <div class="uk-modal-dialog" style="width: 1020px;"> | 2 | <div class="uk-modal-dialog" style="width: 1020px;"> |
| 3 | <a href="" class="uk-modal-close uk-close"></a> | 3 | <a href="" class="uk-modal-close uk-close"></a> |
| 4 | <div class="uk-modal-header"> | 4 | <div class="uk-modal-header"> |
| @@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
| 34 | 34 | ||
| 35 | <script> | 35 | <script> |
| 36 | (function () { | 36 | (function () { |
| 37 | - var modal = '#schedule-addsch-modal', | 37 | + var modal = '#schedule-addsch-modal-v2', |
| 38 | sch, stationRoutes, parks, information, carsArray, st_park_data,conf; | 38 | sch, stationRoutes, parks, information, carsArray, st_park_data,conf; |
| 39 | debugger | 39 | debugger |
| 40 | var f = $('.uk-form-horizontal', modal); | 40 | var f = $('.uk-form-horizontal', modal); |
src/main/resources/static/real_control_v2/zndd/type/mz.html
| 1 | -<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal"> | 1 | +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal-v2"> |
| 2 | <div class="uk-modal-dialog" style="width: 1500px;"> | 2 | <div class="uk-modal-dialog" style="width: 1500px;"> |
| 3 | <a href="" class="uk-modal-close uk-close"></a> | 3 | <a href="" class="uk-modal-close uk-close"></a> |
| 4 | <div class="uk-modal-header"> | 4 | <div class="uk-modal-header"> |
| @@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
| 40 | 40 | ||
| 41 | <script> | 41 | <script> |
| 42 | (function () { | 42 | (function () { |
| 43 | - var modal = '#schedule-addsch-modal', | 43 | + var modal = '#schedule-addsch-modal-v2', |
| 44 | sch, stationRoutes, parks, information, carsArray, st_park_data,conf; | 44 | sch, stationRoutes, parks, information, carsArray, st_park_data,conf; |
| 45 | 45 | ||
| 46 | $(modal).on('init', function (e, data) { | 46 | $(modal).on('init', function (e, data) { |
| @@ -58,7 +58,7 @@ | @@ -58,7 +58,7 @@ | ||
| 58 | debugger | 58 | debugger |
| 59 | sch.startStation = route[0]; | 59 | sch.startStation = route[0]; |
| 60 | sch.stopStation = route[route.length - 1]; | 60 | sch.stopStation = route[route.length - 1]; |
| 61 | - var formHtml = template('djg-form-temp', sch); | 61 | + var formHtml = template('Mz-form-temp', sch); |
| 62 | $('form', modal).html(formHtml); | 62 | $('form', modal).html(formHtml); |
| 63 | 63 | ||
| 64 | sch.rq1 =moment(new Date().getTime() - (60 *1000)).format("HH:mm"); | 64 | sch.rq1 =moment(new Date().getTime() - (60 *1000)).format("HH:mm"); |
| @@ -397,7 +397,7 @@ | @@ -397,7 +397,7 @@ | ||
| 397 | })(); | 397 | })(); |
| 398 | </script> | 398 | </script> |
| 399 | </div> | 399 | </div> |
| 400 | -<script id="djg-form-temp" type="text/html"> | 400 | +<script id="Mz-form-temp" type="text/html"> |
| 401 | <input type="hidden" name="id" value=""/> | 401 | <input type="hidden" name="id" value=""/> |
| 402 | 402 | ||
| 403 | <div class="uk-grid"> | 403 | <div class="uk-grid"> |
src/main/resources/static/real_control_v2/zndd/yanshi/static/css/sjz.css
| @@ -32,7 +32,6 @@ | @@ -32,7 +32,6 @@ | ||
| 32 | .history-date h2 a { | 32 | .history-date h2 a { |
| 33 | color:#00bbff; | 33 | color:#00bbff; |
| 34 | display:inline-block; | 34 | display:inline-block; |
| 35 | -*display:inline; | ||
| 36 | zoom:1; | 35 | zoom:1; |
| 37 | background:url(../image/icon08.gif) no-repeat right 50%; | 36 | background:url(../image/icon08.gif) no-repeat right 50%; |
| 38 | padding-right:17px; | 37 | padding-right:17px; |
| @@ -65,8 +64,8 @@ | @@ -65,8 +64,8 @@ | ||
| 65 | } | 64 | } |
| 66 | .history-date ul li h3 { | 65 | .history-date ul li h3 { |
| 67 | float:left; | 66 | float:left; |
| 68 | - width:20%; | ||
| 69 | - text-align:right; | 67 | +/* width:20%; |
| 68 | + text-align:right;*/ | ||
| 70 | padding-right:19px; | 69 | padding-right:19px; |
| 71 | color:#c3c3c3; | 70 | color:#c3c3c3; |
| 72 | font:normal 18px/16px Arial; | 71 | font:normal 18px/16px Arial; |
| @@ -77,9 +76,9 @@ | @@ -77,9 +76,9 @@ | ||
| 77 | font-size:12px; | 76 | font-size:12px; |
| 78 | } | 77 | } |
| 79 | .history-date ul li dl { | 78 | .history-date ul li dl { |
| 80 | - width: 70%; | 79 | + /*width: 70%;*/ |
| 81 | float:left; | 80 | float:left; |
| 82 | - padding-left:41px; | 81 | + /*padding-left:41px;*/ |
| 83 | margin-top:-5px; | 82 | margin-top:-5px; |
| 84 | font-family:微软雅黑; | 83 | font-family:微软雅黑; |
| 85 | } | 84 | } |
| @@ -107,7 +106,6 @@ | @@ -107,7 +106,6 @@ | ||
| 107 | } | 106 | } |
| 108 | .history-date ul li.green dl dt a { | 107 | .history-date ul li.green dl dt a { |
| 109 | display:inline-block; | 108 | display:inline-block; |
| 110 | -*display:inline; | ||
| 111 | zoom:1; | 109 | zoom:1; |
| 112 | overflow:hidden; | 110 | overflow:hidden; |
| 113 | vertical-align:middle; | 111 | vertical-align:middle; |
| @@ -143,8 +141,6 @@ | @@ -143,8 +141,6 @@ | ||
| 143 | } | 141 | } |
| 144 | *body .history-date ul li.green dl dt a { | 142 | *body .history-date ul li.green dl dt a { |
| 145 | _background:transparent!important; | 143 | _background:transparent!important; |
| 146 | -*background:transparent!important; | ||
| 147 | -*font-size:12px!important; | ||
| 148 | _font-weight:normal!important; | 144 | _font-weight:normal!important; |
| 149 | } | 145 | } |
| 150 | .timerssn{ | 146 | .timerssn{ |