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

潘钊
2 parents f9f5e281 a2f137a8
Showing 5 changed files with 57 additions and 11 deletions
src/main/java/com/bsth/entity/Cars.java
src/main/resources/datatools/config-prod.properties
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/detail.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
@@ -126,6 +126,8 @@ public class Cars extends BEntity implements Serializable {
     private String serviceNo;
     /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
     private Boolean sfdc;
+    /** 能源类型（字典标识-nyType，0；全油，1：全电，2：油电混合） */
+    private Integer nyType;
     /** 备注/描述 */
     private String descriptions;
@@ -512,4 +514,12 @@ public class Cars extends BEntity implements Serializable {
     public void setCgsbm(String cgsbm) {
         this.cgsbm = cgsbm;
     }
+
+    public Integer getNyType() {
+        return nyType;
+    }
+
+    public void setNyType(Integer nyType) {
+        this.nyType = nyType;
+    }
 }
@@ -5,19 +5,11 @@ datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-<<<<<<< HEAD
-datatools.kvars_dbip=192.168.160.214
+datatools.kvars_dbip=192.168.160.222
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=bsth@pzsgdsg
-=======
-datatools.kvars_dbip=10.10.150.20
-#数据库用户名
-datatools.kvars_dbuname=root
-#数据库密码
-datatools.kvars_dbpwd=root2jsp@JSP
->>>>>>> pudong
+datatools.kvars_dbpwd=root2jsp
 #数据库库名
 datatools.kvars_dbdname=control
@@ -279,7 +279,15 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否电车：</label>
                     <div class="col-md-3">
-                        <sa-Radiogroup model="ctrl.busInfoForDetail.sfdc" disabled="true" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup>
+                        <sa-Radiogroup name="sfdc" model="ctrl.busInfoForDetail.sfdc" disabled="true" dicgroup="truefalseType"></sa-Radiogroup>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">能源类型：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control"
+                               name="nyType" ng-value="ctrl.busInfoForDetail.nyType | dict:'nyType':'未知'" readonly/>
                     </div>
                 </div>
@@ -448,6 +448,24 @@
                 </div>
                 <div class="form-group">
+                    <label class="col-md-2 control-label">能源类型：</label>
+                    <div class="col-md-3">
+                        <sa-Select5 name="nyType"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'nyType': 'code'}"
+                                    dcname="nyType"
+                                    icname="code"
+                                    dsparams="{{ {type: 'dic', param: 'nyType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择能源类型..."
+                                    searchexp="this.name"
+                                     >
+                        </sa-Select5>
+                    </div>
+                </div>
+
+                <div class="form-group">
                     <label class="col-md-2 control-label">备注：</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"
@@ -441,6 +441,24 @@
                 </div>
                 <div class="form-group">
+                    <label class="col-md-2 control-label">能源类型：</label>
+                    <div class="col-md-3">
+                        <sa-Select5 name="nyType"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'nyType': 'code'}"
+                                    dcname="nyType"
+                                    icname="code"
+                                    dsparams="{{ {type: 'dic', param: 'nyType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择能源类型..."
+                                    searchexp="this.name"
+                                     >
+                        </sa-Select5>
+                    </div>
+                </div>
+
+                <div class="form-group">
                     <label class="col-md-2 control-label">备注：</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"