潘钊 / bsth_control · Commits

Commit 85419dc2fc89fca5fa4df0d73dc1eb4e921f9fd7

Authored by 潘钊
1 parent b59169e5
build: skipped

Merge branch 'minhang' into qingpu 

# Conflicts:
#	src/main/resources/static/real_control_v2/main.html
Inline Side-by-side
Showing 1 changed file with 209 additions and 19 deletions
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
  View file @85419dc
@@ -8,50 +8,56 @@ @@ -8,50 +8,56 @@
8 "grid": [ 8 "grid": [
9 [ 9 [
10 { 10 {
11 - "id": 1.12, 11 + "id": 1.1,
12 "text": "数据管理", 12 "text": "数据管理",
13 "header": 1 13 "header": 1
14 }, 14 },
15 { 15 {
16 - "id": 1.52, 16 + "id": 1.2,
  17 + "text": "当日计划排班",
  18 + "event": "curr_date_schedule"
  19 + },
  20 + {
  21 + "id": 1.3,
  22 + "text": "缓存数据管理",
  23 + "event": "cache_data_manage"
  24 + },
  25 + {
  26 + "id": 1.4,
17 "text": "历史班次维护", 27 "text": "历史班次维护",
18 "event": "history_sch_maintain" 28 "event": "history_sch_maintain"
19 } 29 }
20 ], 30 ],
21 [ 31 [
22 { 32 {
23 - "id": 1.1, 33 + "id": 2.1,
24 "text": "统计分析", 34 "text": "统计分析",
25 "header": 1 35 "header": 1
26 }, 36 },
27 { 37 {
28 - "id": 1.2, 38 + "id": 2.2,
29 "text": "出车率", 39 "text": "出车率",
30 "event": "turnout_rate", 40 "event": "turnout_rate",
31 "icon": "uk-icon-pie-chart" 41 "icon": "uk-icon-pie-chart"
32 }, 42 },
33 { 43 {
34 - "id": 1.3, 44 + "id": 2.3,
35 "text": "设备上线率", 45 "text": "设备上线率",
36 "event": "device_online_rate", 46 "event": "device_online_rate",
37 "icon": "uk-icon-pie-chart" 47 "icon": "uk-icon-pie-chart"
38 }, 48 },
39 { 49 {
40 - "id": 1.4, 50 + "id": 2.4,
41 "divider": true 51 "divider": true
42 }, 52 },
43 { 53 {
44 - "id": 1.6, 54 + "id": 2.5,
45 "text": "线路首末班准点率", 55 "text": "线路首末班准点率",
46 "event": "s_e_punctuality_rate_line", 56 "event": "s_e_punctuality_rate_line",
47 "icon": "uk-icon-pie-chart" 57 "icon": "uk-icon-pie-chart"
48 }, 58 },
49 { 59 {
50 - "id": 1.8,  
51 - "divider": true  
52 - },  
53 - {  
54 - "id": 1.9, 60 + "id": 2.7,
55 "text": "班次执行率", 61 "text": "班次执行率",
56 "event": "sch_exec_rate", 62 "event": "sch_exec_rate",
57 "icon": "uk-icon-pie-chart" 63 "icon": "uk-icon-pie-chart"
@@ -61,41 +67,225 @@ @@ -61,41 +67,225 @@
61 }, 67 },
62 { 68 {
63 "id": 2, 69 "id": 2,
  70 + "text": "报表管理",
  71 + "clazz": "dropdown-column-2-lg",
  72 + "columns": true,
  73 + "cls_class": "uk-width-1-2",
  74 + "grid": [
  75 + [
  76 + {
  77 + "id": 2.1,
  78 + "text": "报表管理",
  79 + "header": 1
  80 + },
  81 + {
  82 + "id": 2.2,
  83 + "text": "月存油报表",
  84 + "event": "form_oilListMonth",
  85 + "icon": "uk-icon-table"
  86 + },
  87 + {
  88 + "id": 2.3,
  89 + "text": "时刻表分析",
  90 + "event": "form_scheduleAnaly",
  91 + "icon": "uk-icon-table"
  92 + },
  93 + {
  94 + "id": 2.4,
  95 + "text": "调度消息分析",
  96 + "event": "form_message",
  97 + "icon": "uk-icon-table"
  98 + },
  99 + {
  100 + "id": 2.5,
  101 + "text": "指令状态分析",
  102 + "event": "form_commandState",
  103 + "icon": "uk-icon-table"
  104 + },
  105 + {
  106 + "id": 2.6,
  107 + "text": "线路首末班查询",
  108 + "event": "form_firstAndLastBus",
  109 + "icon": "uk-icon-table"
  110 + },
  111 + {
  112 + "id": 2.7,
  113 + "text": "路单数据",
  114 + "event": "form_singledata",
  115 + "icon": "uk-icon-table"
  116 + },
  117 + {
  118 + "id": 2.8,
  119 + "text": "车辆加注",
  120 + "event": "form_vehicleloading",
  121 + "icon": "uk-icon-table"
  122 + },
  123 + {
  124 + "id": 2.9,
  125 + "text": "运营服务阶段报表",
  126 + "event": "form_operationservice",
  127 + "icon": "uk-icon-table"
  128 + },
  129 + {
  130 + "id": 3.0,
  131 + "text": "线路客流量报表",
  132 + "event": "form_linepassengerflow",
  133 + "icon": "uk-icon-table"
  134 + },
  135 + {
  136 + "id": 3.1,
  137 + "text": "换人换车情况统计表",
  138 + "event": "form_changetochange",
  139 + "icon": "uk-icon-table"
  140 + },
  141 + {
  142 + "id": 3.2,
  143 + "text": "营运线路出车率统计表",
  144 + "event": "form_turnoutrate",
  145 + "icon": "uk-icon-table"
  146 + },
  147 + {
  148 + "id": 3.3,
  149 + "text": "班次执行率统计表",
  150 + "event": "form_executionrate",
  151 + "icon": "uk-icon-table"
  152 + },
  153 + {
  154 + "id": 3.4,
  155 + "text": "营运线路名称统计表",
  156 + "event": "form_allline",
  157 + "icon": "uk-icon-table"
  158 + }
  159 + ],
  160 + [
  161 + {
  162 + "id": 4.1,
  163 + "text": "报表管理",
  164 + "header": 1
  165 + },
  166 + {
  167 + "id": 4.2,
  168 + "text": "行车路单",
  169 + "event": "form_waybill",
  170 + "icon": "uk-icon-table"
  171 + },
  172 + {
  173 + "id": 4.3,
  174 + "text": "调度历史消息",
  175 + "event": "form_history_message",
  176 + "icon": "uk-icon-table"
  177 + },
  178 + {
  179 + "id": 4.4,
  180 + "text": "驾驶员请求台账",
  181 + "event": "form_account",
  182 + "icon": "uk-icon-table"
  183 + },
  184 + {
  185 + "id": 4.5,
  186 + "text": "班次日报表",
  187 + "event": "form_daily",
  188 + "icon": "uk-icon-table"
  189 + },
  190 + {
  191 + "id": 4.6,
  192 + "text": "修正报表",
  193 + "event": "form_correctForm",
  194 + "icon": "uk-icon-table"
  195 + },
  196 + {
  197 + "id": 4.7,
  198 + "text": "统计日报",
  199 + "event": "form_statisticsDaily",
  200 + "icon": "uk-icon-table"
  201 + },
  202 + {
  203 + "id": 4.8,
  204 + "text": "调度日报",
  205 + "event": "form_scheduleDaily",
  206 + "icon": "uk-icon-table"
  207 + },
  208 + {
  209 + "id": 4.9,
  210 + "text": "行车路单日报表",
  211 + "event": "form_waybillday",
  212 + "icon": "uk-icon-table"
  213 + },
  214 + {
  215 + "id": 5.0,
  216 + "text": "班次到离站",
  217 + "event": "form_inoutstation",
  218 + "icon": "uk-icon-table"
  219 + },
  220 + {
  221 + "id": 5.1,
  222 + "text": "班次车辆人员日报表",
  223 + "event": "form_shifday",
  224 + "icon": "uk-icon-table"
  225 + },
  226 + {
  227 + "id": 5.2,
  228 + "text": "班次车辆人员月报表",
  229 + "event": "form_shiftuehiclemanth",
  230 + "icon": "uk-icon-table"
  231 + },
  232 + {
  233 + "id": 5.3,
  234 + "text": "营运服务日报表",
  235 + "event": "form_workDaily",
  236 + "icon": "uk-icon-table"
  237 + },
  238 + {
  239 + "id": 5.4,
  240 + "text": "计划车辆班次人员",
  241 + "event": "form_peopleCarPlan",
  242 + "icon": "uk-icon-table"
  243 + }
  244 + ]
  245 + ]
  246 + },
  247 + {
  248 + "id": 3,
64 "text": "车载设备", 249 "text": "车载设备",
65 "children": [ 250 "children": [
66 { 251 {
67 - "id": 2.1, 252 + "id": 3.1,
68 "text": "设备管理", 253 "text": "设备管理",
69 "event": "all_devices" 254 "event": "all_devices"
70 }, 255 },
71 { 256 {
72 - "id": 2.3, 257 + "id": 3.2,
73 "text": "指令下发记录", 258 "text": "指令下发记录",
74 "event": "directive_history" 259 "event": "directive_history"
75 }, 260 },
76 { 261 {
77 - "id": 2.2, 262 + "id": 3.3,
78 "text": "设备上报记录", 263 "text": "设备上报记录",
79 "event": "device_report" 264 "event": "device_report"
80 }, 265 },
81 { 266 {
82 - "id": 2.3, 267 + "id": 3.4,
83 "text": "轨迹回放", 268 "text": "轨迹回放",
84 "event": "gps_play_back" 269 "event": "gps_play_back"
85 } 270 }
86 ] 271 ]
87 }, 272 },
88 { 273 {
89 - "id": 3, 274 + "id": 4,
90 "text": "系统设置", 275 "text": "系统设置",
91 "children": [ 276 "children": [
92 { 277 {
93 - "id": 3.2, 278 + "id": 4.1,
  279 + "text": "线路配置",
  280 + "event": "line_config"
  281 + },
  282 + {
  283 + "id": 4.2,
94 "text": "TTS", 284 "text": "TTS",
95 "event": "tts_config" 285 "event": "tts_config"
96 }, 286 },
97 { 287 {
98 - "id": 3.3, 288 + "id": 4.3,
99 "text": "信号标记", 289 "text": "信号标记",
100 "event": "signal_state" 290 "event": "signal_state"
101 } 291 }