Commit 1c76287b0c49ca5339069b69411611f4dd0900be

Authored by 王通
1 parent c80575b8

1.翻班时间填写,群发消息短语可全选进线调选择的所有线路的车辆

src/main/resources/static/real_control_v2/fragments/home/context_menu.html
... ... @@ -41,7 +41,7 @@
41 41 <h2>群发消息短语</h2></div>
42 42  
43 43 <div class="uk-grid ct-modal-body send-multi-grid">
44   - <div class="uk-width-2-6">
  44 + <div class="uk-width-2-6" style="overflow-x: hidden; overflow-y: auto; max-height:250px;">
45 45 <div class="device-tree"></div>
46 46 </div>
47 47 <div class="uk-width-4-6" style="border-left: 1px solid #dddddd;">
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
... ... @@ -12,9 +12,9 @@
12 12 <span class="line_name"></span>每天
13 13 <div class="uk-form-icon" style="margin: 0 5px;">
14 14 <i class="uk-icon-clock-o"></i>
15   - <input name="startOptInput" readonly type="text" class="z-depth-input" value="{{startOpt}}"
  15 + <input name="startOptInput" class="z-depth-input" value="{{startOpt}}"
16 16 style="width: 151px;"
17   - data-uk-timepicker>
  17 + type="time">
18 18 </div>
19 19 更新到当日排班
20 20 </div>
... ...
src/main/resources/static/real_control_v2/js/home/context_menu.js
... ... @@ -143,6 +143,11 @@ var gb_home_context_menu = (function() {
143 143 var elem = show_modal(modal, dom);
144 144 //create tree
145 145 var treeData = gb_common.get_device_tree_data(gb_data_gps.allGps);
  146 + treeData = {
  147 + 'id': 0,
  148 + 'text': '全选',
  149 + 'children': treeData
  150 + }
146 151 var treeObj = $('.device-tree', modal).jstree({
147 152 'core': {
148 153 'data': treeData
... ...