潘钊 / bsth_control · Commits

Commit 5a34d353fcad064032357534a9a3139e73536a4f

Authored by 潘钊
2 parents f9f5e281 a2f137a8

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

Inline Side-by-side
Showing 5 changed files with 57 additions and 11 deletions
src/main/java/com/bsth/entity/Cars.java
  View file @5a34d35
... ... @@ -126,6 +126,8 @@ public class Cars extends BEntity implements Serializable {
126 126 private String serviceNo;
127 127 /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
128 128 private Boolean sfdc;
  129 + /** 能源类型（字典标识-nyType，0；全油，1：全电，2：油电混合） */
  130 + private Integer nyType;
129 131 /** 备注/描述 */
130 132 private String descriptions;
131 133  
... ... @@ -512,4 +514,12 @@ public class Cars extends BEntity implements Serializable {
512 514 public void setCgsbm(String cgsbm) {
513 515 this.cgsbm = cgsbm;
514 516 }
  517 +
  518 + public Integer getNyType() {
  519 + return nyType;
  520 + }
  521 +
  522 + public void setNyType(Integer nyType) {
  523 + this.nyType = nyType;
  524 + }
515 525 }
... ...
src/main/resources/datatools/config-prod.properties
  View file @5a34d35
... ... @@ -5,19 +5,11 @@ datatools.kettle_properties=/datatools/kettle.properties
5 5 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
6 6  
7 7 #数据库ip地址
8   -<<<<<<< HEAD
9   -datatools.kvars_dbip=192.168.160.214
  8 +datatools.kvars_dbip=192.168.160.222
10 9 #数据库用户名
11 10 datatools.kvars_dbuname=root
12 11 #数据库密码
13   -datatools.kvars_dbpwd=bsth@pzsgdsg
14   -=======
15   -datatools.kvars_dbip=10.10.150.20
16   -#数据库用户名
17   -datatools.kvars_dbuname=root
18   -#数据库密码
19   -datatools.kvars_dbpwd=root2jsp@JSP
20   ->>>>>>> pudong
  12 +datatools.kvars_dbpwd=root2jsp
21 13 #数据库库名
22 14 datatools.kvars_dbdname=control
23 15  
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/detail.html
  View file @5a34d35
... ... @@ -279,7 +279,15 @@
279 279 <div class="form-group">
280 280 <label class="col-md-2 control-label">是否电车：</label>
281 281 <div class="col-md-3">
282   - <sa-Radiogroup model="ctrl.busInfoForDetail.sfdc" disabled="true" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup>
  282 + <sa-Radiogroup name="sfdc" model="ctrl.busInfoForDetail.sfdc" disabled="true" dicgroup="truefalseType"></sa-Radiogroup>
  283 + </div>
  284 + </div>
  285 +
  286 + <div class="form-group">
  287 + <label class="col-md-2 control-label">能源类型：</label>
  288 + <div class="col-md-3">
  289 + <input type="text" class="form-control"
  290 + name="nyType" ng-value="ctrl.busInfoForDetail.nyType | dict:'nyType':'未知'" readonly/>
283 291 </div>
284 292 </div>
285 293  
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
  View file @5a34d35
... ... @@ -448,6 +448,24 @@
448 448 </div>
449 449  
450 450 <div class="form-group">
  451 + <label class="col-md-2 control-label">能源类型：</label>
  452 + <div class="col-md-3">
  453 + <sa-Select5 name="nyType"
  454 + model="ctrl.busInfoForSave"
  455 + cmaps="{'nyType': 'code'}"
  456 + dcname="nyType"
  457 + icname="code"
  458 + dsparams="{{ {type: 'dic', param: 'nyType' } | json }}"
  459 + iterobjname="item"
  460 + iterobjexp="item.name"
  461 + searchph="请选择能源类型..."
  462 + searchexp="this.name"
  463 + >
  464 + </sa-Select5>
  465 + </div>
  466 + </div>
  467 +
  468 + <div class="form-group">
451 469 <label class="col-md-2 control-label">备注：</label>
452 470 <div class="col-md-10">
453 471 <textarea rows="3" class="form-control" name="descriptions"
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
  View file @5a34d35
... ... @@ -441,6 +441,24 @@
441 441 </div>
442 442  
443 443 <div class="form-group">
  444 + <label class="col-md-2 control-label">能源类型：</label>
  445 + <div class="col-md-3">
  446 + <sa-Select5 name="nyType"
  447 + model="ctrl.busInfoForSave"
  448 + cmaps="{'nyType': 'code'}"
  449 + dcname="nyType"
  450 + icname="code"
  451 + dsparams="{{ {type: 'dic', param: 'nyType' } | json }}"
  452 + iterobjname="item"
  453 + iterobjexp="item.name"
  454 + searchph="请选择能源类型..."
  455 + searchexp="this.name"
  456 + >
  457 + </sa-Select5>
  458 + </div>
  459 + </div>
  460 +
  461 + <div class="form-group">
444 462 <label class="col-md-2 control-label">备注：</label>
445 463 <div class="col-md-10">
446 464 <textarea rows="3" class="form-control" name="descriptions"
... ...