Commit 4ba49e220afa736f35b9dc977443cf76e082afa2

Authored by panzhaov5
1 parent effb95b4

update...

src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
@@ -2,7 +2,11 @@ @@ -2,7 +2,11 @@
2 { 2 {
3 "id": 1, 3 "id": 1,
4 "text": "数据&统计", 4 "text": "数据&统计",
5 - "children": [ 5 + "clazz": "dropdown-column-2",
  6 + "columns": true,
  7 + "cls_class": "uk-width-1-2",
  8 + "grid": [
  9 + [
6 { 10 {
7 "id": 1.1, 11 "id": 1.1,
8 "text": "数据管理", 12 "text": "数据管理",
@@ -28,6 +32,42 @@ @@ -28,6 +32,42 @@
28 "text": "班次修正日志", 32 "text": "班次修正日志",
29 "event": "sch_edit_info" 33 "event": "sch_edit_info"
30 } 34 }
  35 + ],
  36 + [
  37 + {
  38 + "id": 2.1,
  39 + "text": "统计分析",
  40 + "header": 1
  41 + },
  42 + {
  43 + "id": 2.2,
  44 + "text": "出车率",
  45 + "event": "turnout_rate",
  46 + "icon": "uk-icon-pie-chart"
  47 + },
  48 + {
  49 + "id": 2.3,
  50 + "text": "设备上线率",
  51 + "event": "device_online_rate",
  52 + "icon": "uk-icon-pie-chart"
  53 + },
  54 + {
  55 + "id": 2.4,
  56 + "divider": true
  57 + },
  58 + {
  59 + "id": 2.5,
  60 + "text": "线路首末班准点率",
  61 + "event": "s_e_punctuality_rate_line",
  62 + "icon": "uk-icon-pie-chart"
  63 + },
  64 + {
  65 + "id": 2.7,
  66 + "text": "班次执行率",
  67 + "event": "sch_exec_rate",
  68 + "icon": "uk-icon-pie-chart"
  69 + }
  70 + ]
31 ] 71 ]
32 }, 72 },
33 { 73 {
@@ -35,93 +75,51 @@ @@ -35,93 +75,51 @@
35 "text": "报表管理", 75 "text": "报表管理",
36 "children": [ 76 "children": [
37 { 77 {
38 - "id": 2.6,  
39 - "text": "报表管理",  
40 - "header": 1  
41 - },  
42 - {  
43 - "id": 2.7, 78 + "id": 4.2,
44 "text": "行车路单", 79 "text": "行车路单",
45 "event": "form_waybill", 80 "event": "form_waybill",
46 "icon": "uk-icon-table" 81 "icon": "uk-icon-table"
47 }, 82 },
48 { 83 {
49 - "id": 2.8, 84 + "id": 4.3,
50 "text": "调度历史消息", 85 "text": "调度历史消息",
51 "event": "form_history_message", 86 "event": "form_history_message",
52 "icon": "uk-icon-table" 87 "icon": "uk-icon-table"
53 }, 88 },
54 { 89 {
55 - "id": 2.9, 90 + "id": 4.4,
56 "text": "驾驶员请求台账", 91 "text": "驾驶员请求台账",
57 "event": "form_account", 92 "event": "form_account",
58 "icon": "uk-icon-table" 93 "icon": "uk-icon-table"
59 }, 94 },
60 { 95 {
61 - "id": 2.91, 96 + "id": 4.5,
  97 + "text": "班次日报表",
  98 + "event": "form_daily",
  99 + "icon": "uk-icon-table"
  100 + },
  101 + {
  102 + "id": 4.6,
62 "text": "修正报表", 103 "text": "修正报表",
63 "event": "form_correctForm", 104 "event": "form_correctForm",
64 "icon": "uk-icon-table" 105 "icon": "uk-icon-table"
65 }, 106 },
66 { 107 {
67 - "id": 2.92, 108 + "id": 4.7,
68 "text": "统计日报", 109 "text": "统计日报",
69 "event": "form_statisticsDaily", 110 "event": "form_statisticsDaily",
70 "icon": "uk-icon-table" 111 "icon": "uk-icon-table"
71 }, 112 },
72 { 113 {
73 - "id": 2.93, 114 + "id": 4.8,
74 "text": "调度日报", 115 "text": "调度日报",
75 "event": "form_scheduleDaily", 116 "event": "form_scheduleDaily",
76 "icon": "uk-icon-table" 117 "icon": "uk-icon-table"
77 }, 118 },
78 { 119 {
79 - "id": 2.94,  
80 - "text": "工作汇总",  
81 - "event": "form_jobSummary",  
82 - "icon": "uk-icon-table"  
83 - },  
84 - {  
85 - "id": 2.941,  
86 - "text": "班次日报表",  
87 - "event": "form_daily",  
88 - "icon": "uk-icon-table"  
89 - },  
90 - {  
91 - "id": 2.95,  
92 - "text": "班次到离站",  
93 - "event": "form_inoutstation",  
94 - "icon": "uk-icon-table"  
95 - },  
96 - {  
97 - "id": 2.2,  
98 - "text": "月存油报表",  
99 - "event": "form_oilListMonth",  
100 - "icon": "uk-icon-table"  
101 - },  
102 - {  
103 - "id": 2.3,  
104 - "text": "时刻表分析",  
105 - "event": "form_scheduleAnaly",  
106 - "icon": "uk-icon-table"  
107 - },  
108 - {  
109 - "id": 2.4,  
110 - "text": "调度消息分析",  
111 - "event": "form_message",  
112 - "icon": "uk-icon-table"  
113 - },  
114 - {  
115 - "id": 2.5,  
116 - "text": "换人换车情况统计表",  
117 - "event": "form_changetochange",  
118 - "icon": "uk-icon-table"  
119 - },  
120 - {  
121 - "id": 2.6,  
122 - "text": "班次车辆人员日统计",  
123 - "event": "form_shifday",  
124 - "icon": "uk-icon-table" 120 + "id": 4.9,
  121 + "text": "调度工作日报表",
  122 + "event": "form_schedule_daily_qp"
125 } 123 }
126 ] 124 ]
127 }, 125 },
@@ -148,11 +146,6 @@ @@ -148,11 +146,6 @@
148 "id": 3.4, 146 "id": 3.4,
149 "text": "轨迹回放", 147 "text": "轨迹回放",
150 "event": "gps_play_back" 148 "event": "gps_play_back"
151 - },  
152 - {  
153 - "id": 3.5,  
154 - "text": "安全驾驶(图像)",  
155 - "event": "safe_driving"  
156 } 149 }
157 ] 150 ]
158 }, 151 },
@@ -177,4 +170,4 @@ @@ -177,4 +170,4 @@
177 } 170 }
178 ] 171 ]
179 } 172 }
180 -]  
181 \ No newline at end of file 173 \ No newline at end of file
  174 +]