Commit 6f6fd0889e79cd7f7d2f858f6ead47ead221554e
1 parent
5923f00e
线调撤掉一些报表
Showing
3 changed files
with
115 additions
and
179 deletions
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
| @@ -68,180 +68,84 @@ | @@ -68,180 +68,84 @@ | ||
| 68 | { | 68 | { |
| 69 | "id": 2, | 69 | "id": 2, |
| 70 | "text": "报表管理", | 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 | - ] | 71 | + "children": [ |
| 72 | + { | ||
| 73 | + "id": 2.6, | ||
| 74 | + "text": "报表管理", | ||
| 75 | + "header": 1 | ||
| 76 | + }, | ||
| 77 | + { | ||
| 78 | + "id": 2.7, | ||
| 79 | + "text": "行车路单", | ||
| 80 | + "event": "form_waybill", | ||
| 81 | + "icon": "uk-icon-table" | ||
| 82 | + }, | ||
| 83 | + { | ||
| 84 | + "id": 2.8, | ||
| 85 | + "text": "调度历史消息", | ||
| 86 | + "event": "form_history_message", | ||
| 87 | + "icon": "uk-icon-table" | ||
| 88 | + }, | ||
| 89 | + { | ||
| 90 | + "id": 2.9, | ||
| 91 | + "text": "驾驶员请求台账", | ||
| 92 | + "event": "form_account", | ||
| 93 | + "icon": "uk-icon-table" | ||
| 94 | + }, | ||
| 95 | + { | ||
| 96 | + "id": 2.91, | ||
| 97 | + "text": "修正报表", | ||
| 98 | + "event": "form_correctForm", | ||
| 99 | + "icon": "uk-icon-table" | ||
| 100 | + }, | ||
| 101 | + { | ||
| 102 | + "id": 2.92, | ||
| 103 | + "text": "统计日报", | ||
| 104 | + "event": "form_statisticsDaily", | ||
| 105 | + "icon": "uk-icon-table" | ||
| 106 | + }, | ||
| 107 | + { | ||
| 108 | + "id": 2.93, | ||
| 109 | + "text": "调度日报", | ||
| 110 | + "event": "form_scheduleDaily", | ||
| 111 | + "icon": "uk-icon-table" | ||
| 112 | + }, | ||
| 113 | + { | ||
| 114 | + "id": 2.94, | ||
| 115 | + "text": "工作汇总", | ||
| 116 | + "event": "form_jobSummary", | ||
| 117 | + "icon": "uk-icon-table" | ||
| 118 | + }, | ||
| 119 | + { | ||
| 120 | + "id": 2.95, | ||
| 121 | + "text": "班次到离站", | ||
| 122 | + "event": "form_inoutstation", | ||
| 123 | + "icon": "uk-icon-table" | ||
| 124 | + }, | ||
| 125 | + { | ||
| 126 | + "id": 2.2, | ||
| 127 | + "text": "月存油报表", | ||
| 128 | + "event": "form_oilListMonth", | ||
| 129 | + "icon": "uk-icon-table" | ||
| 130 | + }, | ||
| 131 | + { | ||
| 132 | + "id": 2.3, | ||
| 133 | + "text": "时刻表分析", | ||
| 134 | + "event": "form_scheduleAnaly", | ||
| 135 | + "icon": "uk-icon-table" | ||
| 136 | + }, | ||
| 137 | + { | ||
| 138 | + "id": 2.4, | ||
| 139 | + "text": "调度消息分析", | ||
| 140 | + "event": "form_message", | ||
| 141 | + "icon": "uk-icon-table" | ||
| 142 | + }, | ||
| 143 | + { | ||
| 144 | + "id": 2.5, | ||
| 145 | + "text": "换人换车情况统计表", | ||
| 146 | + "event": "form_changetochange", | ||
| 147 | + "icon": "uk-icon-table" | ||
| 148 | + } | ||
| 245 | ] | 149 | ] |
| 246 | }, | 150 | }, |
| 247 | { | 151 | { |
src/main/resources/static/real_control_v2/js/forms/wrap.html
| @@ -16,6 +16,10 @@ | @@ -16,6 +16,10 @@ | ||
| 16 | <link href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css" | 16 | <link href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css" |
| 17 | rel="stylesheet" type="text/css"/> | 17 | rel="stylesheet" type="text/css"/> |
| 18 | 18 | ||
| 19 | + <!-- layer 弹层 插件 --> | ||
| 20 | + <link href="/assets/plugins/layer-v2.4/layer/skin/layer.css" | ||
| 21 | + rel="stylesheet" type="text/css" /> | ||
| 22 | + | ||
| 19 | 23 | ||
| 20 | <!-- jQuery --> | 24 | <!-- jQuery --> |
| 21 | <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script> | 25 | <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script> |
| @@ -29,6 +33,8 @@ | @@ -29,6 +33,8 @@ | ||
| 29 | <!-- art-template 模版引擎 --> | 33 | <!-- art-template 模版引擎 --> |
| 30 | <script src="/assets/plugins/template.js"></script> | 34 | <script src="/assets/plugins/template.js"></script> |
| 31 | <script src="/pages/forms/statement/js/jquery.PrintArea.js"></script> | 35 | <script src="/pages/forms/statement/js/jquery.PrintArea.js"></script> |
| 36 | + <!-- layer 弹层 --> | ||
| 37 | + <script src="/assets/plugins/layer-v2.4/layer/layer.js" ></script> | ||
| 32 | 38 | ||
| 33 | <style> | 39 | <style> |
| 34 | body{ | 40 | body{ |
| @@ -66,6 +72,21 @@ | @@ -66,6 +72,21 @@ | ||
| 66 | if($("#ddrbBody").length > 0){ | 72 | if($("#ddrbBody").length > 0){ |
| 67 | $("#ddrbBody").height("620px"); | 73 | $("#ddrbBody").height("620px"); |
| 68 | } | 74 | } |
| 75 | + | ||
| 76 | + //去掉公司和分公司选项 | ||
| 77 | + var company = $('select[name=company]', '.form-page-content'); | ||
| 78 | + var subCompany = $('select[name=subCompany]', '.form-page-content'); | ||
| 79 | + if(company.length > 0){ | ||
| 80 | + company.parent().remove(); | ||
| 81 | + } | ||
| 82 | + if(subCompany.length > 0){ | ||
| 83 | + subCompany.parent().remove(); | ||
| 84 | + } | ||
| 85 | + | ||
| 86 | + //重新构造线路下拉框 | ||
| 87 | + //var lineSelect = $('select[name=line]', '.form-page-content'); | ||
| 88 | + //lineSelect.select2('destory').html(''); | ||
| 89 | + //initPinYinSelect2(lineSelect); | ||
| 69 | }); | 90 | }); |
| 70 | 91 | ||
| 71 | //iframe 自适应高度 | 92 | //iframe 自适应高度 |
| @@ -91,7 +112,7 @@ | @@ -91,7 +112,7 @@ | ||
| 91 | 112 | ||
| 92 | function initPinYinSelect2(selector, data, cb) { | 113 | function initPinYinSelect2(selector, data, cb) { |
| 93 | //过滤线路选择框数据 | 114 | //过滤线路选择框数据 |
| 94 | - if(selector === '#line'){ | 115 | + /*if(selector === '#line'){ |
| 95 | var idx = ',' + top.gb_data_basic.line_idx + ','; | 116 | var idx = ',' + top.gb_data_basic.line_idx + ','; |
| 96 | var newData = []; | 117 | var newData = []; |
| 97 | $.each(data, function () { | 118 | $.each(data, function () { |
| @@ -99,7 +120,15 @@ | @@ -99,7 +120,15 @@ | ||
| 99 | newData.push(this); | 120 | newData.push(this); |
| 100 | }); | 121 | }); |
| 101 | data = newData; | 122 | data = newData; |
| 102 | - } | 123 | + }*/ |
| 124 | + //写死线路下拉框 | ||
| 125 | + data = []; | ||
| 126 | + $.each(top.gb_data_basic.activeLines, function () { | ||
| 127 | + data.push({ | ||
| 128 | + id: this.lineCode, | ||
| 129 | + text: this.name | ||
| 130 | + }); | ||
| 131 | + }); | ||
| 103 | 132 | ||
| 104 | $.each(data, function () { | 133 | $.each(data, function () { |
| 105 | this.fullChars = pinyin.getFullChars(this.text).toUpperCase(); | 134 | this.fullChars = pinyin.getFullChars(this.text).toUpperCase(); |
src/main/resources/static/real_control_v2/js/north/toolbar.js
| @@ -120,8 +120,11 @@ var gb_northToolbar = (function () { | @@ -120,8 +120,11 @@ var gb_northToolbar = (function () { | ||
| 120 | form_scheduleDaily: function () { | 120 | form_scheduleDaily: function () { |
| 121 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleDaily.html', '调度日报'); | 121 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleDaily.html', '调度日报'); |
| 122 | }, | 122 | }, |
| 123 | + form_jobSummary: function () { | ||
| 124 | + gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/jobSummary.html', '工作汇总'); | ||
| 125 | + }, | ||
| 123 | form_waybillday: function () { | 126 | form_waybillday: function () { |
| 124 | - gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/waybillday.html', '行车路单日报表'); | 127 | + gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/waybilldays/waybillday.html', '行车路单日报表'); |
| 125 | }, | 128 | }, |
| 126 | form_inoutstation: function () { | 129 | form_inoutstation: function () { |
| 127 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/report/inoutstation.html', '班次到离站'); | 130 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/report/inoutstation.html', '班次到离站'); |
| @@ -134,10 +137,10 @@ var gb_northToolbar = (function () { | @@ -134,10 +137,10 @@ var gb_northToolbar = (function () { | ||
| 134 | }, | 137 | }, |
| 135 | form_workDaily: function () { | 138 | form_workDaily: function () { |
| 136 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/workDaily.html', '营运服务日报表'); | 139 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/workDaily.html', '营运服务日报表'); |
| 137 | - }, | 140 | + }/*, |
| 138 | form_peopleCarPlan: function () { | 141 | form_peopleCarPlan: function () { |
| 139 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/peopleCarPlan.html', '计划车辆班次人员'); | 142 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/peopleCarPlan.html', '计划车辆班次人员'); |
| 140 | - }, | 143 | + }*/, |
| 141 | form_oilListMonth: function () { | 144 | form_oilListMonth: function () { |
| 142 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/report/oil/oilListMonth.html', '月存油报表'); | 145 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/report/oil/oilListMonth.html', '月存油报表'); |
| 143 | }, | 146 | }, |