Commit d9d872f545a7708d329cf665f53750b12904ed5d

Authored by 王通
1 parent edba89f4

1.维修上报微调,报表放线调页面

src/main/resources/static/pages/forms/statement/repairReport.html
@@ -53,10 +53,10 @@ @@ -53,10 +53,10 @@
53 <th>序号</th> 53 <th>序号</th>
54 <th>线路</th> 54 <th>线路</th>
55 <th>车辆编码</th> 55 <th>车辆编码</th>
56 - <th>发车时间</th> 56 + <th>计划发车时间</th>
57 <th>上报人</th> 57 <th>上报人</th>
58 <th>上报时间</th> 58 <th>上报时间</th>
59 - <th>维修类型</th> 59 + <th>故障类型</th>
60 <th>上报状态</th> 60 <th>上报状态</th>
61 </tr> 61 </tr>
62 </thead> 62 </thead>
src/main/resources/static/pages/permission/authorize_all/user_auth.html
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
55 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_scheduleAnaly"> 时刻表分析</label></li> 55 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_scheduleAnaly"> 时刻表分析</label></li>
56 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_message"> 调度消息分析</label></li> 56 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_message"> 调度消息分析</label></li>
57 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_changetochange"> 换人换车情况统计表</label></li> 57 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_changetochange"> 换人换车情况统计表</label></li>
  58 + <li><label><input class="uk-checkbox" type="checkbox" data-event="form_repairReport"> 维修上报记录</label></li>
58 </ul> 59 </ul>
59 </div> 60 </div>
60 61
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 <div class="uk-grid"> 128 <div class="uk-grid">
129 <div class="uk-width-1-1"> 129 <div class="uk-width-1-1">
130 <div class="uk-form-row"> 130 <div class="uk-form-row">
131 - <label class="uk-form-label" >维修类型</label> 131 + <label class="uk-form-label" >故障类型</label>
132 <div class="uk-form-controls repair-type-checkbox-list"> 132 <div class="uk-form-controls repair-type-checkbox-list">
133 {{each repairTypes as repair i}} 133 {{each repairTypes as repair i}}
134 <label> 134 <label>
@@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
181 <script> 181 <script>
182 (function() { 182 (function() {
183 var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他']; 183 var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
184 - var repairTypes = [{name:"轨迹不连续", code:"9101"}, {name:"无轨迹", code:"9102"}, {name:"收不到调度指令", code:"9103"}, {name:"调度指令延迟", code:"9105"}, {name:"信号漂移", code:"9104"}, {name:"其它GPS报修", code:"9109"}]; 184 + var repairTypes = [{name:"轨迹不连续", code:"9101"}, {name:"无轨迹", code:"9102"}, {name:"收不到调度指令", code:"9103"}, {name:"调度指令延迟", code:"9105"}, {name:"信号漂移(无出无到)", code:"9104"}, {name:"其它GPS报修", code:"9109"}];
185 var modal = '#schedule-fcxxwt-modal' 185 var modal = '#schedule-fcxxwt-modal'
186 ,sch; 186 ,sch;
187 $(modal).on('init', function(e, data) { 187 $(modal).on('init', function(e, data) {
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
@@ -122,6 +122,12 @@ @@ -122,6 +122,12 @@
122 "text": "班次车辆人员日统计", 122 "text": "班次车辆人员日统计",
123 "event": "form_shifday", 123 "event": "form_shifday",
124 "icon": "uk-icon-table" 124 "icon": "uk-icon-table"
  125 + },
  126 + {
  127 + "id": 2.96,
  128 + "text": "维修上报记录",
  129 + "event": "form_repairReport",
  130 + "icon": "uk-icon-table"
125 } 131 }
126 ] 132 ]
127 }, 133 },
src/main/resources/static/real_control_v2/js/north/toolbar.js
@@ -11,6 +11,7 @@ var gb_northToolbar = (function () { @@ -11,6 +11,7 @@ var gb_northToolbar = (function () {
11 }); 11 });
12 12
13 $.get('/real_control_v2/js/data/json/north_toolbar.json', function (data) { 13 $.get('/real_control_v2/js/data/json/north_toolbar.json', function (data) {
  14 + debugger;
14 ep.emit("data", data); 15 ep.emit("data", data);
15 }); 16 });
16 17
@@ -209,6 +210,9 @@ var gb_northToolbar = (function () { @@ -209,6 +210,9 @@ var gb_northToolbar = (function () {
209 form_changetochange: function () { 210 form_changetochange: function () {
210 gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/changetochanges/changetochange.html', '换人换车情况统计表'); 211 gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/changetochanges/changetochange.html', '换人换车情况统计表');
211 }, 212 },
  213 + form_repairReport: function () {
  214 + gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/repairReport.html', '维修上报记录');
  215 + },
212 form_turnoutrate: function () { 216 form_turnoutrate: function () {
213 gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/changetochanges/turnoutrate.html', '营运线路出车率统计表'); 217 gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/changetochanges/turnoutrate.html', '营运线路出车率统计表');
214 }, 218 },