潘钊 / bsth_control · Commits

Commit f35d374db05e747de12d1b550548855f760ee315

Authored by 徐烜
2 parents a6aa90e0 d39a7c94
build: skipped

Merge branch 'master' of http://222.66.0.204:8090/panzhaov5/bsth_control

Inline Side-by-side
Showing 31 changed files with 264 additions and 146 deletions
src/main/java/com/bsth/controller/CarParkController.java
  View file @f35d374
1 1 package com.bsth.controller;
2 2  
  3 +import java.util.HashMap;
3 4 import java.util.List;
4 5 import java.util.Map;
5 6  
... ... @@ -24,8 +25,13 @@ public class CarParkController extends BaseController<CarPark, Integer> {
24 25 * @return int <carParkCode 停车场编码>
25 26 */
26 27 @RequestMapping(value="getCarParkCode" , method = RequestMethod.GET)
27   - public long getStationCode() {
28   - return GetUIDAndCode.getCarParkId();
  28 + public Map<String, Object> getStationCode() {
  29 +
  30 + Map<String, Object> resultMap = new HashMap<String, Object>();
  31 +
  32 + resultMap.put("carParkCode", "FFFF" + GetUIDAndCode.getCarParkId());
  33 +
  34 + return resultMap;
29 35  
30 36 }
31 37  
... ...
src/main/java/com/bsth/entity/LineInformation.java
  View file @f35d374
... ... @@ -321,7 +321,6 @@ public class LineInformation {
321 321 public void setTroughDownTime(Double troughDownTime) {
322 322 this.troughDownTime = troughDownTime;
323 323 }
324   -
325 324 public String getCarPark() {
326 325 return carPark;
327 326 }
... ...
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
  View file @f35d374
... ... @@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
3 3 import com.bsth.entity.Line;
4 4 import com.bsth.entity.sys.SysUser;
5 5 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
  6 +import com.fasterxml.jackson.annotation.JsonIgnore;
6 7  
7 8 import javax.persistence.*;
8 9 import java.util.Date;
... ...
src/main/java/com/bsth/repository/CarParkRepository.java
  View file @f35d374
... ... @@ -20,16 +20,23 @@ public interface CarParkRepository extends BaseRepository&lt;CarPark, Integer&gt;{
20 20 @Transactional
21 21 @Modifying
22 22 @Query(value="INSERT INTO bsth_c_car_park (" +
23   - "id , area , company , park_code , park_name , " +
24   - "branche_company , create_by , create_date , descriptions , destroy," +
25   - "update_by, update_date , versions , b_center_point , b_park_point , " +
26   - "db_type, g_center_point, g_park_point, radius, shapes_type) " +
  23 + " area , company , park_code , park_name , branche_company , " +
  24 +
  25 + "create_by , create_date , descriptions , destroy, update_by, " +
  26 +
  27 + "update_date , versions , b_center_point , b_park_point ,db_type, " +
  28 +
  29 + "g_center_point, g_park_point, radius, shapes_type) " +
  30 +
27 31 " VALUES(" +
28 32 "?1 , ?2 , ?3 , ?4 , ?5," +
29   - "?6 , ?7 , str_to_date(?8,'%Y-%m-%d %H:%i:%s') , ?9 , ?10," +
30   - "?11,str_to_date(?12,'%Y-%m-%d %H:%i:%s') ,?13, ?14, GeomFromText(?15), " +
31   - "?16, ?17,GeomFromText(?18),?19,?20)", nativeQuery=true)
32   - public void carParkSave(Integer id,Double area,String company,String parkCode,String parkName,
  33 +
  34 + "?6 , str_to_date(?7,'%Y-%m-%d %H:%i:%s') , ?8 , ?9 , ?10," +
  35 +
  36 + "str_to_date(?11,'%Y-%m-%d %H:%i:%s'), ?12 ,?13,GeomFromText(?14), ?15, " +
  37 +
  38 + "?16, GeomFromText(?17), ?18,?19)", nativeQuery=true)
  39 + public void carParkSave(Double area,String company,String parkCode,String parkName,
33 40  
34 41 String brancheCompany,Integer createBy,String createDate,String descriptions,Integer destroy,
35 42  
... ...
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
  View file @f35d374
... ... @@ -3,6 +3,7 @@ package com.bsth.repository.schedule;
3 3 import com.bsth.entity.schedule.SchedulePlanInfo;
4 4 import com.bsth.repository.BaseRepository;
5 5  
  6 +import java.util.Date;
6 7 import java.util.List;
7 8  
8 9 import org.springframework.data.domain.Page;
... ... @@ -17,7 +18,7 @@ import org.springframework.stereotype.Repository;
17 18 @Repository
18 19 public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanInfo, Long> {
19 20  
20   - @Query(value = "select * from bsth_c_s_sp_info where DATE_FORMAT(schedule_date, '%Y-%m-%d')=?1", nativeQuery = true)
21   - List<SchedulePlanInfo> findByDate(String dateformat);
  21 + @Query(value = "select s from SchedulePlanInfo s where scheduleDate=?1")
  22 + List<SchedulePlanInfo> findByDate(Date date);
22 23  
23 24 }
... ...
src/main/java/com/bsth/service/impl/CarParkServiceImpl.java
  View file @f35d374
... ... @@ -35,7 +35,7 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
35 35 String parkCode = map.get("parkCode").equals("") ? null : map.get("parkCode").toString();
36 36  
37 37 // 停车场id
38   - Integer id = Integer.parseInt(parkCode);
  38 + // Integer id = Integer.parseInt(parkCode);
39 39  
40 40 // 停车场名称
41 41 String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
... ... @@ -113,13 +113,14 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
113 113 Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
114 114  
115 115 // 面积
116   - double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
  116 + Double area = map.get("area").equals("") ? 0.0 : Double.parseDouble(map.get("area").toString());
117 117  
118 118 // 公司
119 119 String company = map.get("company").equals("") ? "" : map.get("company").toString();
120 120  
121 121 // 分公司
122   - String brancheCompany = map.get("brancheCompany").equals("") ? "" : map.get("brancheCompany").toString();
  122 + /*String brancheCompany = map.get("brancheCompany").equals("") ? "" : map.get("brancheCompany").toString();*/
  123 + String brancheCompany="";
123 124  
124 125 // 是否撤销
125 126 Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
... ... @@ -146,7 +147,7 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
146 147 // 修改人
147 148 Integer updateBy = map.get("updateBy").equals("") ? null : Integer.parseInt(map.get("updateBy").toString());
148 149  
149   - carParkRepository.carParkSave(id, area, company, parkCode, parkName,
  150 + carParkRepository.carParkSave(area, company, parkCode, parkName,
150 151  
151 152 brancheCompany, createBy, createDate, descriptions, destroy,
152 153  
... ... @@ -260,7 +261,7 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
260 261 if(id!=null) {
261 262  
262 263 // 面积
263   - double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
  264 + Double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
264 265  
265 266 // 中心点（百度坐标）
266 267 String bCenterPoint = map.get("bCenterPoint").equals("") ? "" : map.get("bCenterPoint").toString();
... ... @@ -269,8 +270,9 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
269 270 String bParkPoint = map.get("bParkPoint").equals("") ? "" : map.get("bParkPoint").toString();
270 271  
271 272 // 分公司
272   - String brancheCompany = map.get("brancheCompany").equals("")? "" :map.get("brancheCompany").toString();
273   -
  273 + /*String brancheCompany = map.get("brancheCompany").equals("")? "" :map.get("brancheCompany").toString();*/
  274 + String brancheCompany = "";
  275 +
274 276 // 公司
275 277 String company = map.get("company").equals("") ? "" : map.get("company").toString();
276 278  
... ...
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
  View file @f35d374
... ... @@ -16,6 +16,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
16 16 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
17 17 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
18 18 import com.bsth.util.BatchSaveUtils;
  19 +import com.fasterxml.jackson.databind.ObjectMapper;
19 20  
20 21 /**
21 22 *
... ... @@ -36,6 +37,9 @@ public class GetSchedulePlanThread extends Thread{
36 37 @Autowired
37 38 ScheduleRealInfoRepository scheduleRealInfoRepository;
38 39  
  40 + @Autowired
  41 + ObjectMapper objectMapper;
  42 +
39 43 SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
40 44  
41 45 @Override
... ... @@ -53,7 +57,11 @@ public class GetSchedulePlanThread extends Thread{
53 57 realList = scheduleRealInfoRepository.findByDate(cDate);
54 58 }
55 59 else{
56   - List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(dateStr);
  60 + List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(cDate);
  61 +
  62 + for(SchedulePlanInfo sp : list){
  63 + sp.setSchedulePlan(null);
  64 + }
57 65  
58 66 //实际排班计划
59 67 realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);
... ...
src/main/resources/ftp.properties
  View file @f35d374
1   -#ftp.url=222.66.0.205
2   -#ftp.port=21
3   -#ftp.username=transport
4   -#ftp.password=transport123
5   -#ftp.path= down/
6   -
7   -ftp.url=192.168.168.101
  1 +ftp.url=222.66.0.205
8 2 ftp.port=21
9   -ftp.username=testftpservice
10   -ftp.password= 123
11   -ftp.path= ftptest/
12 3 \ No newline at end of file
  4 +ftp.username=transport
  5 +ftp.password=transport123
  6 +ftp.path= down/
  7 +
  8 +#ftp.url=192.168.168.101
  9 +#ftp.port=21
  10 +#ftp.username=testftpservice
  11 +#ftp.password= 123
  12 +#ftp.path= ftptest/
13 13 \ No newline at end of file
... ...
src/main/resources/static/pages/base/carpark/add.html
  View file @f35d374
... ... @@ -235,7 +235,7 @@
235 235  
236 236  
237 237 <!-- 所属分公司 -->
238   - <div class="form-body">
  238 + <!-- <div class="form-body">
239 239 <div class="form-group">
240 240 <label class="col-md-3 control-label">所属分公司：</label>
241 241 <div class="col-md-6">
... ... @@ -243,7 +243,7 @@
243 243 </select>
244 244 </div>
245 245 </div>
246   - </div>
  246 + </div> -->
247 247  
248 248  
249 249 <!-- 版本号 -->
... ... @@ -344,12 +344,12 @@
344 344 </div>
345 345 </div>
346 346  
347   - <div class="form-group">
  347 + <!-- <div class="form-group">
348 348 <label class="control-label col-md-3">分公司:</label>
349 349 <div class="col-md-4">
350 350 <p class="form-control-static" data-display="brancheCompany"> </p>
351 351 </div>
352   - </div>
  352 + </div> -->
353 353  
354 354 <div class="form-group">
355 355 <label class="control-label col-md-3">版本号:</label>
... ...
src/main/resources/static/pages/base/carpark/edit.html
  View file @f35d374
... ... @@ -108,7 +108,7 @@
108 108 </div>
109 109  
110 110 <!-- 所属分公司 -->
111   - <div class="form-body">
  111 + <!-- <div class="form-body">
112 112 <div class="form-group">
113 113 <label class="col-md-3 control-label">所属分公司：</label>
114 114 <div class="col-md-6">
... ... @@ -116,7 +116,7 @@
116 116 </select>
117 117 </div>
118 118 </div>
119   - </div>
  119 + </div> -->
120 120  
121 121 <!-- 版本号 -->
122 122 <div class="form-body">
... ... @@ -181,17 +181,17 @@ $(&#39;#editPoitsions_carpark_mobal&#39;).on(&#39;editCarParkMobal_show&#39;, function(e, map,fu
181 181 $('#companySelect').val(businessCode);
182 182  
183 183 /** 填充分公司下拉框 @param：<businessCode：公司代码> */
184   - fun.getbrancheCompanyValues(businessCode,function() {
  184 + /* fun.getbrancheCompanyValues(businessCode,function() {
185 185  
186 186 // 获取分公司元素并设值
187 187 $('#brancheCompanySelect').val(CarParkObj.carParkBrancheCompany);
188 188  
189   - });
  189 + }); */
190 190  
191 191 });
192 192  
193 193 // 公司值改变事件
194   - $('#companySelect').on('change',companySelectChangeSetBrancheValue);
  194 + // $('#companySelect').on('change',companySelectChangeSetBrancheValue);
195 195  
196 196 function companySelectChangeSetBrancheValue() {
197 197  
... ...
src/main/resources/static/pages/base/carpark/edit_select.html
  View file @f35d374
... ... @@ -102,12 +102,8 @@ $(&#39;#editPositions_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map,fun,
102 102  
103 103 'carParkNamebox' : {
104 104  
105   - minlength : 2,
106   -
107 105 required : true,
108   -
109   - maxlength : 10
110   -
  106 +
111 107 }
112 108  
113 109 },
... ...
src/main/resources/static/pages/base/carpark/js/add-form-reload.js
  View file @f35d374
... ... @@ -27,9 +27,9 @@
27 27  
28 28 mapB = addCarParkVmapWorlds.init();
29 29  
30   - PublicFunctions.getCarParkCode(function(carParkCode) {
  30 + PublicFunctions.getCarParkCode(function(d) {
31 31  
32   - $('#parkCodeInput').val(carParkCode);
  32 + $('#parkCodeInput').val(d.carParkCode);
33 33  
34 34 });
35 35  
... ... @@ -57,7 +57,7 @@
57 57  
58 58 });
59 59  
60   - var htm = '<option value="">请选择...</option><optgroup label="公司">';
  60 + /*var htm = '<option value="">请选择...</option><optgroup label="公司">';
61 61  
62 62 $('#brancheCompanySelect').html(htm).select2();
63 63  
... ... @@ -98,7 +98,7 @@
98 98 }
99 99  
100 100 });
101   -
  101 + */
102 102  
103 103 }, 500);
104 104  
... ...
src/main/resources/static/pages/base/carpark/js/add-form-wizard.js
  View file @f35d374
... ... @@ -80,11 +80,11 @@ var FormWizard = function() {
80 80 },
81 81  
82 82 // 所属分公司
83   - 'brancheCompany' : {
  83 + /*'brancheCompany' : {
84 84  
85 85 // 必填项
86 86 required : true,
87   - }
  87 + }*/
88 88  
89 89  
90 90 },
... ...
src/main/resources/static/pages/base/carpark/js/add-input-function.js
  View file @f35d374
... ... @@ -27,9 +27,9 @@ var PublicFunctions = function () {
27 27 getBusinessAllInfo : function(cb) {
28 28  
29 29 // 填充公司下拉框选择值
30   - $get('/business/all', {upCode_eq: '88'}, function(array){
  30 + $get('/business/all', {upCode_eq: '77'}, function(array){
31 31  
32   - return cb && cb(array);
  32 + cb && cb(array);
33 33  
34 34 });
35 35  
... ... @@ -37,9 +37,9 @@ var PublicFunctions = function () {
37 37  
38 38 getCarParkCode : function(callback) {
39 39  
40   - $get('/carpark/getCarParkCode',null,function(carParkCode) {
  40 + $get('/carpark/getCarParkCode',null,function(d) {
41 41  
42   - callback && callback(carParkCode);
  42 + callback && callback(d);
43 43  
44 44 });
45 45  
... ... @@ -48,6 +48,8 @@ var PublicFunctions = function () {
48 48 // 新增站点保存
49 49 carParkSave : function(carPark,callback) {
50 50  
  51 + console.log(carPark);
  52 +
51 53 $post('/carpark/carParkSave',carPark,function(data) {
52 54  
53 55 callback && callback(data);
... ...
src/main/resources/static/pages/base/carpark/js/carpark-list-table.js
  View file @f35d374
... ... @@ -13,7 +13,26 @@
13 13 */
14 14  
15 15 (function(){
16   -
  16 +
  17 + /** 填充公司下拉框选择值 */
  18 + $get('/business/all', {upCode_eq: '77'}, function(array){
  19 +
  20 + // 公司下拉options属性值
  21 + var options = '<option value="">请选择...</option>';
  22 +
  23 + // 遍历array
  24 + $.each(array, function(i,d){
  25 +
  26 + options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
  27 +
  28 + });
  29 +
  30 + // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
  31 + $('#companySelect').html(options)
  32 + //$('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
  33 +
  34 + });
  35 +
17 36 /** page : 当前页 initPag : */
18 37 var page = 0,initPag;
19 38  
... ...
src/main/resources/static/pages/base/carpark/js/carpark-positions-function.js
  View file @f35d374
... ... @@ -170,6 +170,10 @@ var PublicFunctions = function () {
170 170  
171 171 }
172 172  
  173 + }else if( r[0].carParkCompany=='77'){
  174 +
  175 + companyV ='闵行公司'
  176 +
173 177 }
174 178  
175 179 // 信息窗口类容
... ... @@ -181,7 +185,7 @@ var PublicFunctions = function () {
181 185 '<span class="help-block" style="color:#DDD;font-size: 15px;">范围类型：' + shapesV + '</span>' +
182 186 '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + r[0].carParkRadius + '</span>' +
183 187 '<span class="help-block" style="color:#DDD;font-size: 15px;">所属公司：' + companyV + '</span>' +
184   - '<span class="help-block" style="color:#DDD;font-size: 15px;">分　公司：' + branchecomV+ '</span>' +
  188 + /*'<span class="help-block" style="color:#DDD;font-size: 15px;">分　公司：' + branchecomV+ '</span>' +*/
185 189 '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + r[0].carParkVersions + '</span>' +
186 190 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+ r[0].carParkDescriptions +'" >说明/描述：' + r[0].carParkDescriptions + '</span>' ;
187 191  
... ... @@ -255,7 +259,7 @@ var PublicFunctions = function () {
255 259 selectTemp : function(callback) {
256 260  
257 261 // 填充公司下拉框选择值
258   - $.get('/business/all', {upCode_eq: '88'}, function(array){
  262 + $.get('/business/all', {upCode_eq: '77'}, function(array){
259 263  
260 264 // 公司下拉options属性值
261 265 var options = '<option value="">-- 请选择公司 --</option>';
... ...
src/main/resources/static/pages/base/carpark/list.html
  View file @f35d374
... ... @@ -34,7 +34,7 @@
34 34 <th width="8%">停车场编号</th>
35 35 <th width="8%">地理位置</th>
36 36 <th width="8%">面积</th>
37   - <th width="8%">分公司</th>
  37 + <!-- <th width="8%">分公司</th> -->
38 38 <th width="8%">所属公司</th>
39 39 <th width="6%">版本号</th>
40 40 <th width="6%">是否撤销</th>
... ... @@ -54,11 +54,11 @@
54 54 <td>
55 55 <input type="text" class="form-control form-filter input-sm" name="area_eq">
56 56 </td>
57   - <td>
  57 + <!-- <td>
58 58 <input type="text" class="form-control form-filter input-sm" name="brancheCompany_eq">
59   - </td>
  59 + </td> -->
60 60 <td>
61   - <input type="text" class="form-control form-filter input-sm" name="company_eq">
  61 + <select name="company_eq" class="form-control" id="companySelect"></select>
62 62 </td>
63 63 <td>
64 64 <input type="text" class="form-control form-filter input-sm" name="versions_eq">
... ... @@ -91,25 +91,9 @@
91 91 </div>
92 92 </div>
93 93 </div>
94   -<script type="text/html" id="carpark_list_table_temp">
95   - {{each list as obj i }}
96   - <tr>
97   - <td style="vertical-align: middle;">
98   - {{(list.page*10)+(i+1)}}
99   - </td>
100   - <td>
101   - {{obj.parkName}}
102   - </td>
103   - <td>
104   - {{obj.parkCode}}
105   - </td>
106   - <td>
107   - {{obj.bCenterPoint}}
108   - </td>
109   - <td>
110   - {{obj.area}}
111   - </td>
112   - <td>
  94 +
  95 +<!--
  96 +
113 97 {{if obj.company == '55'}}
114 98  
115 99 {{if obj.brancheCompany == '1'}}
... ... @@ -163,6 +147,25 @@
163 147 {{/if}}
164 148  
165 149 {{/if}}
  150 +
  151 + -->
  152 +<script type="text/html" id="carpark_list_table_temp">
  153 + {{each list as obj i }}
  154 + <tr>
  155 + <td style="vertical-align: middle;">
  156 + {{(list.page*10)+(i+1)}}
  157 + </td>
  158 + <td>
  159 + {{obj.parkName}}
  160 + </td>
  161 + <td>
  162 + {{obj.parkCode}}
  163 + </td>
  164 + <td>
  165 + {{obj.bCenterPoint}}
  166 + </td>
  167 + <td>
  168 + {{obj.area}}
166 169 </td>
167 170 <td>
168 171 {{if obj.company == '55'}}
... ... @@ -173,6 +176,8 @@
173 176 杨高公司
174 177 {{else if obj.company == '26'}}
175 178 南汇公司
  179 + {{else if obj.company == '77'}}
  180 + 闵行公司
176 181 {{/if}}
177 182 </td>
178 183 <td>
... ...
src/main/resources/static/pages/base/line/add.html
  View file @f35d374
... ... @@ -82,12 +82,12 @@
82 82 </div>
83 83  
84 84 <!-- 所属分公司 -->
85   - <div class="form-group">
  85 + <!-- <div class="form-group">
86 86 <label class="control-label col-md-3"> 所属分公司：</label>
87 87 <div class="col-md-4">
88 88 <select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
89 89 </div>
90   - </div>
  90 + </div> -->
91 91  
92 92 <!-- 线路性质 -->
93 93 <div class="form-group">
... ...
src/main/resources/static/pages/base/line/details.html
  View file @f35d374
... ... @@ -72,12 +72,12 @@
72 72 </div>
73 73  
74 74 <!-- 所属分公司 -->
75   - <div class="form-group">
  75 + <!-- <div class="form-group">
76 76 <label class="control-label col-md-3"> 所属分公司：</label>
77 77 <div class="col-md-4">
78 78 <select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
79 79 </div>
80   - </div>
  80 + </div> -->
81 81  
82 82 <!-- 线路性质 -->
83 83 <div class="form-group">
... ...
src/main/resources/static/pages/base/line/edit.html
  View file @f35d374
... ... @@ -80,12 +80,12 @@
80 80 </div>
81 81  
82 82 <!-- 所属分公司 -->
83   - <div class="form-group">
  83 + <!-- <div class="form-group">
84 84 <label class="control-label col-md-3"> 所属分公司：</label>
85 85 <div class="col-md-4">
86 86 <select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
87 87 </div>
88   - </div>
  88 + </div> -->
89 89  
90 90 <!-- 线路性质 -->
91 91 <div class="form-group">
... ...
src/main/resources/static/pages/base/line/js/line-add-form.js
  View file @f35d374
... ... @@ -6,8 +6,6 @@ $(function(){
6 6 // 获取线路编码
7 7 $.get('/line/getLineCode',function(lineCode){
8 8  
9   - console.log(lineCode);
10   -
11 9 return cb && cb(lineCode);
12 10  
13 11 });
... ... @@ -49,7 +47,7 @@ $(function(){
49 47 });
50 48  
51 49 // 填充公司下拉框选择值
52   - $get('/business/all', {upCode_eq: '88'}, function(array){
  50 + $get('/business/all', {upCode_eq: '77'}, function(array){
53 51  
54 52 // 公司下拉options属性值
55 53 var options = '<option value="">-- 请选择公司 --</option>';
... ... @@ -62,12 +60,13 @@ $(function(){
62 60 });
63 61  
64 62 // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
65   - $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
  63 + $('#companySelect').html(options)
  64 + // $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
66 65  
67 66 });
68 67  
69 68 // 填充分公司下拉框
70   - setbrancheCompanySelectOptions();
  69 + // setbrancheCompanySelectOptions();
71 70  
72 71 // 填充分公司下拉框选择值
73 72 function setbrancheCompanySelectOptions(){
... ...
src/main/resources/static/pages/base/line/js/line-details-info.js
  View file @f35d374
... ... @@ -25,17 +25,17 @@ $(function(){
25 25  
26 26 // 获取表单元素并设置Disabled属性
27 27 $('input,select,textarea','#line_details_form').attr('Disabled','Disabled');
28   -
  28 +
29 29 // 设置公司值
30 30 $('#companySelect').val(result.company);
31 31  
32 32 // 填充分公司下拉框选择值
33   - getbrancheCompanyValues(result.company,function(){
  33 + /*getbrancheCompanyValues(result.company,function(){
34 34  
35 35 // 设置分公司
36 36 $('#brancheCompanySelect').val(result.brancheCompany);
37 37  
38   - });
  38 + });*/
39 39  
40 40 }
41 41  
... ... @@ -61,7 +61,7 @@ $(function(){
61 61 function selectTemp(callback) {
62 62  
63 63 // 填充公司下拉框选择值
64   - $.get('/business/all', {upCode_eq: '88'}, function(array){
  64 + $.get('/business/all', {upCode_eq: '77'}, function(array){
65 65  
66 66 // 公司下拉options属性值
67 67 var options = '<option value="">-- 请选择公司 --</option>';
... ... @@ -76,7 +76,7 @@ $(function(){
76 76 // 填充公司下拉框options
77 77 $('#companySelect').html(options);
78 78  
79   - return callback && callback();
  79 + callback && callback();
80 80  
81 81 });
82 82 }
... ...
src/main/resources/static/pages/base/line/js/line-edit-form.js
  View file @f35d374
... ... @@ -31,12 +31,12 @@
31 31 $('#companySelect').val(result.company);
32 32  
33 33 // 填充分公司下拉框选择值
34   - getbrancheCompanyValues(result.company,function(){
  34 + /* getbrancheCompanyValues(result.company,function(){
35 35  
36 36 // 设置分公司
37 37 $('#brancheCompanySelect').val(result.brancheCompany);
38 38  
39   - });
  39 + });*/
40 40  
41 41 }
42 42  
... ... @@ -78,7 +78,7 @@
78 78 function selectTemp(callback) {
79 79  
80 80 // 填充公司下拉框选择值
81   - $.get('/business/all', {upCode_eq: '88'}, function(array){
  81 + $.get('/business/all', {upCode_eq: '77'}, function(array){
82 82  
83 83 // 公司下拉options属性值
84 84 var options = '<option value="">-- 请选择公司 --</option>';
... ... @@ -132,7 +132,7 @@
132 132 }
133 133  
134 134 // 公司值改变事件
135   - $('#companySelect').on('change',companySelectChangeSetBrancheValue);
  135 + // $('#companySelect').on('change',companySelectChangeSetBrancheValue);
136 136  
137 137 function companySelectChangeSetBrancheValue() {
138 138  
... ...
src/main/resources/static/pages/base/line/js/line-list-table.js
  View file @f35d374
... ... @@ -15,7 +15,7 @@
15 15 (function(){
16 16  
17 17 /** 填充公司下拉框选择值 */
18   - $get('/business/all', {upCode_eq: '88'}, function(array){
  18 + $get('/business/all', {upCode_eq: '77'}, function(array){
19 19  
20 20 // 公司下拉options属性值
21 21 var options = '<option value="">请选择...</option>';
... ... @@ -28,7 +28,8 @@
28 28 });
29 29  
30 30 // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
31   - $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
  31 + $('#companySelect').html(options)
  32 + //$('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
32 33  
33 34 });
34 35  
... ...
src/main/resources/static/pages/base/line/list.html
  View file @f35d374
... ... @@ -53,7 +53,7 @@
53 53 <th width="7%">线路编码</th>
54 54 <th width="8%">线路名称</th>
55 55 <th width="7%">所属公司</th>
56   - <th width="8%">所属分公司</th>
  56 + <!-- <th width="8%">所属分公司</th> -->
57 57 <th width="6%">线路性质</th>
58 58 <th width="6%">线路等级</th>
59 59 <th width="7%">上海市线路编码</th>
... ... @@ -74,9 +74,9 @@
74 74 <td>
75 75 <select name="company_eq" class="form-control" id="companySelect"></select>
76 76 </td>
77   - <td>
  77 + <!-- <td>
78 78 <select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select>
79   - </td>
  79 + </td> -->
80 80 <td>
81 81 <select name="nature_like" class="form-control" id="natureSelect">
82 82 <option value="">请选择...</option>
... ... @@ -137,36 +137,10 @@
137 137 </div>
138 138 <!--
139 139  
140   -<td style="vertical-align: middle;">
141   - <input type="checkbox" class="group-checkable icheck" value="{{obj.name}}" id="{{obj.id}}" data-id="{{obj.id}}" data-lineName="{{obj.name}}">
142   -</td>
143   - -->
144   -<script type="text/html" id="line_list_temp">
145   - {{each list as obj i }}
146   - <tr>
147 140 <td style="vertical-align: middle;">
148 141 <input type="checkbox" class="group-checkable icheck" value="{{obj.name}}" id="{{obj.id}}" data-id="{{obj.id}}" data-lineName="{{obj.name}}">
149 142 </td>
150   - <td style="vertical-align: middle;">
151   - {{(list.page*10)+(i+1)}}
152   - </td>
153   - <td>
154   - {{obj.lineCode}}
155   - </td>
156   - <td>
157   - {{obj.name}}
158   - </td>
159   - <td>
160   - {{if obj.company == '55'}}
161   - 上南公司
162   - {{else if obj.company == '22'}}
163   - 金高公司
164   - {{else if obj.company == '05'}}
165   - 杨高公司
166   - {{else if obj.company == '26'}}
167   - 南汇公司
168   - {{/if}}
169   - </td>
  143 +
170 144 <td>
171 145 {{if obj.company == '55'}}
172 146  
... ... @@ -222,6 +196,36 @@
222 196  
223 197 {{/if}}
224 198 </td>
  199 + -->
  200 +<script type="text/html" id="line_list_temp">
  201 + {{each list as obj i }}
  202 + <tr>
  203 + <td style="vertical-align: middle;">
  204 + <input type="checkbox" class="group-checkable icheck" value="{{obj.name}}" id="{{obj.id}}" data-id="{{obj.id}}" data-lineName="{{obj.name}}">
  205 + </td>
  206 + <td style="vertical-align: middle;">
  207 + {{(list.page*10)+(i+1)}}
  208 + </td>
  209 + <td>
  210 + {{obj.lineCode}}
  211 + </td>
  212 + <td>
  213 + {{obj.name}}
  214 + </td>
  215 + <td>
  216 + {{if obj.company == '55'}}
  217 + 上南公司
  218 + {{else if obj.company == '22'}}
  219 + 金高公司
  220 + {{else if obj.company == '05'}}
  221 + 杨高公司
  222 + {{else if obj.company == '26'}}
  223 + 南汇公司
  224 + {{else if obj.company == '77'}}
  225 + 闵行公司
  226 + {{/if}}
  227 + </td>
  228 +
225 229 <td>
226 230 {{if obj.nature == 'lj'}}
227 231 路救
... ...
src/main/resources/static/pages/base/lineinformation/add.html
  View file @f35d374
... ... @@ -220,7 +220,8 @@
220 220 <div class="form-group">
221 221 <label class="control-label col-md-3"> 停车场 ： </label>
222 222 <div class="col-md-4">
223   - <input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场">
  223 + <select name="carPark" class="form-control" id="carParkSelect"></select>
  224 + <!-- <input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场"> -->
224 225 </div>
225 226 </div>
226 227  
... ...
src/main/resources/static/pages/base/lineinformation/details.html
  View file @f35d374
... ... @@ -227,7 +227,8 @@
227 227 <div class="form-group">
228 228 <label class="control-label col-md-3"> 停车场 ： </label>
229 229 <div class="col-md-4">
230   - <input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场">
  230 + <select name="carPark" class="form-control" id="carParkSelect"></select>
  231 + <!-- <input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场"> -->
231 232 </div>
232 233 </div>
233 234  
... ...
src/main/resources/static/pages/base/lineinformation/edit.html
  View file @f35d374
... ... @@ -230,7 +230,8 @@
230 230 <div class="form-group">
231 231 <label class="control-label col-md-3"> 停车场 ： </label>
232 232 <div class="col-md-4">
233   - <input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场">
  233 + <select name="carPark" class="form-control" id="carParkSelect"></select>
  234 + <!-- <input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场"> -->
234 235 </div>
235 236 </div>
236 237  
... ...
src/main/resources/static/pages/base/lineinformation/js/lineinformation-add-form.js
  View file @f35d374
... ... @@ -5,6 +5,22 @@ $(function(){
5 5  
6 6 if(lineId) {
7 7  
  8 + $get('/carpark/all',null, function(array){
  9 +
  10 + // 停车场下拉options属性值
  11 + var options = '<option value="">-- 请选择停车场 --</option>';
  12 +
  13 + // 遍历array
  14 + $.each(array, function(i,d){
  15 +
  16 + options += '<option value="'+d.parkCode+'">'+d.parkName+'</option>';
  17 +
  18 + });
  19 +
  20 + $('#carParkSelect').html(options)
  21 +
  22 + });
  23 +
8 24 $('.lineinformation_back').attr('href','/pages/base/lineinformation/list.html?no='+lineId);
9 25  
10 26 $('#lineIdInput').val(lineId);
... ...
src/main/resources/static/pages/base/lineinformation/js/lineinformation-details-form.js
  View file @f35d374
... ... @@ -33,11 +33,38 @@ $(function() {
33 33 // 如果不为空
34 34 if(result) {
35 35  
36   - // 获取表单元素下的元素并设置值
  36 + $get('/carpark/all',null, function(array){
  37 +
  38 + // 停车场下拉options属性值
  39 + var options = '<option value="">-- 请选择停车场 --</option>';
  40 +
  41 + // 遍历array
  42 + $.each(array, function(i,d){
  43 +
  44 + options += '<option value="'+d.parkCode+'">'+d.parkName+'</option>';
  45 +
  46 + });
  47 +
  48 + $('#carParkSelect').html(options)
  49 +
  50 + // 获取线路标准类型并设值
  51 + $('#typeInput').val(result.type);
  52 +
  53 + // 获取表单元素下的元素并设值
  54 + putFormData(result, '#lineinformation_details_form');
  55 +
  56 + $('#carParkSelect').val(result.carPark);
  57 +
  58 + // 获取线路ID元素并设值
  59 + // $('#lineIdInput').val(lineId);
  60 +
  61 + });
  62 +
  63 + /* // 获取表单元素下的元素并设置值
37 64 putFormData(result, '#lineinformation_details_form');
38 65  
39 66 // 获取线路标注类型设置值
40   - $('#typeInput').val(result.type);
  67 + $('#typeInput').val(result.type);*/
41 68  
42 69 }
43 70  
... ...
src/main/resources/static/pages/base/lineinformation/js/lineinformation-edit-form.js
  View file @f35d374
... ... @@ -33,14 +33,32 @@ $(function() {
33 33 // 如果不为空
34 34 if(result) {
35 35  
36   - // 获取线路标准类型并设值
37   - $('#typeInput').val(result.type);
38   -
39   - // 获取表单元素下的元素并设值
40   - putFormData(result, '#lineinformation_edit_form');
41   -
42   - // 获取线路ID元素并设值
43   - $('#lineIdInput').val(lineId);
  36 + $get('/carpark/all',null, function(array){
  37 +
  38 + // 停车场下拉options属性值
  39 + var options = '<option value="">-- 请选择停车场 --</option>';
  40 +
  41 + // 遍历array
  42 + $.each(array, function(i,d){
  43 +
  44 + options += '<option value="'+d.parkCode+'">'+d.parkName+'</option>';
  45 +
  46 + });
  47 +
  48 + $('#carParkSelect').html(options)
  49 +
  50 + // 获取线路标准类型并设值
  51 + $('#typeInput').val(result.type);
  52 +
  53 + // 获取表单元素下的元素并设值
  54 + putFormData(result, '#lineinformation_edit_form');
  55 +
  56 + $('#carParkSelect').val(result.carPark);
  57 +
  58 + // 获取线路ID元素并设值
  59 + $('#lineIdInput').val(lineId);
  60 +
  61 + });
44 62  
45 63 }
46 64  
... ...