潘钊 / bsth_control · Commits

Commit b22e9e809eff77a5fa5cf04cd1bc560e905b62d4

Authored by 徐烜
2 parents 1cd87384 bba6c6f5
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 19 changed files with 99 additions and 51 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @b22e9e8
... ... @@ -735,6 +735,7 @@ public class FormsServiceImpl implements FormsService {
735 735 @Override
736 736 public List<Turnoutrate> turnoutrate(Map<String, Object> map) {
737 737  
  738 + List<Turnoutrate> resList = new ArrayList<Turnoutrate>();
738 739 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
739 740 SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
740 741 Date d = null;
... ... @@ -752,22 +753,24 @@ public class FormsServiceImpl implements FormsService {
752 753 rq = rq2 + "-" + rq3;
753 754  
754 755 String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car,a.bc_type from "
755   - + " (select count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
756   - + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "' "
  756 + + " (select count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
  757 + + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "' "
757 758 + " and '" + map.get("endDate").toString() + "' and xl_bm='"+ map.get("line").toString() + "' "
758 759 + " AND gs_bm is not null "
759 760 + " AND bc_type NOT IN ('in', 'out')"
760 761 + " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
761 762 + " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
762   - + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
  763 +// + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
  764 + + " ) a left JOIN ("
763 765 + " SELECT COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car "
764   - + " from bsth_c_line t RIGHT JOIN (select gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type from bsth_c_s_sp_info_real "
  766 + + " from bsth_c_line t RIGHT JOIN (select gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type from bsth_c_s_sp_info_real "
765 767 + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "' and '"
766 768 + map.get("endDate").toString() + "' and xl_bm='" + map.get("line").toString()
767 769 + "' AND gs_bm is not null "
768 770 + " AND bc_type NOT IN ('in', 'out')"
769   - + "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
770   - + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";
  771 +// + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
  772 + + " ) b ON t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
  773 + + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";
771 774 List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
772 775  
773 776 @Override
... ... @@ -782,6 +785,8 @@ public class FormsServiceImpl implements FormsService {
782 785 String result1 = numberFormat.format((float) scl / (float) jcl * 100);
783 786 String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
784 787 tu.setRq(rq);
  788 + if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
  789 + return tu;
785 790 tu.setGs(arg0.getString("gs_name").toString());
786 791 tu.setZhgs(arg0.getString("fgs_name").toString());
787 792 // tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");
... ... @@ -801,14 +806,20 @@ public class FormsServiceImpl implements FormsService {
801 806 }
802 807  
803 808 });
  809 +
  810 + for(Turnoutrate t : list){
  811 + if(t.getGs() != null && t.getGs().trim().length() != 0)
  812 + resList.add(t);
  813 + }
804 814  
805   - return list;
  815 + return resList;
806 816 }
807 817  
808 818  
809 819 //班次执行率统计表
810 820 @Override
811 821 public List<Executionrate> executionrate(Map<String, Object> map) {
  822 + List<Executionrate> resList = new ArrayList<Executionrate>();
812 823 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
813 824 SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
814 825 Date d = null;
... ... @@ -826,20 +837,22 @@ public class FormsServiceImpl implements FormsService {
826 837 rq = rq2 + "-" + rq3;
827 838  
828 839 String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
829   - + " (select count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
830   - + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
  840 + + " (select count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
  841 + + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
831 842 + map.get("startDate").toString() + "' and '" + map.get("endDate").toString() + "' and xl_bm='"
832 843 + map.get("line").toString() + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out')"
833 844 + " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
834 845 + " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
835   - + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
  846 +// + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
  847 + + " ) a left JOIN ("
836 848 + "SELECT COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl "
837 849 + "from bsth_c_line t RIGHT JOIN (select gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type from bsth_c_s_sp_info_real "
838 850 + "where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "' and '"
839 851 + map.get("endDate").toString() + "' and xl_bm='" + map.get("line").toString()
840 852 + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
841   - + "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
842   - + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";
  853 +// + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type"
  854 + + " ) b ON t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
  855 + + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";
843 856 List<Executionrate> list = jdbcTemplate.query(sql, new RowMapper<Executionrate>() {
844 857  
845 858 @Override
... ... @@ -854,6 +867,8 @@ public class FormsServiceImpl implements FormsService {
854 867 String result1 = numberFormat.format((float) scl / (float) jcl * 100);
855 868 String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
856 869 tu.setRq(rq);
  870 + if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
  871 + return tu;
857 872 tu.setGs(arg0.getString("gs_name").toString());
858 873 tu.setZhgs(arg0.getString("fgs_name").toString());
859 874 // tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");//这个是根据公司判断线路有几条
... ... @@ -874,13 +889,19 @@ public class FormsServiceImpl implements FormsService {
874 889 }
875 890  
876 891 });
  892 +
  893 + for(Executionrate e : list){
  894 + if(e.getGs() != null && e.getGs().trim().length() != 0)
  895 + resList.add(e);
  896 + }
877 897  
878   - return list;
  898 + return resList;
879 899 }
880 900  
881 901 // 营运线路名称统计表
882 902 @Override
883 903 public List<Allline> allline(Map<String, Object> map) {
  904 + List<Allline> resList = new ArrayList<Allline>();
884 905 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
885 906 SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
886 907 Date d = null;
... ... @@ -900,13 +921,14 @@ public class FormsServiceImpl implements FormsService {
900 921 rq = rq2 + "-" + rq3;
901 922  
902 923 String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
903   - + " (select count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
904   - + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
  924 + + " (select count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
  925 + + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
905 926 + map.get("startDate").toString() + "' and '" + map.get("endDate").toString() + "' and xl_bm='"
906 927 + map.get("line").toString() + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
907 928 + " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
908 929 + " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
909   - + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
  930 +// + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
  931 + + " ) a left JOIN ("
910 932 + "SELECT COUNT(*"
911 933 + ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b."
912 934 + "xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl "
... ... @@ -915,9 +937,9 @@ public class FormsServiceImpl implements FormsService {
915 937 + map.get("endDate").toString() + "' and xl_bm='" + map.get
916 938 ("line").toString()
917 939 + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out')"
918   - + "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
919   - + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";
920   - System.out.println(sql);
  940 +// + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type"
  941 + + " ) b ON t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
  942 + + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";
921 943 List<Allline> list = jdbcTemplate.query(sql, new RowMapper<Allline>() {
922 944  
923 945 @Override
... ... @@ -932,6 +954,8 @@ public class FormsServiceImpl implements FormsService {
932 954 String result1 = numberFormat.format((float) scl / (float) jcl * 100);
933 955 String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
934 956 tu.setRq(rq);
  957 + if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
  958 + return tu;
935 959 tu.setGs(arg0.getString("gs_name").toString());
936 960 tu.setZhgs(arg0.getString("fgs_name").toString());
937 961 tu.setXl(arg0.getString("xl_name"));
... ... @@ -951,7 +975,12 @@ public class FormsServiceImpl implements FormsService {
951 975 }
952 976 });
953 977  
954   - return list;
  978 + for(Allline a : list){
  979 + if(a.getGs() != null && a.getGs().trim().length() != 0)
  980 + resList.add(a);
  981 + }
  982 +
  983 + return resList;
955 984 }
956 985  
957 986 @Override
... ...
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @b22e9e8
... ... @@ -145,8 +145,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
145 145 schedule.setZdsjActual(zdsjA/60 + ":" + zdsjA%60);
146 146 schedule.setZdsjActualTime(zdsjA);
147 147 }
148   - schedule.setFcsj(fcsj/60 + ":" + fcsj%60);
149   - schedule.setZdsj(zdsj/60 + ":" + zdsj%60);
  148 + schedule.setFcsj((fcsj/60<10?"0"+fcsj/60:fcsj/60) + ":" + (fcsj%60<10?"0"+fcsj%60:fcsj%60));
  149 + schedule.setZdsj((zdsj/60<10?"0"+zdsj/60:zdsj/60) + ":" + (zdsj%60<10?"0"+zdsj%60:zdsj%60));
150 150 schedule.setFcsjT(fcsj);
151 151 schedule.setZdsjT(zdsj);
152 152 return schedule;
... ... @@ -237,7 +237,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
237 237  
238 238 String sql = "select start_station_name, end_station_name from bsth_c_line where line_code = '"+line+"'";
239 239  
240   - System.out.println(sql);
241 240 list = jdbcTemplate.query(sql,
242 241 new RowMapper<Map<String, Object>>(){
243 242 @Override
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @b22e9e8
... ... @@ -213,6 +213,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
213 213 }
214 214  
215 215 schedule.setDfsjAll(dfsj);
  216 + schedule.setDfAuto(false);
216 217 schedule.addRemarks(remarks);
217 218  
218 219 List<ScheduleRealInfo> ts = new ArrayList<>();
... ... @@ -499,7 +500,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
499 500  
500 501 //公司 和 分公司名称
501 502 t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
502   - t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getGsBm() + "_" + t.getFgsBm()));
  503 + t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm() + "_" + t.getGsBm()));
503 504  
504 505 t.setScheduleDateStr(schDate);
505 506 t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
... ...
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
  View file @b22e9e8
... ... @@ -521,7 +521,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
521 521 sql += " and xl_bm = '"+line+"'";
522 522 }
523 523 // if(company.length() != 0){
524   - sql += " and gs_bm like %'"+company+"'% and fgs_bm like %'"+subCompany+"%'";
  524 + sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
525 525 // }
526 526 sql += " and bc_type != 'in' and bc_type != 'out'";
527 527  
... ...
src/main/resources/static/pages/forms/statement/busInterval.html
  View file @b22e9e8
... ... @@ -387,7 +387,7 @@
387 387 var treeData = [];
388 388 var params = {};
389 389 if(statu == 0)
390   - params['line'] = "";
  390 + params['line'] = " ";
391 391 if(statu == 1)
392 392 params['line'] = line;
393 393 params['startDate'] = startDate;
... ...
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
  View file @b22e9e8
... ... @@ -258,6 +258,7 @@
258 258 }
259 259 }
260 260 initPinYinSelect2('#line',data,'');
  261 + line = data[0].id;
261 262 updateModel();
262 263 fage=true;
263 264 }
... ...
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
  View file @b22e9e8
... ... @@ -317,11 +317,11 @@
317 317 }
318 318 initPinYinSelect2('#line',data,'');
319 319 fage=true;
320   -
  320 +
  321 + line = data[0].id;
321 322 updateModel();
322 323  
323 324 var params = {};
324   - line = data[0].id;
325 325 params['line'] = line;
326 326 $get('/busInterval/getDir', params, function(result){
327 327 dirData = createTreeData(result);
... ... @@ -397,7 +397,7 @@
397 397 }
398 398 });
399 399 $.each(list, function(i, g){
400   - if(g.line == params[3] && g.lp == params[4]){
  400 + if(g.line == params[3] && g.lp == params[4] &&g.station　== params[5]){
401 401 var tbodyHtml = template('list_workList',{list:g});
402 402 $('#works tbody').html(tbodyHtml);
403 403 $("#works_hidden").removeClass("hidden");
... ...
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
  View file @b22e9e8
... ... @@ -187,6 +187,7 @@
187 187 }
188 188 }
189 189 initPinYinSelect2('#line',data,'');
  190 + line = data[0].id;
190 191 updateModel();
191 192 fage=true;
192 193 }
... ...
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
  View file @b22e9e8
... ... @@ -440,7 +440,7 @@
440 440 var treeData = [];
441 441 var params = {};
442 442 if(statu == 0)
443   - params['line'] = "";
  443 + params['line'] = " ";
444 444 if(statu == 1)
445 445 params['line'] = line;
446 446 params['startDate'] = startDate;
... ...
src/main/resources/static/pages/mforms/changetochanges/changetochange.html
  View file @b22e9e8
... ... @@ -55,22 +55,22 @@
55 55 class="form-control" name="subCompany" id="fgsdmChange"
56 56 style="width: 140px;"></select>
57 57 </div>
58   - <div style="display: inline-block;">
  58 + <div style="display: inline-block; margin-left: 10px;">
59 59 <span class="item-label" style="width: 80px;">线路: </span> <select
60 60 class="form-control" name="line" id="line" style="width: 180px;"></select>
61 61 </div>
62 62 <div style="margin-top: 10px"></div>
63   - <div style="display: inline-block; margin-left: 15px;">
  63 + <div style="display: inline-block; margin-left: 5px;">
64 64 <span class="item-label" style="width: 80px;">开始时间: </span> <input
65 65 class="form-control" type="text" id="startDate"
66   - style="width: 120px;" />
  66 + style="width: 140px;" />
67 67 </div>
68   - <div style="display: inline-block; margin-left: 15px;">
  68 + <div style="display: inline-block; margin-left: 10px;">
69 69 <span class="item-label" style="width: 80px;">结束时间: </span> <input
70 70 class="form-control" type="text" id="endDate"
71   - style="width: 120px;" />
  71 + style="width: 140px;" />
72 72 </div>
73   - <div style="display: inline-block;">
  73 + <div style="display: inline-block; margin-left: 10px;">
74 74 <span class="item-label" style="width: 120px;">类型: </span> <select
75 75 class="form-control" id="sel">
76 76 <option value="">请选择</option>
... ...
src/main/resources/static/pages/mforms/operationservices/operationservice.html
  View file @b22e9e8
... ... @@ -36,7 +36,7 @@
36 36 class="form-control" name="company" id="gsdmOperat"
37 37 style="width: 140px;"></select>
38 38 </div>
39   - <div style="display: inline-block; margin-left: 24px;"
  39 + <div style="display: inline-block; margin-left: 25px;"
40 40 id="fgsdmDiv_operat">
41 41 <span class="item-label" style="width: 80px;">分公司: </span> <select
42 42 class="form-control" name="subCompany" id="fgsdmOperat"
... ... @@ -47,7 +47,7 @@
47 47 <span class="item-label" style="width: 80px;">线路: </span> <select
48 48 class="form-control" name="line" id="line" style="width: 140px;"></select>
49 49 </div>
50   - <div style="display: inline-block; margin-left: 15px;">
  50 + <div style="display: inline-block; margin-left: 11px;">
51 51 <span class="item-label" style="width: 80px;">开始时间: </span> <input
52 52 class="form-control" type="text" id="startDate"
53 53 style="width: 140px;" />
... ...
src/main/resources/static/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html
  View file @b22e9e8
... ... @@ -52,7 +52,7 @@
52 52 <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
53 53 </div>
54 54 <div style="display: inline-block;margin-left: 10px">
55   - <span class="item-label" style="width: 80px;">统计： </span>
  55 + <span class="item-label" style="width: 80px;">统计: </span>
56 56 <select class="form-control" style="width: 136px;" id='empnames'>
57 57 <option value="驾驶员">驾驶员</option>
58 58 <option value="售票员">售票员</option>
... ...
src/main/resources/static/real_control_v2/css/line_schedule.css
  View file @b22e9e8
... ... @@ -243,7 +243,7 @@
243 243 }
244 244  
245 245 span.fcsj-diff {
246   - color: gray;
  246 + /*color: gray;*/
247 247 margin-left: 3px;
248 248 }
249 249  
... ... @@ -252,7 +252,7 @@ span.fcsj-diff {
252 252  
253 253 .tl-yzx {
254 254 background: rgb( 192,192,255);
255   - border-top: 1px solid #ebebeb !important;
  255 + border-top: 1px solid #d9d9d9 !important;
256 256 color: #444;
257 257 }
258 258  
... ... @@ -268,13 +268,13 @@ span.fcsj-diff {
268 268  
269 269 .tl-xxsd{
270 270 background: rgb(205,133,63);
271   - color: #f5f4f4;
  271 + /*color: #f5f4f4;*/
272 272 }
273 273  
274 274 .tl-xxrd{
275 275 background: rgb(255,99,71);
276 276 border-top: 1px solid #ebebeb !important;
277   - color: #fff;
  277 + /*color: #fff;*/
278 278 }
279 279  
280 280 .tl-qrlb {
... ... @@ -290,6 +290,7 @@ span.fcsj-diff {
290 290 .tl-zzzx {
291 291 background: rgb(173,255,47);
292 292 color: #444;
  293 + border-top: 1px solid #d9d9d9 !important;
293 294 }
294 295  
295 296 .ct_table>.ct_table_body dl:hover dd.tl-yzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-yzx, .ct_table>.ct_table_body dl:hover dd.tl-zzzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-zzzx {
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
  View file @b22e9e8
... ... @@ -30,7 +30,7 @@
30 30 <div class="uk-form-row">
31 31 <label class="uk-form-label">班次类型</label>
32 32 <div class="uk-form-controls">
33   - <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
  33 + <select class="form-control nt-dictionary" required name="bcType" data-code="{{bcType}}"
34 34 data-group=ScheduleType></select>
35 35 </div>
36 36 </div>
... ... @@ -156,7 +156,7 @@
156 156 <div class="uk-form-row">
157 157 <label class="uk-form-label">班次类型</label>
158 158 <div class="uk-form-controls">
159   - <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
  159 + <select class="form-control nt-dictionary" name="bcType" required data-code="{{bcType}}"
160 160 data-group=ScheduleType></select>
161 161 </div>
162 162 </div>
... ... @@ -274,7 +274,7 @@
274 274 <div class="uk-form-row">
275 275 <label class="uk-form-label">班次类型</label>
276 276 <div class="uk-form-controls">
277   - <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
  277 + <select class="form-control nt-dictionary" name="bcType" required data-code="{{bcType}}"
278 278 data-group=ScheduleType></select>
279 279 </div>
280 280 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
  View file @b22e9e8
... ... @@ -289,8 +289,12 @@
289 289 //新增临加
290 290 var add_temp_sch = function () {
291 291 var sch = getActiveSch();
292   - if (!sch)
293   - sch = {xlBm: $('[name=lineSelect]', f).val(), lpName: $('[name=lpName]', f).val()};
  292 + if (!sch){
  293 + var xlBm = $('[name=lineSelect]', f).val();
  294 + var xlName = $('[name=lineSelect]', f).find("option:selected").text();
  295 + var lpName = $('[name=lpName]', f).val();
  296 + sch = {xlBm: xlBm,xlName: xlName, lpName: lpName};
  297 + }
294 298  
295 299 open_modal(folder + '/add_temp_sch.html', {
296 300 sch: sch
... ...
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
  View file @b22e9e8
... ... @@ -2,7 +2,7 @@
2 2 <script id="north-toolbar-temp" type="text/html">
3 3 <div class="uk-margin" id="north_toolbar_panel">
4 4 <nav class="uk-navbar">
5   - <a class="uk-navbar-brand" >
  5 + <a class="uk-navbar-brand" id="navbar_user_detail_link">
6 6 <span><i class="uk-icon-user"></i> <span id="north_toolbar_user">{{user.userName}}</span></span><i class="uk-icon-ellipsis-v"></i>
7 7 </a>
8 8 <ul class="uk-navbar-nav">
... ...
src/main/resources/static/real_control_v2/js/main.js
  View file @b22e9e8
... ... @@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
169 169 function showUpdateDescription() {
170 170 //更新说明
171 171 var updateDescription = {
172   - date: '2017-04-28 下午',
173   - text: '<h5>修复在特定情况下出现线调界面班次显示不全，比路单少的情况。</h5><h5>尝试修复在特定情况下车辆走向不跟随班次执行结束而跳动的问题。</h5>'
  172 + date: '2017-05-03',
  173 + text: '<h5>修复了在临加/子任务里临加路牌后再临加班次出现的异常情况。</h5>'
174 174 };
175 175  
176 176 var storage = window.localStorage
... ...
src/main/resources/static/real_control_v2/js/north/toolbar.js
  View file @b22e9e8
... ... @@ -45,6 +45,11 @@ var gb_northToolbar = (function () {
45 45 gb_sch_websocket.sock().close();
46 46 window.location.href = '/pages/control/lineallot/allot.html';
47 47 });
  48 +
  49 + //点击用户名
  50 + $('#navbar_user_detail_link').on('click', function () {
  51 + //alert('1111');
  52 + });
48 53 });
49 54  
50 55 $(document).on('click', '#north_toolbar_panel li.event a', function () {
... ...
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
  View file @b22e9e8
... ... @@ -269,6 +269,13 @@
269 269 (function () {
270 270 var modal = '#map-playback2-modal', gpsArray;
271 271  
  272 + //modal hide remove dom
  273 + $(modal).on('hide.uk.modal', function () {
  274 + $('.map-wrap-tools .play_btn', modal).removeClass('play');
  275 + playObj.pause();
  276 + searchForm.hideShade();
  277 + });
  278 +
272 279 $(modal).on('init', function (e, data) {
273 280 //初始化地图
274 281 mapObj.initMap();
... ...