youxiw2000 / bsthLineProfiles · Commits

Commit fb471e63ae870f7439baef8fec7e4aa4376382a0

Authored by yiming
1 parent b975e446
build: skipped

bf

Inline Side-by-side
Showing 14 changed files with 19 additions and 19 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @fb471e6
@@ -242,8 +242,8 @@ public class BsthTLine extends BaseEntity @@ -242,8 +242,8 @@ public class BsthTLine extends BaseEntity
242 @Excel(name = "线路总配人数") 242 @Excel(name = "线路总配人数")
243 private Long numberPerson; 243 private Long numberPerson;
244 244
245 - /** 人数司机 */  
246 - @Excel(name = "人数司机") 245 + /** 司机人数 */
  246 + @Excel(name = "司机人数")
247 private Long numberPersonDriver; 247 private Long numberPersonDriver;
248 248
249 /** 售票员数 */ 249 /** 售票员数 */
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
  View file @fb471e6
@@ -295,9 +295,9 @@ public class LineHistoryReport extends BaseEntity @@ -295,9 +295,9 @@ public class LineHistoryReport extends BaseEntity
295 @Excel(name = "原线路总配人数") 295 @Excel(name = "原线路总配人数")
296 private Long numberPersonOld; 296 private Long numberPersonOld;
297 297
298 - @Excel(name = "人数司机") 298 + @Excel(name = "司机人数")
299 private Long numberPersonDriver; 299 private Long numberPersonDriver;
300 - @Excel(name = "原人数司机") 300 + @Excel(name = "原司机人数")
301 private Long numberPersonDriverOld; 301 private Long numberPersonDriverOld;
302 302
303 303
bsthLineProfiles/src/main/resources/application-druid.yml
  View file @fb471e6
@@ -13,7 +13,7 @@ spring: @@ -13,7 +13,7 @@ spring:
13 master: 13 master:
14 url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 14 url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
15 username: root 15 username: root
16 - password: 1995627a 16 + password: Aa123456
17 # 从库数据源 17 # 从库数据源
18 slave: 18 slave:
19 # 从数据源开关/默认关闭 19 # 从数据源开关/默认关闭
bsthLineProfiles/src/main/resources/application.yml
  View file @fb471e6
@@ -80,7 +80,7 @@ spring: @@ -80,7 +80,7 @@ spring:
80 # 数据库索引 80 # 数据库索引
81 database: 0 81 database: 0
82 # 密码 82 # 密码
83 - #password: test123 83 + password: test123
84 # 连接超时时间 84 # 连接超时时间
85 timeout: 10s 85 timeout: 10s
86 lettuce: 86 lettuce:
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
  View file @fb471e6
@@ -463,7 +463,7 @@ @@ -463,7 +463,7 @@
463 </div></span> 463 </div></span>
464 <!----------------------------------> 464 <!---------------------------------->
465 <span id="numberPersonDriver"> 465 <span id="numberPersonDriver">
466 - <label class="col-sm-1 control-label">人数司机：</label> 466 + <label class="col-sm-1 control-label">司机人数：</label>
467 <div class="col-sm-2"> 467 <div class="col-sm-2">
468 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text" disabled> 468 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text" disabled>
469 </div></span> 469 </div></span>
bsthLineProfiles/src/main/resources/templates/system/line/line.html
  View file @fb471e6
@@ -168,7 +168,7 @@ @@ -168,7 +168,7 @@
168 </li> 168 </li>
169 <li><label>线路总配人数：</label> <input type="text" 169 <li><label>线路总配人数：</label> <input type="text"
170 name="numberPerson" /></li> 170 name="numberPerson" /></li>
171 - <li><label>人数司机：</label> <input type="text" 171 + <li><label>司机人数：</label> <input type="text"
172 name="numberPersonDriver" /></li> 172 name="numberPersonDriver" /></li>
173 <li><label>售票员数：</label> <input type="text" 173 <li><label>售票员数：</label> <input type="text"
174 name="numberPersonSales" /></li> 174 name="numberPersonSales" /></li>
@@ -742,7 +742,7 @@ @@ -742,7 +742,7 @@
742 title: '线路总配人数' 742 title: '线路总配人数'
743 },{ 743 },{
744 field: 'numberPersonDriver', 744 field: 'numberPersonDriver',
745 - title: '人数司机' 745 + title: '司机人数'
746 }, { 746 }, {
747 field: 'numberPersonSales', 747 field: 'numberPersonSales',
748 title: '售票员数' 748 title: '售票员数'
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
  View file @fb471e6
@@ -380,7 +380,7 @@ @@ -380,7 +380,7 @@
380 <input name="numberPerson" class="form-control" type="text"> 380 <input name="numberPerson" class="form-control" type="text">
381 </div> 381 </div>
382 <!----------------------------------> 382 <!---------------------------------->
383 - <label class="col-sm-1 control-label">人数司机：</label> 383 + <label class="col-sm-1 control-label">司机人数：</label>
384 <div class="col-sm-2"> 384 <div class="col-sm-2">
385 <input name="numberPersonDriver" class="form-control" type="text"> 385 <input name="numberPersonDriver" class="form-control" type="text">
386 </div> 386 </div>
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @fb471e6
@@ -394,7 +394,7 @@ @@ -394,7 +394,7 @@
394 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text"> 394 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
395 </div> 395 </div>
396 <!----------------------------------> 396 <!---------------------------------->
397 - <label class="col-sm-1 control-label">人数司机：</label> 397 + <label class="col-sm-1 control-label">司机人数：</label>
398 <div class="col-sm-2"> 398 <div class="col-sm-2">
399 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text"> 399 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
400 </div> 400 </div>
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @fb471e6
@@ -388,7 +388,7 @@ @@ -388,7 +388,7 @@
388 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text" disabled> 388 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text" disabled>
389 </div> 389 </div>
390 <!----------------------------------> 390 <!---------------------------------->
391 - <label class="col-sm-1 control-label">人数司机：</label> 391 + <label class="col-sm-1 control-label">司机人数：</label>
392 <div class="col-sm-2"> 392 <div class="col-sm-2">
393 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text" disabled> 393 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text" disabled>
394 </div> 394 </div>
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @fb471e6
@@ -394,7 +394,7 @@ @@ -394,7 +394,7 @@
394 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text"> 394 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
395 </div> 395 </div>
396 <!----------------------------------> 396 <!---------------------------------->
397 - <label class="col-sm-1 control-label">人数司机：</label> 397 + <label class="col-sm-1 control-label">司机人数：</label>
398 <div class="col-sm-2"> 398 <div class="col-sm-2">
399 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text"> 399 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
400 </div> 400 </div>
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
  View file @fb471e6
@@ -244,7 +244,7 @@ @@ -244,7 +244,7 @@
244 <span class="col-sm-9"id="numberPerson">{{line.numberPerson}}</span> 244 <span class="col-sm-9"id="numberPerson">{{line.numberPerson}}</span>
245 </div> 245 </div>
246 <div class="col-sm-6"> 246 <div class="col-sm-6">
247 - <label class="col-sm-3 control-label">人数司机：</label> 247 + <label class="col-sm-3 control-label">司机人数：</label>
248 <span class="col-sm-9"id="numberPersonDriver">{{line.numberPersonDriver}}</span> 248 <span class="col-sm-9"id="numberPersonDriver">{{line.numberPersonDriver}}</span>
249 </div> 249 </div>
250 <div class="col-sm-6"> 250 <div class="col-sm-6">
@@ -604,7 +604,7 @@ @@ -604,7 +604,7 @@
604 </span> 604 </span>
605 </div> 605 </div>
606 <div class="col-sm-6"> 606 <div class="col-sm-6">
607 - <label class="col-sm-3 control-label">人数司机：</label> 607 + <label class="col-sm-3 control-label">司机人数：</label>
608 <span class="col-sm-9"> 608 <span class="col-sm-9">
609 {{oldLine.numberPersonDriver}} 609 {{oldLine.numberPersonDriver}}
610 </span> 610 </span>
bsthLineProfiles/src/main/resources/templates/system/lineReport/add.html
  View file @fb471e6
@@ -368,7 +368,7 @@ @@ -368,7 +368,7 @@
368 </div> 368 </div>
369 </div> 369 </div>
370 <div class="form-group"> 370 <div class="form-group">
371 - <label class="col-sm-3 control-label">人数司机：</label> 371 + <label class="col-sm-3 control-label">司机人数：</label>
372 <div class="col-sm-8"> 372 <div class="col-sm-8">
373 <input name="numberPersonDriver" class="form-control" type="text"> 373 <input name="numberPersonDriver" class="form-control" type="text">
374 </div> 374 </div>
bsthLineProfiles/src/main/resources/templates/system/lineReport/edit.html
  View file @fb471e6
@@ -426,7 +426,7 @@ @@ -426,7 +426,7 @@
426 </div> 426 </div>
427 </div> 427 </div>
428 <div class="form-group"> 428 <div class="form-group">
429 - <label class="col-sm-3 control-label">人数司机：</label> 429 + <label class="col-sm-3 control-label">司机人数：</label>
430 <div class="col-sm-8"> 430 <div class="col-sm-8">
431 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" 431 <input name="numberPersonDriver" th:field="*{numberPersonDriver}"
432 class="form-control" type="text"> 432 class="form-control" type="text">
bsthLineProfiles/src/main/resources/templates/system/lineReport/line.html
  View file @fb471e6
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 </li> 162 </li>
163 <li><label>线路总配人数：</label> <input type="text" 163 <li><label>线路总配人数：</label> <input type="text"
164 name="numberPerson" /></li> 164 name="numberPerson" /></li>
165 - <li><label>人数司机：</label> <input type="text" 165 + <li><label>司机人数：</label> <input type="text"
166 name="numberPersonDriver" /></li> 166 name="numberPersonDriver" /></li>
167 <li><label>售票员数：</label> <input type="text" 167 <li><label>售票员数：</label> <input type="text"
168 name="numberPersonSales" /></li> 168 name="numberPersonSales" /></li>
@@ -665,7 +665,7 @@ @@ -665,7 +665,7 @@
665 title: '线路总配人数' 665 title: '线路总配人数'
666 },{ 666 },{
667 field: 'numberPersonDriver', 667 field: 'numberPersonDriver',
668 - title: '人数司机' 668 + title: '司机人数'
669 }, { 669 }, {
670 field: 'numberPersonSales', 670 field: 'numberPersonSales',
671 title: '售票员数' 671 title: '售票员数'