潘钊 / bsth_control · Commits

Commit 544840c5e38507aef492a0923cfe73baa204bc9f

Authored by 娄高锋
1 parent 2c2f2fb2
build: skipped

添加时间确认

Inline Side-by-side
Showing 16 changed files with 131 additions and 220 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @544840c
... ... @@ -766,7 +766,7 @@ public class FormsServiceImpl implements FormsService {
766 766 + map.get("endDate").toString() + "' and xl_bm='" + map.get("line").toString()
767 767 + "' AND gs_bm is not null "
768 768 + " 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) b on "
  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 770 + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";
771 771 List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
772 772  
... ... @@ -775,21 +775,24 @@ public class FormsServiceImpl implements FormsService {
775 775 Turnoutrate tu = new Turnoutrate();
776 776 NumberFormat numberFormat = NumberFormat.getInstance();
777 777 numberFormat.setMaximumFractionDigits(2);
778   - String result1 = numberFormat.format((float) Integer.parseInt(arg0.getString("scl"))
779   - / (float) Integer.parseInt(arg0.getString("jcl")) * 100);
780   - String result2 = numberFormat.format((float) Integer.parseInt(arg0.getString("sbc"))
781   - / (float) Integer.parseInt(arg0.getString("jbc")) * 100);
  778 + int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;
  779 + int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;
  780 + int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;
  781 + int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;
  782 + String result1 = numberFormat.format((float) scl / (float) jcl * 100);
  783 + String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
782 784 tu.setRq(rq);
783 785 tu.setGs(arg0.getString("gs_name").toString());
784 786 tu.setZhgs(arg0.getString("fgs_name").toString());
785   - tu.setXl(arg0.getString("xlgs"));
786   - tu.setXlmc(arg0.getString("sxl"));
787   - tu.setCchjh(arg0.getString("jcl").toString());
788   - tu.setCchsj(arg0.getString("scl").toString());
789   - tu.setCchqz(arg0.getString("sxl").toString());
  787 +// tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");
  788 + tu.setXl(arg0.getString("jxl")!=null&&arg0.getString("jxl").trim().length()!=0?arg0.getString("jxl"):"0");
  789 + tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
  790 + tu.setCchjh("" + jcl);
  791 + tu.setCchsj("" + scl);
  792 + tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
790 793 tu.setChl(result1 + "%");// 出车率
791   - tu.setBcjh(arg0.getString("jbc").toString());
792   - tu.setBcsj(arg0.getString("sbc").toString());
  794 + tu.setBcjh("" + jbc);
  795 + tu.setBcsj("" + sbc);
793 796 tu.setBbzxl(result2 + "%");// 班次执行率
794 797 tu.setSm(arg0.getString("gs_name").toString());
795 798 tu.setGsgs(arg0.getString("gslsbm").toString());
... ... @@ -799,7 +802,6 @@ public class FormsServiceImpl implements FormsService {
799 802  
800 803 });
801 804  
802   -
803 805 return list;
804 806 }
805 807  
... ... @@ -836,7 +838,7 @@ public class FormsServiceImpl implements FormsService {
836 838 + "where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "' and '"
837 839 + map.get("endDate").toString() + "' and xl_bm='" + map.get("line").toString()
838 840 + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
839   - + "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON t.company=b.gs_bm) b on "
  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 "
840 842 + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";
841 843 List<Executionrate> list = jdbcTemplate.query(sql, new RowMapper<Executionrate>() {
842 844  
... ... @@ -845,24 +847,27 @@ public class FormsServiceImpl implements FormsService {
845 847 Executionrate tu = new Executionrate();
846 848 NumberFormat numberFormat = NumberFormat.getInstance();
847 849 numberFormat.setMaximumFractionDigits(2);
848   - String result1 = numberFormat.format((float) Integer.parseInt(arg0.getString("scl"))
849   - / (float) Integer.parseInt(arg0.getString("jcl")) * 100);
850   - String result2 = numberFormat.format((float) Integer.parseInt(arg0.getString("sbc"))
851   - / (float) Integer.parseInt(arg0.getString("jbc")) * 100);
  850 + int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;
  851 + int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;
  852 + int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;
  853 + int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;
  854 + String result1 = numberFormat.format((float) scl / (float) jcl * 100);
  855 + String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
852 856 tu.setRq(rq);
853 857 tu.setGs(arg0.getString("gs_name").toString());
854 858 tu.setZhgs(arg0.getString("fgs_name").toString());
855   - tu.setXl(arg0.getString("xlgs"));//这个是根据公司判断线路有几条
  859 +// tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");//这个是根据公司判断线路有几条
  860 + tu.setXl(arg0.getString("jxl")!=null&&arg0.getString("jxl").trim().length()!=0?arg0.getString("jxl"):"0");
856 861 //tu.setXl(arg0.getString("sxl"));
857   - tu.setXlmc(arg0.getString("sxl"));
858   - tu.setCchjh(arg0.getString("jcl").toString());
859   - tu.setCchsj(arg0.getString("scl").toString());
860   - tu.setCchqz(arg0.getString("sxl").toString());
  862 + tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
  863 + tu.setCchjh("" + jcl);
  864 + tu.setCchsj("" + scl);
  865 + tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
861 866 tu.setChl(result1 + "%");// 出车率
862   - tu.setBcjh(arg0.getString("jbc").toString());
863   - tu.setBcsj(arg0.getString("sbc").toString());
  867 + tu.setBcjh("" + jbc);
  868 + tu.setBcsj("" + sbc);
864 869 tu.setBbzxl(result2 + "%");// 班次执行率
865   - tu.setSm(arg0.getString("xl_name").toString());
  870 + tu.setSm(arg0.getString("xl_name"));
866 871 tu.setGsgs(arg0.getString("gslsbm").toString());
867 872 tu.setFgsgs(arg0.getString("fgsbm").toString());
868 873 return tu;
... ... @@ -912,7 +917,7 @@ public class FormsServiceImpl implements FormsService {
912 917 + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out')"
913 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 "
914 919 + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";
915   -
  920 + System.out.println(sql);
916 921 List<Allline> list = jdbcTemplate.query(sql, new RowMapper<Allline>() {
917 922  
918 923 @Override
... ... @@ -920,28 +925,30 @@ public class FormsServiceImpl implements FormsService {
920 925 Allline tu = new Allline();
921 926 NumberFormat numberFormat = NumberFormat.getInstance();
922 927 numberFormat.setMaximumFractionDigits(2);
923   - String result1 = numberFormat.format((float) Integer.parseInt(arg0.getString("scl"))
924   - / (float) Integer.parseInt(arg0.getString("jcl")) * 100);
925   - String result2 = numberFormat.format((float) Integer.parseInt(arg0.getString("sbc"))
926   - / (float) Integer.parseInt(arg0.getString("jbc")) * 100);
  928 + int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;
  929 + int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;
  930 + int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;
  931 + int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;
  932 + String result1 = numberFormat.format((float) scl / (float) jcl * 100);
  933 + String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
927 934 tu.setRq(rq);
928 935 tu.setGs(arg0.getString("gs_name").toString());
929 936 tu.setZhgs(arg0.getString("fgs_name").toString());
930 937 tu.setXl(arg0.getString("xl_name"));
931   - tu.setXlmc(arg0.getString("sxl"));
932   - tu.setCchjh(arg0.getString("jcl").toString());
933   - tu.setCchsj(arg0.getString("scl").toString());
934   - tu.setCchqz(arg0.getString("sxl").toString());
  938 + tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
  939 + tu.setCchjh("" + jcl);
  940 + tu.setCchsj("" + scl);
  941 + tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
935 942 tu.setChl(result1 + "%");// 出车率
936   - tu.setBcjh(arg0.getString("jbc").toString());
937   - tu.setBcsj(arg0.getString("sbc").toString());
  943 + tu.setBcjh("" + jbc);
  944 + tu.setBcsj("" + sbc);
938 945 tu.setBbzxl(result2 + "%");// 班次执行率
939 946  
940   - tu.setSm(arg0.getString("xl_name").toString());
  947 + tu.setSm(arg0.getString("xl_name"));
941 948 tu.setGsgs(arg0.getString("gslsbm").toString());
942 949 tu.setFgsgs(arg0.getString("fgsbm").toString());
943 950 return tu;
944   - }
  951 + }
945 952 });
946 953  
947 954 return list;
... ...
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
  View file @544840c
... ... @@ -141,7 +141,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
141 141 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
142 142 List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
143 143  
144   - /*String company = "";
  144 + String company = "";
145 145 String subCompany ="";
146 146 if(map.get("company")!=null){
147 147 company = map.get("company").toString();
... ... @@ -149,7 +149,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
149 149  
150 150 if(map.get("subCompany")!=null){
151 151 subCompany=map.get("subCompany").toString();
152   - }*/
  152 + }
153 153 String line = map.get("line").toString();
154 154 String date = map.get("date").toString();
155 155 String type = map.get("type").toString();
... ... @@ -164,9 +164,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
164 164 if(line.length() != 0){
165 165 sql += " and xl_bm = '"+line+"'";
166 166 }
167   - /*if(company.length() != 0){
  167 + if(company.length() != 0){
168 168 sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
169   - }*/
  169 + }
170 170  
171 171 list = jdbcTemplate.query(sql,
172 172 new RowMapper<SchedulePlanInfo>(){
... ...
src/main/resources/static/pages/forms/statement/account.html
  View file @544840c
... ... @@ -139,6 +139,10 @@
139 139 var date = $("#date").val();
140 140 var code = $("#code").val();
141 141 $("#query").on("click",function(){
  142 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  143 + layer.msg("请选择时间");
  144 + return;
  145 + }
142 146 line = $("#line").val();
143 147 xlName = $("#select2-line-container").html();
144 148 date = $("#date").val();
... ...
src/main/resources/static/pages/forms/statement/commandState.html
  View file @544840c
... ... @@ -141,52 +141,10 @@
141 141 day = "0" + day;
142 142 $("#date").val(year + "-" + month + "-" + day);
143 143  
144   -// $.get('/basic/lineCode2Name',function(result){
145   -// var data=[];
146   -
147   -// data.push({id: " ", text: "全部线路"});
148   -// for(var code in result){
149   -// data.push({id: code, text: result[code]});
150   -// }
151   -
152   -// console.log(data);
153   -// initPinYinSelect2('#line',data,'');
154   -// })
155   -
156   -// var obj = [];
157   -// $.get('/user/companyData', function(result){
158   -// obj = result;
159   -// var options = '';
160   -// for(var i = 0; i < obj.length; i++){
161   -// options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
162   -// }
163   -// if(obj.length == 1){
164   -// $('#company1').hide();
165   -// if(obj[0].children.length == 1)
166   -// $('#subCompany1').hide();
167   -// }
168   -// $('#company').html(options);
169   -// updateCompany();
170   -// });
171   -// $("#company").on("change",updateCompany);
172   -// function updateCompany(){
173   -// var company = $('#company').val();
174   -// var options = '';
175   -// for(var i = 0; i < obj.length; i++){
176   -// if(obj[i].companyCode == company){
177   -// var children = obj[i].children;
178   -// for(var j = 0; j < children.length; j++){
179   -// options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
180   -// }
181   -// }
182   -// }
183   -// $('#subCompany').html(options);
184   -// }
185 144 var fage=false;
186 145 var xlList;
187 146 var obj = [];
188 147  
189   -
190 148 $.get('/report/lineList',function(result){
191 149 xlList=result;
192 150 $.get('/user/companyData', function(result){
... ... @@ -296,6 +254,10 @@
296 254 var company = $("#company").val();
297 255 var subCompany = $("#subCompany").val();
298 256 function jsDoQuery(pagination){
  257 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  258 + layer.msg("请选择时间！");
  259 + return;
  260 + }
299 261 var params = {};
300 262 line = $("#line").val();
301 263 if(line == " ")
... ...
src/main/resources/static/pages/forms/statement/correctForm.html
  View file @544840c
... ... @@ -205,6 +205,14 @@
205 205 var lpName = $("#lpName").val();
206 206 var code = $("#code").val();
207 207 $("#query").on("click",function(){
  208 + if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
  209 + layer.msg("请选择范围！");
  210 + return;
  211 + }
  212 + if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
  213 + layer.msg("请选择范围！");
  214 + return;
  215 + }
208 216 line = $("#line").val();
209 217 startDate = $("#startDate").val();
210 218 endDate = $("#endDate").val();
... ...
src/main/resources/static/pages/forms/statement/daily.html
  View file @544840c
... ... @@ -182,7 +182,10 @@
182 182 var gsdmDaily;
183 183 var fgsdmDaily;
184 184 $("#query").on("click",function(){
185   -
  185 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  186 + layer.msg("请选择时间");
  187 + return;
  188 + }
186 189 line = $("#line").val();
187 190 var lineName=$("#select2-line-container").html();
188 191 date = $("#date").val();
... ...
src/main/resources/static/pages/forms/statement/firstAndLastBus.html
  View file @544840c
... ... @@ -118,51 +118,10 @@
118 118 day = "0" + day;
119 119 $("#date").val(year + "-" + month + "-" + day);
120 120  
121   -// $.get('/basic/lineCode2Name',function(result){
122   -// var data=[];
123   -
124   -// data.push({id: " ", text: "全部线路"});
125   -// for(var code in result){
126   -// data.push({id: code, text: result[code]});
127   -// }
128   -// console.log(data);
129   -// initPinYinSelect2('#line',data,'');
130   -// });
131   -
132   -// var obj = [];
133   -// $.get('/user/companyData', function(result){
134   -// obj = result;
135   -// var options = '';
136   -// for(var i = 0; i < obj.length; i++){
137   -// options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
138   -// }
139   -// if(obj.length == 1){
140   -// $('#company1').hide();
141   -// if(obj[0].children.length == 1)
142   -// $('#subCompany1').hide();
143   -// }
144   -// $('#company').html(options);
145   -// updateCompany();
146   -// });
147   -// $("#company").on("change",updateCompany);
148   -// function updateCompany(){
149   -// var company = $('#company').val();
150   -// var options = '';
151   -// for(var i = 0; i < obj.length; i++){
152   -// if(obj[i].companyCode == company){
153   -// var children = obj[i].children;
154   -// for(var j = 0; j < children.length; j++){
155   -// options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
156   -// }
157   -// }
158   -// }
159   -// $('#subCompany').html(options);
160   -// }
161 121 var fage=false;
162 122 var xlList;
163 123 var obj = [];
164 124  
165   -
166 125 $.get('/report/lineList',function(result){
167 126 xlList=result;
168 127 $.get('/user/companyData', function(result){
... ... @@ -233,6 +192,10 @@
233 192 var line = $("#line").val();
234 193 var date = $("#date").val();
235 194 function jsDoQuery(pagination){
  195 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  196 + layer.msg("请选择时间！");
  197 + return;
  198 + }
236 199 var params = {};
237 200 company = $("#company").val();
238 201 subCompany = $("#subCompany").val();
... ...
src/main/resources/static/pages/forms/statement/historyMessage.html
  View file @544840c
... ... @@ -134,6 +134,10 @@
134 134 var date = $("#date").val();
135 135 var code = $("#code").val();
136 136 $("#query").on("click",function(){
  137 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  138 + layer.msg("请选择时间");
  139 + return;
  140 + }
137 141 line = $("#line").val();
138 142 date = $("#date").val();
139 143 code = $("#code").val();
... ...
src/main/resources/static/pages/forms/statement/peopleCarPlan.html
  View file @544840c
... ... @@ -105,7 +105,6 @@
105 105 var xlList;
106 106 var obj = [];
107 107  
108   -
109 108 $.get('/report/lineList',function(result){
110 109 xlList=result;
111 110 $.get('/user/companyData', function(result){
... ...
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
  View file @544840c
... ... @@ -125,53 +125,10 @@
125 125 $("#startDate").val(year + "-" + month + "-" + day);
126 126 $("#endDate").val(year + "-" + month + "-" + day);
127 127  
128   -// $.get('/basic/lineCode2Name',function(result){
129   -// var data=[];
130   -
131   -// data.push({id:" ", text: "全部线路"});
132   -// for(var code in result){
133   -// data.push({id: code, text: result[code]});
134   -// }
135   -// initPinYinSelect2('#line',data,'');
136   -
137   -// line = "";
138   -// updateModel();
139   -// });
140   -
141   -// var obj = [];
142   -// $.get('/user/companyData', function(result){
143   -// obj = result;
144   -// var options = '';
145   -// for(var i = 0; i < obj.length; i++){
146   -// options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
147   -// }
148   -// if(obj.length == 1){
149   -// $('#company1').hide();
150   -// if(obj[0].children.length == 1)
151   -// $('#subCompany1').hide();
152   -// }
153   -// $('#company').html(options);
154   -// updateCompany();
155   -// });
156   -// $("#company").on("change",updateCompany);
157   -// function updateCompany(){
158   -// var company = $('#company').val();
159   -// var options = '';
160   -// for(var i = 0; i < obj.length; i++){
161   -// if(obj[i].companyCode == company){
162   -// var children = obj[i].children;
163   -// for(var j = 0; j < children.length; j++){
164   -// options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
165   -// }
166   -// }
167   -// }
168   -// $('#subCompany').html(options);
169   -// }
170 128 var fage=false;
171 129 var xlList;
172 130 var obj = [];
173 131  
174   -
175 132 $.get('/report/lineList',function(result){
176 133 xlList=result;
177 134 $.get('/user/companyData', function(result){
... ... @@ -247,6 +204,14 @@
247 204 var company = $("#company").val();
248 205 var subCompany = $("#subCompany").val();
249 206 function jsDoQuery(pagination){
  207 + if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
  208 + layer.msg("请选择时间范围！");
  209 + return;
  210 + }
  211 + if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
  212 + layer.msg("请选择时间范围！");
  213 + return;
  214 + }
250 215 var params = {};
251 216 // line = $("#line").val();
252 217 startDate = $("#startDate").val();
... ...
src/main/resources/static/pages/forms/statement/statisticsDaily.html
  View file @544840c
... ... @@ -41,7 +41,7 @@
41 41 <span class="item-label" style="width: 80px;">公司: </span>
42 42 <select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
43 43 </div>
44   - <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv">
  44 + <div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
45 45 <span class="item-label" style="width: 80px;">分公司: </span>
46 46 <select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
47 47 </div>
... ... @@ -169,18 +169,7 @@
169 169 $("#date").val(year + "-" + month + "-" + day);
170 170  
171 171 $("#date2").val(year + "-" + month + "-" + day);
172   - /* $.get('/basic/lineCode2Name',function(result){
173   - var data=[];
174   -
175   - data.push({id: "", text:"请选择"});
176   - for(var code in result){
177   - data.push({id: code, text: result[code]});
178   - }
179   - initPinYinSelect2('#line',data,'');
180   -
181   - }) */
182 172  
183   -
184 173 var fage=false;
185 174 var obj = [];
186 175 var xlList;
... ... @@ -222,7 +211,7 @@
222 211 $("#fgsdm").on("change",initXl);
223 212 function initXl(){
224 213 var data=[];
225   - data.push({id: " ", text: "请选择"});
  214 + data.push({id: " ", text: "全部线路"});
226 215 if(fage){
227 216 $("#line").select2("destroy").html('');
228 217 }
... ... @@ -251,6 +240,14 @@
251 240 var gsdm="";
252 241 var fgsdm="";
253 242 $("#query").on("click",function(){
  243 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  244 + layer.msg("请选择时间范围！");
  245 + return;
  246 + }
  247 + if($("#date2").val() == null || $("#date2").val().trim().length == 0){
  248 + layer.msg("请选择时间范围！");
  249 + return;
  250 + }
254 251 line = $("#line").val();
255 252 xlName = $("#select2-line-container").html();
256 253 date = $("#date").val();
... ...
src/main/resources/static/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html
  View file @544840c
... ... @@ -36,23 +36,23 @@
36 36 <span class="item-label" style="width: 80px;">分公司: </span>
37 37 <select class="form-control" name="subCompany" id="fgsdmManth" style="width: 140px;"></select>
38 38 </div>
39   - <div style="display: inline-block;">
40   - <span class="item-label" style="width: 80px;">线路: </span>
  39 + <div style="display: inline-block;margin-left: 10px">
  40 + <span class="item-label" style="width: 150px;">线路: </span>
41 41 <select class="form-control" name="line" id="line" style="width: 136px;"></select>
42 42 </div>
43 43 <div style="margin-top: 10px">
44 44  
45 45 </div>
46   - <div style="display: inline-block;margin-left: 15px;">
  46 + <div style="display: inline-block;margin-left: 5px;">
47 47 <span class="item-label" style="width: 80px;">开始时间: </span>
48   - <input class="form-control" type="text" id="startDate" style="width: 120px;"/>
  48 + <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
49 49 </div>
50   - <div style="display: inline-block;margin-left: 15px;">
  50 + <div style="display: inline-block;margin-left: 10px;">
51 51 <span class="item-label" style="width: 80px;">结束时间: </span>
52   - <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
  52 + <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
53 53 </div>
54   - <div style="display: inline-block;margin-left: 15px">
55   - <span class="item-label" style="width: 150px;">统计： </span>
  54 + <div style="display: inline-block;margin-left: 10px">
  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>
... ... @@ -166,6 +166,14 @@
166 166 fage=true;
167 167 }
168 168 $("#query").on("click",function(){
  169 + if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
  170 + layer.msg("请选择时间范围！");
  171 + return;
  172 + }
  173 + if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
  174 + layer.msg("请选择时间范围！");
  175 + return;
  176 + }
169 177 $("#empname").html($("#empnames").val())
170 178 var params={};
171 179 params.empnames=$("#empnames").val();
... ...
src/main/resources/static/pages/mforms/singledatas/singledata.html
  View file @544840c
... ... @@ -101,7 +101,6 @@
101 101 var xlList;
102 102 var obj = [];
103 103  
104   -
105 104 $.get('/report/lineList',function(result){
106 105 xlList=result;
107 106 $.get('/user/companyData', function(result){
... ... @@ -138,16 +137,6 @@
138 137 initXl();
139 138 }
140 139  
141   - /* $.get('/basic/lineCode2Name',function(result){
142   - var data=[];
143   -
144   - for(var code in result){
145   - data.push({id: code, text: result[code]});
146   - }
147   - initPinYinSelect2('#line',data,'');
148   -
149   - }) */
150   -
151 140 $("#fgsdmSing").on("change",initXl);
152 141 function initXl(){
153 142 var data=[];
... ... @@ -173,8 +162,12 @@
173 162 fage=true;
174 163 }
175 164  
176   -
  165 +
177 166 $("#query").on("click",function(){
  167 + if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
  168 + layer.msg("请选择时间！");
  169 + return;
  170 + }
178 171 var line = $("#line").val();
179 172 var startDate = $("#startDate").val();
180 173 var lpName = $("#lpName").val();
... ...
src/main/resources/static/pages/mforms/turnoutrates/turnoutrate.html
  View file @544840c
... ... @@ -202,9 +202,9 @@
202 202 gsdmTurn=$("#gsdmTurn").val();
203 203 fgsdmTurn=$("#fgsdmTurn").val();
204 204 if(startDate1!=''&&endDate1!=''){
205   -// $post('/mcy_forms/turnoutrate',
206   -// { gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
207   - var result=[];
  205 + $post('/mcy_forms/turnoutrate',
  206 + { gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
  207 +// var result=[];
208 208 // 把数据填充到模版中
209 209 var tbodyHtml = template('turnoutrate',{list:result});
210 210 // 把渲染好的模版html文本追加到表格中
... ... @@ -256,10 +256,10 @@
256 256 obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
257 257 });
258 258  
259   -// })
  259 + });
260 260  
261 261 }else{
262   - alert("请选择时间范围!");
  262 + layer.msg("请选择时间范围!");
263 263 }
264 264 });
265 265  
... ...
src/main/resources/static/pages/mforms/vehicleloadings/vehicleloading.html
  View file @544840c
... ... @@ -130,16 +130,6 @@
130 130 initXl();
131 131 }
132 132  
133   - /* $.get('/basic/lineCode2Name',function(result){
134   - var data=[];
135   -
136   - for(var code in result){
137   - data.push({id: code, text: result[code]});
138   - }
139   - initPinYinSelect2('#line',data,'');
140   -
141   - }) */
142   -
143 133 $("#fgsdmVehic").on("change",initXl);
144 134 function initXl(){
145 135 var data=[];
... ... @@ -170,6 +160,10 @@
170 160 var gsdmVehic ;
171 161 var fgsdmVehic ;
172 162 $("#query").on("click",function(){
  163 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  164 + layer.msg("请选择时间！");
  165 + return;
  166 + }
173 167 line = $("#line").val();
174 168 date = $("#date").val();
175 169 // gsdmVehic = $("#gsdmVehic").val();
... ...
src/main/resources/static/pages/report/message/message.html
  View file @544840c
... ... @@ -167,7 +167,11 @@
167 167  
168 168 var date = '';
169 169 var line = $("#line").val();
170   - $("#query").on("click",function(){
  170 + $("#query").on("click",function(){
  171 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  172 + layer.msg("请选择时间！");
  173 + return;
  174 + }
171 175 line = $("#line").val();
172 176 date = $("#date").val();
173 177 var code = $("#code").val();
... ...