潘钊 / bsth_control · Commits

Commit 4b5c33aa146ab549937324f626b25f417b7a13ed

Authored by 徐烜
1 parent 83cb5889
build: skipped

update

Inline Side-by-side
Showing 2 changed files with 240 additions and 13 deletions
src/main/java/com/bsth/entity/Cars.java
  View file @4b5c33a
... ... @@ -123,8 +123,17 @@ public class Cars {
123 123 private boolean scrapState;
124 124 // 是否切换
125 125 private Integer isSwitch;
126   -
127 126  
  127 + public String getXlmc() {
  128 + return xlmc;
  129 + }
  130 +
  131 + public void setXlmc(String xlmc) {
  132 + this.xlmc = xlmc;
  133 + }
  134 +
  135 + /** 线路名称（这里不做关联，只是登记的时候使用） */
  136 + private String xlmc;
128 137  
129 138 // 创建人
130 139 private Integer createBy;
... ... @@ -139,10 +148,6 @@ public class Cars {
139 148 // 修改日期
140 149 @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
141 150 private Date updateDate;
142   -
143   - // 线路ID
144   - @OneToOne
145   - private Line lineid;
146 151  
147 152 public Integer getId() {
148 153 return id;
... ... @@ -480,14 +485,6 @@ public class Cars {
480 485 this.updateDate = updateDate;
481 486 }
482 487  
483   - public Line getLineid() {
484   - return lineid;
485   - }
486   -
487   - public void setLineid(Line lineid) {
488   - this.lineid = lineid;
489   - }
490   -
491 488 public String getBrancheCompanyCode() {
492 489 return brancheCompanyCode;
493 490 }
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
  View file @4b5c33a
... ... @@ -9,6 +9,236 @@
9 9 </div>
10 10  
11 11 <div class="portlet-body form">
  12 + <form action="" class="form-horizontal">
  13 + <!-- 其他信息放置在这里 -->
  14 + <div class="form-body">
  15 + <div class="form-group">
  16 + <label class="col-md-2 control-label">内部编号：</label>
  17 + <div class="col-md-10">
  18 + <input type="text" class="form-control"/>
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="col-md-2 control-label">所属公司：</label>
  23 + <div class="col-md-10">
  24 + <input type="text" class="form-control"/>
  25 + </div>
  26 + </div>
  27 + <div class="form-group">
  28 + <label class="col-md-2 control-label">分公司：</label>
  29 + <div class="col-md-10">
  30 + <input type="text" class="form-control"/>
  31 + </div>
  32 + </div>
  33 + <div class="form-group">
  34 + <label class="col-md-2 control-label">车辆编码：</label>
  35 + <div class="col-md-10">
  36 + <input type="text" class="form-control"/>
  37 + </div>
  38 + </div>
  39 + <div class="form-group">
  40 + <label class="col-md-2 control-label">车牌号：</label>
  41 + <div class="col-md-10">
  42 + <input type="text" class="form-control"/>
  43 + </div>
  44 + </div>
  45 + <div class="form-group">
  46 + <label class="col-md-2 control-label">设备供应厂商：</label>
  47 + <div class="col-md-10">
  48 + <input type="text" class="form-control"/>
  49 + </div>
  50 + </div>
  51 + <div class="form-group">
  52 + <label class="col-md-2 control-label">终端号：</label>
  53 + <div class="col-md-10">
  54 + <input type="text" class="form-control"/>
  55 + </div>
  56 + </div>
  57 +
  58 + <div class="form-group">
  59 + <label class="col-md-2 control-label">车型类别：</label>
  60 + <div class="col-md-10">
  61 + <input type="text" class="form-control"/>
  62 + </div>
  63 + </div>
  64 + <div class="form-group">
  65 + <label class="col-md-2 control-label">技术速度：</label>
  66 + <div class="col-md-10">
  67 + <input type="text" class="form-control"/>
  68 + </div>
  69 + </div>
  70 + <div class="form-group">
  71 + <label class="col-md-2 control-label">座位数：</label>
  72 + <div class="col-md-10">
  73 + <input type="text" class="form-control"/>
  74 + </div>
  75 + </div>
  76 + <div class="form-group">
  77 + <label class="col-md-2 control-label">载客标准：</label>
  78 + <div class="col-md-10">
  79 + <input type="text" class="form-control"/>
  80 + </div>
  81 + </div>
  82 + <div class="form-group">
  83 + <label class="col-md-2 control-label">标准油耗/开空调：</label>
  84 + <div class="col-md-10">
  85 + <input type="text" class="form-control"/>
  86 + </div>
  87 + </div>
  88 + <div class="form-group">
  89 + <label class="col-md-2 control-label">标准油耗/关空调：</label>
  90 + <div class="col-md-10">
  91 + <input type="text" class="form-control"/>
  92 + </div>
  93 + </div>
  94 + <div class="form-group">
  95 + <label class="col-md-2 control-label">报废号：</label>
  96 + <div class="col-md-10">
  97 + <input type="text" class="form-control"/>
  98 + </div>
  99 + </div>
  100 + <div class="form-group">
  101 + <label class="col-md-2 control-label">报废日期：</label>
  102 + <div class="col-md-10">
  103 + <input type="text" class="form-control"/>
  104 + </div>
  105 + </div>
  106 + <div class="form-group">
  107 + <label class="col-md-2 control-label">厂牌型号1：</label>
  108 + <div class="col-md-10">
  109 + <input type="text" class="form-control"/>
  110 + </div>
  111 + </div>
  112 + <div class="form-group">
  113 + <label class="col-md-2 control-label">厂牌型号2：</label>
  114 + <div class="col-md-10">
  115 + <input type="text" class="form-control"/>
  116 + </div>
  117 + </div>
  118 + <div class="form-group">
  119 + <label class="col-md-2 control-label">车辆等级标准：</label>
  120 + <div class="col-md-10">
  121 + <input type="text" class="form-control"/>
  122 + </div>
  123 + </div>
  124 + <div class="form-group">
  125 + <label class="col-md-2 control-label">出厂排放标准：</label>
  126 + <div class="col-md-10">
  127 + <input type="text" class="form-control"/>
  128 + </div>
  129 + </div>
  130 + <div class="form-group">
  131 + <label class="col-md-2 control-label">发动机号码1：</label>
  132 + <div class="col-md-10">
  133 + <input type="text" class="form-control"/>
  134 + </div>
  135 + </div>
  136 + <div class="form-group">
  137 + <label class="col-md-2 control-label">发动机号码2：</label>
  138 + <div class="col-md-10">
  139 + <input type="text" class="form-control"/>
  140 + </div>
  141 + </div>
  142 + <div class="form-group">
  143 + <label class="col-md-2 control-label">车架号码1：</label>
  144 + <div class="col-md-10">
  145 + <input type="text" class="form-control"/>
  146 + </div>
  147 + </div>
  148 + <div class="form-group">
  149 + <label class="col-md-2 control-label">车架号码2：</label>
  150 + <div class="col-md-10">
  151 + <input type="text" class="form-control"/>
  152 + </div>
  153 + </div>
  154 + <div class="form-group">
  155 + <label class="col-md-2 control-label">启用日期：</label>
  156 + <div class="col-md-10">
  157 + <input type="text" class="form-control"/>
  158 + </div>
  159 + </div>
  160 + <div class="form-group">
  161 + <label class="col-md-2 control-label">取消日期：</label>
  162 + <div class="col-md-10">
  163 + <input type="text" class="form-control"/>
  164 + </div>
  165 + </div>
  166 + <div class="form-group">
  167 + <label class="col-md-2 control-label">是否空调车：</label>
  168 + <div class="col-md-10">
  169 + <input type="text" class="form-control"/>
  170 + </div>
  171 + </div>
  172 + <div class="form-group">
  173 + <label class="col-md-2 control-label">有无人售票：</label>
  174 + <div class="col-md-10">
  175 + <input type="text" class="form-control"/>
  176 + </div>
  177 + </div>
  178 + <div class="form-group">
  179 + <label class="col-md-2 control-label">是否有LED服务屏：</label>
  180 + <div class="col-md-10">
  181 + <input type="text" class="form-control"/>
  182 + </div>
  183 + </div>
  184 + <div class="form-group">
  185 + <label class="col-md-2 control-label">是否有TV视屏：</label>
  186 + <div class="col-md-10">
  187 + <input type="text" class="form-control"/>
  188 + </div>
  189 + </div>
  190 + <div class="form-group">
  191 + <label class="col-md-2 control-label">车辆类型：</label>
  192 + <div class="col-md-10">
  193 + <input type="text" class="form-control"/>
  194 + </div>
  195 + </div>
  196 + <div class="form-group">
  197 + <label class="col-md-2 control-label">是否机动车：</label>
  198 + <div class="col-md-10">
  199 + <input type="text" class="form-control"/>
  200 + </div>
  201 + </div>
  202 + <div class="form-group">
  203 + <label class="col-md-2 control-label">营运状态：</label>
  204 + <div class="col-md-10">
  205 + <input type="text" class="form-control"/>
  206 + </div>
  207 + </div>
  208 + <div class="form-group">
  209 + <label class="col-md-2 control-label">修改日期：</label>
  210 + <div class="col-md-10">
  211 + <input type="text" class="form-control"/>
  212 + </div>
  213 + </div>
  214 + <div class="form-group">
  215 + <label class="col-md-2 control-label">是否电车：</label>
  216 + <div class="col-md-10">
  217 + <input type="text" class="form-control"/>
  218 + </div>
  219 + </div>
  220 + <div class="form-group">
  221 + <label class="col-md-2 control-label">备注：</label>
  222 + <div class="col-md-10">
  223 + <textarea rows="3" class="form-control"></textarea>
  224 + </div>
  225 + </div>
  226 +
  227 +
  228 + <!-- 其他form-group -->
  229 +
  230 + </div>
  231 +
  232 + <div class="form-actions">
  233 + <div class="row">
  234 + <div class="col-md-offset-3 col-md-4">
  235 + <button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
  236 + <a type="button" class="btn default" ui-sref="busInfoManage" ><i class="fa fa-times"></i> 取消</a>
  237 + </div>
  238 + </div>
  239 + </div>
  240 +
  241 + </form>
12 242  
13 243 </div>
14 244  
... ...