潘钊 / bsth_control · Commits

Commit bac3ebe2c977ce269f1387c690554ce23b71faf6

Authored by 潘钊
1 parent bbb477d1
build: skipped

update...

Inline Side-by-side
Showing 4 changed files with 80 additions and 240 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @bac3ebe
1 1 package com.bsth.service.oil.impl;
2 2  
3   -import java.sql.ResultSet;
4   -import java.sql.SQLException;
5   -import java.text.DecimalFormat;
6   -import java.text.ParseException;
7   -import java.text.SimpleDateFormat;
8   -import java.util.ArrayList;
9   -import java.util.Calendar;
10   -import java.util.Date;
11   -import java.util.HashMap;
12   -import java.util.Iterator;
13   -import java.util.List;
14   -import java.util.Map;
15   -
16   -import javax.transaction.Transactional;
17   -
18   -import org.slf4j.Logger;
19   -import org.slf4j.LoggerFactory;
20   -import org.springframework.beans.factory.annotation.Autowired;
21   -import org.springframework.data.domain.Sort;
22   -import org.springframework.data.domain.Sort.Direction;
23   -import org.springframework.jdbc.core.JdbcTemplate;
24   -import org.springframework.jdbc.core.RowMapper;
25   -import org.springframework.stereotype.Service;
26   -
27 3 import com.bsth.common.ResponseCode;
28   -import com.bsth.data.BasicData;
29 4 import com.bsth.entity.oil.Cyl;
30 5 import com.bsth.entity.oil.Ylb;
31 6 import com.bsth.entity.oil.Ylxxb;
... ... @@ -36,7 +11,22 @@ import com.bsth.repository.oil.YlxxbRepository;
36 11 import com.bsth.service.impl.BaseServiceImpl;
37 12 import com.bsth.service.oil.YlbService;
38 13 import com.bsth.service.realcontrol.ScheduleRealInfoService;
39   -import com.github.abel533.echarts.code.Y;
  14 +import org.slf4j.Logger;
  15 +import org.slf4j.LoggerFactory;
  16 +import org.springframework.beans.factory.annotation.Autowired;
  17 +import org.springframework.data.domain.Sort;
  18 +import org.springframework.data.domain.Sort.Direction;
  19 +import org.springframework.jdbc.core.JdbcTemplate;
  20 +import org.springframework.jdbc.core.RowMapper;
  21 +import org.springframework.stereotype.Service;
  22 +
  23 +import javax.transaction.Transactional;
  24 +import java.sql.ResultSet;
  25 +import java.sql.SQLException;
  26 +import java.text.DecimalFormat;
  27 +import java.text.ParseException;
  28 +import java.text.SimpleDateFormat;
  29 +import java.util.*;
40 30  
41 31 @Service
42 32 public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbService{
... ...
src/main/resources/static/real_control_v2/css/line_schedule.css
  View file @bac3ebe
... ... @@ -13,7 +13,6 @@
13 13  
14 14 .line_schedule div.uk-width-1-6, .line_schedule div.uk-width-1-2 {
15 15 padding: 0 2px 2px 2px;
16   - height: 100%;
17 16 }
18 17  
19 18 .line_schedule .footer-chart {
... ... @@ -247,14 +246,14 @@ span.fcsj-diff {
247 246 /** 图例 */
248 247  
249 248 .tl-yzx {
250   - background: rgb( 192,192,255);
  249 + background: #c1ddf0;
251 250 border-top: 1px solid #ebebeb !important;
252 251 color: #444;
253 252 }
254 253  
255 254 .tl-xxfc{
256   - background: rgb(0,255,255);
257   - color: #484747;
  255 + background: #ff7878;
  256 + color: #f1f1f1;
258 257 }
259 258  
260 259 .tl-wd{
... ... @@ -263,18 +262,18 @@ span.fcsj-diff {
263 262 }
264 263  
265 264 .tl-xxsd{
266   - background: rgb(205,133,63);
267   - color: #f5f4f4;
  265 + background: #e2de94;
  266 + color: #444;
268 267 }
269 268  
270 269 .tl-xxrd{
271   - background: rgb(255,99,71);
  270 + background: #c1ddf0;
272 271 border-top: 1px solid #ebebeb !important;
273   - color: #fff;
  272 + color: #444;
274 273 }
275 274  
276 275 .tl-qrlb {
277   - background: rgb( 128,128,0);
  276 + background: #7B6B24;
278 277 color: #EAEBEC;
279 278 font-size: 13px;
280 279 }
... ... @@ -284,7 +283,7 @@ span.fcsj-diff {
284 283 }
285 284  
286 285 .tl-zzzx {
287   - background: rgb(173,255,47);
  286 + background: #96F396;
288 287 color: #444;
289 288 }
290 289  
... ... @@ -533,7 +532,7 @@ dl.relevance-active dd:nth-child(n+2) {
533 532 }
534 533  
535 534 dl.relevance-active.intimity dd:nth-child(n+2) {
536   - background: #8baabf !important;
  535 + background: #76a6c7 !important;
537 536 color: white;
538 537 }
539 538  
... ... @@ -543,24 +542,13 @@ dl.relevance-active.intimity dd:nth-child(n+2) a {
543 542  
544 543 dl.relevance-active dd.tl-qrlb,
545 544 dl.relevance-active.intimity dd.tl-qrlb{
546   - background: linear-gradient(to right, #a9a911, #808000, #8baabf) !important;
  545 + background: linear-gradient(to right, #7B6B24, #4992c3) !important;
547 546 color: #f8e9cd;
548 547 }
549 548  
550   -dl.relevance-active dd.tl-wd,
551   -dl.relevance-active.intimity dd.tl-wd{
552   - background: linear-gradient(to right, #ffff00, rgb(226, 226, 168), rgb(139, 170, 191)) !important;
553   -}
554   -
555   -dl.relevance-active dd.tl-qrlb,
556   -dl.relevance-active.intimity dd.tl-yzx{
557   - background: linear-gradient(to right, #dcdcfd, #c0c0ff, #8baabf) !important;
558   - color: #272727;
559   -}
560   -
561 549 dl.relevance-active dd.tl-zzzx,
562 550 dl.relevance-active.intimity dd.tl-zzzx {
563   - background: linear-gradient(to right, #def5bb, #adff2f, #8baabf) !important;
  551 + background: linear-gradient(to right, #96F396, #4992c3) !important;
564 552 color: #565252;
565 553 }
566 554  
... ... @@ -569,23 +557,8 @@ dl.relevance-active.intimity dd.tl-zzzx span.fcsj-diff {
569 557 color: #5e5a5a
570 558 }
571 559  
572   -dl.relevance-active dd.tl-xxsd,
573   -dl.relevance-active.intimity dd.tl-xxsd {
574   - background: linear-gradient(to right, #8baabf, #cd853f, #dc9958) !important;
575   -}
576   -
577   -dl.relevance-active dd.tl-xxrd,
578   -dl.relevance-active.intimity dd.tl-xxrd {
579   - background: linear-gradient(to right, #8baabf, #ff6347, #ff8f7b) !important;
580   -}
581   -
582   -dl.relevance-active dd.tl-xxfc,
583   -dl.relevance-active.intimity dd.tl-xxfc {
584   - background: linear-gradient(to right, #8baabf, rgb(43, 185, 185), rgb(0,255,255)) !important;
585   -}
586   -
587 560 dl.relevance-active.intimity dd span.fcsj-diff {
588   - color: #616060;
  561 + color: #d7d6d6;
589 562 }
590 563  
591 564 dl.relevance-active dd span.fcsj-diff{
... ...
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
  View file @bac3ebe
... ... @@ -68,180 +68,54 @@
68 68 {
69 69 "id": 2,
70 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": 4.2,
  74 + "text": "行车路单",
  75 + "event": "form_waybill",
  76 + "icon": "uk-icon-table"
  77 + },
  78 + {
  79 + "id": 4.3,
  80 + "text": "调度历史消息",
  81 + "event": "form_history_message",
  82 + "icon": "uk-icon-table"
  83 + },
  84 + {
  85 + "id": 4.4,
  86 + "text": "驾驶员请求台账",
  87 + "event": "form_account",
  88 + "icon": "uk-icon-table"
  89 + },
  90 + {
  91 + "id": 4.5,
  92 + "text": "班次日报表",
  93 + "event": "form_daily",
  94 + "icon": "uk-icon-table"
  95 + },
  96 + {
  97 + "id": 4.6,
  98 + "text": "修正报表",
  99 + "event": "form_correctForm",
  100 + "icon": "uk-icon-table"
  101 + },
  102 + {
  103 + "id": 4.7,
  104 + "text": "统计日报",
  105 + "event": "form_statisticsDaily",
  106 + "icon": "uk-icon-table"
  107 + },
  108 + {
  109 + "id": 4.8,
  110 + "text": "调度日报",
  111 + "event": "form_scheduleDaily",
  112 + "icon": "uk-icon-table"
  113 + },
  114 + {
  115 + "id": 4.9,
  116 + "text": "调度工作日报表",
  117 + "event": "form_schedule_daily_qp"
  118 + }
245 119 ]
246 120 },
247 121 {
... ...
src/main/resources/static/real_control_v2/js/north/toolbar.js
  View file @bac3ebe
... ... @@ -179,6 +179,9 @@ var gb_northToolbar = (function () {
179 179 },
180 180 curr_date_schedule: function () {
181 181 open_modal('/real_control_v2/fragments/north/nav/curr_date_schedule.html', {}, modal_opts);
  182 + },
  183 + form_schedule_daily_qp: function () {
  184 + gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleDailyQp.html', '调度工作日报表');
182 185 }
183 186 };
184 187  
... ...