youxiw2000 / bsthLineProfiles · Commits

Commit 86222fd7ddb25ab39b0cfbb2d484842ae22de150

Authored by yiming
1 parent 8d1bc40a
build: skipped

线路档案整改内容

Inline Side-by-side
Showing 9 changed files with 430 additions and 85 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @86222fd
1 1 package com.ruoyi.project.system.line.domain;
2 2  
3 3 import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.ruoyi.common.utils.StringUtils;
4 5 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
5 6 import com.ruoyi.framework.web.domain.BaseEntity;
6 7  
... ... @@ -288,6 +289,22 @@ public class BsthTLine extends BaseEntity
288 289  
289 290 private Long deptId;
290 291  
  292 + private String firstTime1;
  293 +
  294 + private String firstTime2;
  295 +
  296 + private String lastTime1;
  297 +
  298 + private String lastTime2;
  299 +
  300 + private String firstHub;
  301 +
  302 + private String firstHubAddress;
  303 +
  304 + private String lastHub;
  305 +
  306 + private String lastHubAddress;
  307 +
291 308 public Long getId() {
292 309 return id;
293 310 }
... ... @@ -425,6 +442,17 @@ public class BsthTLine extends BaseEntity
425 442 }
426 443  
427 444 public String getLineDistance() {
  445 + int i=0;
  446 + double k=0;
  447 + if(!StringUtils.isEmpty(mileageUp)&&Double.parseDouble(mileageUp)>0){
  448 + i++;
  449 + k+=Double.parseDouble(mileageUp);
  450 + }
  451 + if(!StringUtils.isEmpty(mileageDown)&&Double.parseDouble(mileageDown)>0){
  452 + i++;
  453 + k+=Double.parseDouble(mileageDown);
  454 + }
  455 + lineDistance=i>0?String.valueOf(k/i):null;
428 456 return lineDistance;
429 457 }
430 458  
... ... @@ -556,30 +584,56 @@ public class BsthTLine extends BaseEntity
556 584 this.firstStation = firstStation;
557 585 }
558 586  
  587 + public String getLastStation() {
  588 + return lastStation;
  589 + }
  590 +
559 591 public String getFirstTime() {
  592 + if(!StringUtils.isEmpty(firstTime1)){
  593 + firstTime=firstTime1;
  594 + }
  595 + if(!StringUtils.isEmpty(firstTime)&&!StringUtils.isEmpty(firstTime2)){
  596 + firstTime+=","+firstTime2;
  597 + }
560 598 return firstTime;
561 599 }
562 600  
563 601 public void setFirstTime(String firstTime) {
564 602 this.firstTime = firstTime;
565   - }
566   -
567   - public String getLastStation() {
568   - return lastStation;
569   - }
570   -
571   - public void setLastStation(String lastStation) {
572   - this.lastStation = lastStation;
  603 + if(firstTime!=null){
  604 + String[] arr=firstTime.split(",");
  605 + if(arr.length>=1){
  606 + firstTime1=arr[0];
  607 + }if(arr.length==2){
  608 + firstTime2=arr[1];
  609 + }
  610 + }
573 611 }
574 612  
575 613 public String getLastTime() {
  614 + if(!StringUtils.isEmpty(lastTime1)){
  615 + lastTime=lastTime1;
  616 + }
  617 + if(!StringUtils.isEmpty(lastTime)&&!StringUtils.isEmpty(lastTime2)){
  618 + lastTime+=","+lastTime2;
  619 + }
576 620 return lastTime;
577 621 }
578 622  
579 623 public void setLastTime(String lastTime) {
580 624 this.lastTime = lastTime;
  625 + if(lastTime!=null){
  626 + String[] arr=lastTime.split(",");
  627 + if(arr.length>=1){
  628 + lastTime1=arr[0];
  629 + }if(arr.length==2){
  630 + lastTime2=arr[1];
  631 + }
  632 + }
581 633 }
582 634  
  635 +
  636 +
583 637 public String getMileageUp() {
584 638 return mileageUp;
585 639 }
... ... @@ -867,4 +921,72 @@ public class BsthTLine extends BaseEntity
867 921 public void setDeptId(Long deptId) {
868 922 this.deptId = deptId;
869 923 }
  924 +
  925 + public String getFirstTime1() {
  926 + return firstTime1;
  927 + }
  928 +
  929 + public void setFirstTime1(String firstTime1) {
  930 + this.firstTime1 = firstTime1;
  931 + }
  932 +
  933 + public String getFirstTime2() {
  934 + return firstTime2;
  935 + }
  936 +
  937 + public void setFirstTime2(String firstTime2) {
  938 + this.firstTime2 = firstTime2;
  939 + }
  940 +
  941 + public String getLastTime1() {
  942 + return lastTime1;
  943 + }
  944 +
  945 + public void setLastTime1(String lastTime1) {
  946 + this.lastTime1 = lastTime1;
  947 + }
  948 +
  949 + public String getLastTime2() {
  950 + return lastTime2;
  951 + }
  952 +
  953 + public void setLastTime2(String lastTime2) {
  954 + this.lastTime2 = lastTime2;
  955 + }
  956 +
  957 + public void setLastStation(String lastStation) {
  958 + this.lastStation = lastStation;
  959 + }
  960 +
  961 + public String getFirstHub() {
  962 + return firstHub;
  963 + }
  964 +
  965 + public void setFirstHub(String firstHub) {
  966 + this.firstHub = firstHub;
  967 + }
  968 +
  969 + public String getFirstHubAddress() {
  970 + return firstHubAddress;
  971 + }
  972 +
  973 + public void setFirstHubAddress(String firstHubAddress) {
  974 + this.firstHubAddress = firstHubAddress;
  975 + }
  976 +
  977 + public String getLastHub() {
  978 + return lastHub;
  979 + }
  980 +
  981 + public void setLastHub(String lastHub) {
  982 + this.lastHub = lastHub;
  983 + }
  984 +
  985 + public String getLastHubAddress() {
  986 + return lastHubAddress;
  987 + }
  988 +
  989 + public void setLastHubAddress(String lastHubAddress) {
  990 + this.lastHubAddress = lastHubAddress;
  991 + }
870 992 }
... ...
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @86222fd
... ... @@ -75,6 +75,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
75 75 <result property="lineUpdateType" column="line_update_type" />
76 76 <result property="examineStatus" column="examine_status" />
77 77 <result property="examineType" column="examine_type" />
  78 + <result property="firstHub" column="firstHub" />
  79 + <result property="firstHubAddress" column="firstHubAddress" />
  80 + <result property="lastHub" column="lastHub" />
  81 + <result property="lastHubAddress" column="lastHubAddress" />
78 82 </resultMap>
79 83  
80 84  
... ... @@ -254,6 +258,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
254 258 <if test="lineUpdateType != null">line_update_type,</if>
255 259 <if test="revenueType != null">revenue_type,</if>
256 260 <if test="deptId != null">dept_id,</if>
  261 + <if test="firstHub != null">firstHub,</if>
  262 + <if test="firstHubAddress != null">firstHubAddress,</if>
  263 + <if test="lastHub != null">lastHub,</if>
  264 + <if test="lastHubAddress != null">lastHubAddress,</if>
257 265 create_time,
258 266 </trim>
259 267 <trim prefix="values (" suffix=")" suffixOverrides=",">
... ... @@ -320,6 +328,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
320 328 <if test="lineUpdateType != null">#{lineUpdateType},</if>
321 329 <if test="revenueType != null">#{revenueType},</if>
322 330 <if test="deptId != null">#{deptId},</if>
  331 + <if test="firstHub != null">#{firstHub},</if>
  332 + <if test="firstHubAddress != null">#{firstHubAddress},</if>
  333 + <if test="lastHub != null">#{lastHub},</if>
  334 + <if test="lastHubAddress != null">#{lastHubAddress},</if>
323 335 sysdate(),
324 336 </trim>
325 337 </insert>
... ... @@ -393,6 +405,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
393 405 <if test="revenueType != null">revenue_type = #{revenueType},</if>
394 406 <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
395 407 <if test="deptId != null">dept_id = #{deptId},</if>
  408 + <if test="firstHub != null">firstHub = #{firstHub},</if>
  409 + <if test="firstHubAddress != null">firstHubAddress = #{firstHubAddress},</if>
  410 + <if test="lastHub != null">lastHub = #{lastHub},</if>
  411 + <if test="lastHubAddress != null">lastHubAddress = #{lastHubAddress},</if>
396 412 </trim>
397 413 where id = #{id}
398 414 </update>
... ... @@ -464,6 +480,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
464 480 <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
465 481 <if test="revenueType != null">revenue_type = #{revenueType},</if>
466 482 <if test="deptId != null">dept_id = #{deptId},</if>
  483 + <if test="firstHub != null">firstHub = #{firstHub},</if>
  484 + <if test="firstHubAddress != null">firstHubAddress = #{firstHubAddress},</if>
  485 + <if test="lastHub != null">lastHub = #{lastHub},</if>
  486 + <if test="lastHubAddress != null">lastHubAddress = #{lastHubAddress},</if>
467 487 </trim>
468 488 where line_name = #{lineName}
469 489 </update>
... ... @@ -611,6 +631,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
611 631 <if test="lineUpdateType != null">line_update_type,</if>
612 632 <if test="examineStatus != null">examine_status,</if>
613 633 <if test="deptId != null">dept_id,</if>
  634 + <if test="firstHub != null">firstHub,</if>
  635 + <if test="firstHubAddress != null">firstHubAddress,</if>
  636 + <if test="lastHub != null">lastHub,</if>
  637 + <if test="lastHubAddress != null">lastHubAddress,</if>
614 638 create_time,
615 639 </trim>
616 640 <trim prefix="values (" suffix=")" suffixOverrides=",">
... ... @@ -679,6 +703,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
679 703 <if test="lineUpdateType != null">#{lineUpdateType},</if>
680 704 <if test="examineStatus != null">#{examineStatus},</if>
681 705 <if test="deptId != null">#{deptId},</if>
  706 + <if test="firstHub != null">#{firstHub},</if>
  707 + <if test="firstHubAddress != null">#{firstHubAddress},</if>
  708 + <if test="lastHub != null">#{lastHub},</if>
  709 + <if test="lastHubAddress != null">#{lastHubAddress},</if>
682 710 sysdate(),
683 711 </trim>
684 712 </insert>
... ... @@ -771,6 +799,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
771 799 <if test="examineType != null">examine_type = #{examineType},</if>
772 800 <if test="examineStatus != null">examine_status = #{examineStatus},</if>
773 801 <if test="deptId != null">dept_id=#{deptId},</if>
  802 + <if test="firstHub != null">firstHub = #{firstHub},</if>
  803 + <if test="firstHubAddress != null">firstHubAddress = #{firstHubAddress},</if>
  804 + <if test="lastHub != null">lastHub = #{lastHub},</if>
  805 + <if test="lastHubAddress != null">lastHubAddress = #{lastHubAddress},</if>
774 806 </trim>
775 807 where id = #{id}
776 808 </update>
... ... @@ -945,6 +977,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
945 977 <if test="updateStatus != null">update_status,</if>
946 978 <if test="historyId != null">history_id,</if>
947 979 <if test="deptId != null">dept_id,</if>
  980 + <if test="firstHub != null">firstHub,</if>
  981 + <if test="firstHubAddress != null">firstHubAddress,</if>
  982 + <if test="lastHub != null">lastHub,</if>
  983 + <if test="lastHubAddress != null">lastHubAddress,</if>
948 984 create_time,
949 985 </trim>
950 986 <trim prefix="values (" suffix=")" suffixOverrides=",">
... ... @@ -1013,6 +1049,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1013 1049 <if test="updateStatus != null">#{updateStatus},</if>
1014 1050 <if test="historyId != null">#{historyId},</if>
1015 1051 <if test="deptId != null">#{deptId},</if>
  1052 + <if test="firstHub != null">#{firstHub},</if>
  1053 + <if test="firstHubAddress != null">#{firstHubAddress},</if>
  1054 + <if test="lastHub != null">#{lastHub},</if>
  1055 + <if test="lastHubAddress != null">#{lastHubAddress},</if>
1016 1056 sysdate(),
1017 1057 </trim>
1018 1058 </insert>
... ... @@ -1086,6 +1126,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1086 1126 <if test="revenueType != null">revenue_type = #{revenueType},</if>
1087 1127 <if test="updateStatus != null ">update_status = #{updateStatus},</if>
1088 1128 <if test="deptId != null">dept_id=#{deptId},</if>
  1129 + <if test="firstHub != null">firstHub = #{firstHub},</if>
  1130 + <if test="firstHubAddress != null">firstHubAddress = #{firstHubAddress},</if>
  1131 + <if test="lastHub != null">lastHub = #{lastHub},</if>
  1132 + <if test="lastHubAddress != null">lastHubAddress = #{lastHubAddress},</if>
1089 1133 </trim>
1090 1134 where id = #{id}
1091 1135 </update>
... ... @@ -1361,9 +1405,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1361 1405 h1.vehicles_number vehiclesNumber,h1.number_vehicles_large numberVehiclesLarge,h1.number_vehicles_middle numberVehiclesMiddle,
1362 1406 h1.car_plate carPlate,h1.number_person numberPerson,h1.number_person_driver numberPersonDriver,h1.number_person_sales numberPersonSales,
1363 1407 h1.bus_ev_number busEvNumber,h1.directions directions,h1.halfway_station halfwayStation,
1364   - h1.divide_level divideLevel,
  1408 + h1.divide_level divideLevel,h1.nightParking nightParking
1365 1409 h1.has_timelists hasTimelists,h1.is_metro isMetro,h1.metro_time metroTime,h1.cold_bonus_type coldBonusType,
1366 1410 h1.line_update_type lineUpdateType,h1.revenue_type revenueType,
  1411 + h1.firstHub firstHub,h1.firstHubAddress firstHubAddress,h1.lastHub lastHub,h1.lastHubAddress lastHubAddress,
1367 1412 h2.id idOld,h2.line_name lineNameOld,h2.company companyOld,h2.f_company fCompanyOld,h2.p_line_id pLineIdOld,
1368 1413 h2.service_type serviceTypeOld,h2.line_level lineLevelOld,h2.line_type lineTypeOld,h2.district districtOld,
1369 1414 h2.inout_district inoutDistrictOld,h2.service_state serviceStateOld,h2.bus_type busTypeOld,h2.air_conditioner_type airConditionerTypeOld,
... ... @@ -1379,9 +1424,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1379 1424 h2.vehicles_number vehiclesNumberOld,h2.number_vehicles_large numberVehiclesLargeOld,h2.number_vehicles_middle numberVehiclesMiddleOld,
1380 1425 h2.car_plate carPlateOld,h2.number_person numberPersonOld,h2.number_person_driver numberPersonDriverOld,h2.number_person_sales numberPersonSalesOld,
1381 1426 h2.bus_ev_number busEvNumberOld,h2.directions directionsOld,h2.halfway_station halfwayStationOld,
1382   - h2.divide_level divideLevelOld,
  1427 + h2.divide_level divideLevelOld,h2.nightParking nightParkingOld
1383 1428 h2.has_timelists hasTimelistsOld,h2.is_metro isMetroOld,h2.metro_time metroTimeOld,h2.cold_bonus_type coldBonusTypeOld,
1384   - h2.line_update_type lineUpdateTypeOld,h2.revenue_type revenueTypeOld
  1429 + h2.line_update_type lineUpdateTypeOld,h2.revenue_type revenueTypeOld,
  1430 + h2.firstHub firstHubOld,h2.firstHubAddress firstHubAddressOld,h2.lastHub lastHubOld,h2.lastHubAddress lastHubAddressOld
1385 1431 FROM bsth_t_line_history h1 LEFT JOIN bsth_t_line_history h2 on h1.history_id=h2.id
1386 1432 <where>
1387 1433 <if test="createTimeStr != null and createTimeStr != ''"> and h1.create_time >= #{createTimeStr}</if>
... ...
bsthLineProfiles/src/main/resources/static/ruoyi/js/ry-ui.js
  View file @86222fd
... ... @@ -842,7 +842,7 @@ var table = {
842 842 var index = layer.open($.extend({
843 843 type: 2,
844 844 maxmin: $.common.isEmpty(options.maxmin) ? true : options.maxmin,
845   - shade: 0.3,
  845 + shade: 0.0,
846 846 title: _title,
847 847 fix: false,
848 848 area: [_width + 'px', _height + 'px'],
... ...
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
  View file @86222fd
... ... @@ -240,6 +240,33 @@
240 240 <label>下行里程数：</label>
241 241 <input name="mileageDown" th:field="*{mileageDown}" type="text" disabled>
242 242 </li>
  243 +
  244 +
  245 + <!---------------------------------->
  246 + <li id="firstHub">
  247 + <label>首站枢纽站：</label>
  248 + <input name="firstHub" th:field="*{firstHub}" type="text" disabled>
  249 + </li>
  250 + <!---------------------------------->
  251 + <li id="firstHubAddress">
  252 + <label>首站枢纽站地址：</label>
  253 + <input name="firstHubAddress" th:field="*{firstHubAddress}" type="text" disabled>
  254 + </li>
  255 +
  256 + <!---------------------------------->
  257 + <li id="lastHub">
  258 + <label>末站枢纽站：</label>
  259 + <input name="lastHub" th:field="*{lastHub}" type="text" disabled>
  260 + </li>
  261 + <!---------------------------------->
  262 + <li id="lastHubAddress">
  263 + <label>末站枢纽站地址：</label>
  264 + <input name="lastHubAddress" th:field="*{lastHubAddress}" type="text" disabled>
  265 + </li>
  266 +
  267 +
  268 +
  269 +
243 270 <!---------------------------------->
244 271 <li id="stationUp">
245 272 <label>站级数(上行)：</label>
... ...
bsthLineProfiles/src/main/resources/templates/system/line/line.html
  View file @86222fd
... ... @@ -142,6 +142,16 @@
142 142 <!---------------------------------->
143 143 <li><label>下行里程：</label> <input type="text" name="mileageDown" /></li>
144 144 <!---------------------------------->
  145 + <li><label>夜间停车场：</label> <input type="text" name="nightParking" /></li>
  146 + <!---------------------------------->
  147 + <li><label>首站枢纽站：</label> <input type="text" name="firstHub" /></li>
  148 + <!---------------------------------->
  149 + <li><label>首站枢纽站地址：</label> <input type="text" name="firstHubAddress" /></li>
  150 + <!---------------------------------->
  151 + <li><label>末站枢纽站：</label> <input type="text" name="lastHub" /></li>
  152 + <!---------------------------------->
  153 + <li><label>末站枢纽站地址：</label> <input type="text" name="lastHubAddress" /></li>
  154 + <!---------------------------------->
145 155 <li><label>站级数(上行)：</label> <input type="text" name="stationUp" /></li>
146 156 <!---------------------------------->
147 157 <li><label>站级数(下行)：</label> <input type="text" name="stationDown" /></li>
... ... @@ -590,6 +600,18 @@
590 600 field: 'lastStation',
591 601 title: '末站'
592 602 },{
  603 + field: 'firstHub',
  604 + title: '首站枢纽站'
  605 + },{
  606 + field: 'firstHubAddress',
  607 + title: '首站枢纽站地址'
  608 + },{
  609 + field: 'lastHub',
  610 + title: '末站枢纽站'
  611 + },{
  612 + field: 'lastHubAddress',
  613 + title: '末站枢纽站地址'
  614 + },{
593 615 field: 'firstTime',
594 616 title: '起点站首末班'
595 617 },{
... ... @@ -768,6 +790,13 @@
768 790 minView : "month",
769 791 autoclose : true
770 792 });
  793 + document.onkeydown= function (e) { // 回车提交表单
  794 + var theEvent = window.event || e;
  795 + var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
  796 + if (code == 13) {
  797 + $.table.search();
  798 + }
  799 + }
771 800 </script>
772 801  
773 802 <style>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
  View file @86222fd
... ... @@ -6,6 +6,7 @@
6 6 <th:block th:include="include :: bootstrap-fileinput-css"/>
7 7 <th:block th:include="include :: bootstrap-select-css"/>
8 8 <th:block th:include="include :: select2-css"/>
  9 + <th:block th:include="include :: jasny-bootstrap-css" />
9 10 </head>
10 11 <body class="white-bg">
11 12 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
... ... @@ -176,29 +177,36 @@
176 177 <div class="form-group">
177 178 <label class="col-sm-1 control-label">起点站首末班：</label>
178 179 <div class="col-sm-2">
179   - <input name="firstTime" class="form-control" type="text">
  180 + <input name="firstTime1" class="form-control" type="text" data-mask="99:99-99:99">
180 181 </div>
181 182 <!---------------------------------->
182   - <label class="col-sm-1 control-label">终点站首末班：</label>
  183 + <label class="col-sm-1 control-label">起点站首末班(仅在多时段使用)：</label>
183 184 <div class="col-sm-2">
184   - <input name="lastTime" class="form-control" type="text">
  185 + <input name="firstTime2" class="form-control" type="text" data-mask="99:99-99:99">
185 186 </div>
186 187 <!---------------------------------->
187   - <label class="col-sm-1 control-label">上行里程数：</label>
  188 + <label class="col-sm-1 control-label">终点站首末班：</label>
188 189 <div class="col-sm-2">
189   - <input name="mileageUp" class="form-control" type="text">
  190 + <input name="lastTime1" class="form-control" type="text" data-mask="99:99-99:99">
190 191 </div>
191 192 <!---------------------------------->
192   - <label class="col-sm-1 control-label">下行里程数：</label>
  193 + <label class="col-sm-1 control-label">终点站首末班(仅在多时段使用)：</label>
193 194 <div class="col-sm-2">
194   - <input name="mileageDown" class="form-control" type="text">
  195 + <input name="lastTime2" class="form-control" type="text" data-mask="99:99-99:99">
195 196 </div>
196 197 </div>
  198 +
197 199 <!---------------------------------->
198 200 <div class="form-group">
199   - <label class="col-sm-1 control-label">线路长度：</label>
  201 + <!---------------------------------->
  202 + <label class="col-sm-1 control-label">上行里程数：</label>
200 203 <div class="col-sm-2">
201   - <input name="lineDistance" class="form-control" type="text">
  204 + <input name="mileageUp" class="form-control" type="text" data-mask="99.99">
  205 + </div>
  206 + <!---------------------------------->
  207 + <label class="col-sm-1 control-label">下行里程数：</label>
  208 + <div class="col-sm-2">
  209 + <input name="mileageDown" class="form-control" type="text" data-mask="99.99">
202 210 </div>
203 211 <!---------------------------------->
204 212 <label class="col-sm-1 control-label">是否权证：</label>
... ... @@ -210,7 +218,32 @@
210 218 </option>
211 219 </select>
212 220 </div>
  221 + </div>
  222 + <!---------------------------------->
  223 + <div class="form-group">
  224 + <!---------------------------------->
  225 + <label class="col-sm-1 control-label">首站枢纽站：</label>
  226 + <div class="col-sm-2">
  227 + <input name="firstHub" class="form-control" type="text">
  228 + </div>
  229 + <!---------------------------------->
  230 + <label class="col-sm-1 control-label">首站枢纽站地址：</label>
  231 + <div class="col-sm-2">
  232 + <input name="firstHubAddress" class="form-control" type="text">
  233 + </div>
213 234 <!---------------------------------->
  235 + <label class="col-sm-1 control-label">末站枢纽站：</label>
  236 + <div class="col-sm-2">
  237 + <input name="lastHub" class="form-control" type="text">
  238 + </div>
  239 + <!---------------------------------->
  240 + <label class="col-sm-1 control-label">末站枢纽站地址：</label>
  241 + <div class="col-sm-2">
  242 + <input name="lastHubAddress" class="form-control" type="text">
  243 + </div>
  244 + </div>
  245 + <!---------------------------------->
  246 + <div class="form-group">
214 247 <label class="col-sm-1 control-label">授权起始日期：</label>
215 248 <div class="col-sm-2">
216 249 <div class="input-group date">
... ... @@ -228,9 +261,7 @@
228 261 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
229 262 </div>
230 263 </div>
231   - </div>
232   - <!---------------------------------->
233   - <div class="form-group">
  264 + <!---------------------------------->
234 265 <label class="col-sm-1 control-label">授权年限：</label>
235 266 <div class="col-sm-2">
236 267 <input name="warrantYear" class="form-control" type="text">
... ... @@ -244,7 +275,9 @@
244 275 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
245 276 </div>
246 277 </div>
247   - <!---------------------------------->
  278 + </div>
  279 + <!---------------------------------->
  280 + <div class="form-group">
248 281 <label class="col-sm-1 control-label">经营权证（大）：</label>
249 282 <div class="col-sm-2">
250 283 <input name="warrantVehiclesLarge" class="form-control" type="text">
... ... @@ -254,9 +287,7 @@
254 287 <div class="col-sm-2">
255 288 <input name="warrantVehiclesMiddle" class="form-control" type="text">
256 289 </div>
257   - </div>
258   - <!---------------------------------->
259   - <div class="form-group">
  290 + <!---------------------------------->
260 291 <label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
261 292 <div class="col-sm-2">
262 293 <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
... ... @@ -273,6 +304,8 @@
273 304 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
274 305 </div>
275 306 </div>
  307 + </div>
  308 + <div class="form-group">
276 309 <!---------------------------------->
277 310 <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
278 311 <div class="col-sm-2">
... ... @@ -293,9 +326,7 @@
293 326 </option>
294 327 </select>
295 328 </div>
296   - </div>
297   - <!---------------------------------->
298   - <div class="form-group">
  329 + <!---------------------------------->
299 330 <label class="col-sm-1 control-label">线路暂停日期：</label>
300 331 <div class="col-sm-2">
301 332 <div class="input-group date">
... ... @@ -313,6 +344,9 @@
313 344 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
314 345 </div>
315 346 </div>
  347 + </div>
  348 + <!---------------------------------->
  349 + <div class="form-group">
316 350 <!---------------------------------->
317 351 <label class="col-sm-1 control-label">性质：</label>
318 352 <div class="col-sm-2">
... ... @@ -431,9 +465,12 @@
431 465 </div>
432 466 <th:block th:include="include :: footer"/>
433 467 <th:block th:include="include :: datetimepicker-js"/>
434   -<th:block th:include="include :: bootstrap-fileinput-js"/>
  468 +<th:block th:include="include :: jasny-bootstrap-js" />
  469 +<th:block th:include="include :: bootstrap-fileinput-js" />
435 470 <th:block th:include="include :: bootstrap-select-js"/>
436 471 <th:block th:include="include :: select2-js"/>
  472 +
  473 +
437 474 <script th:inline="javascript">
438 475 var prefix = ctx + "system/lineAdd"
439 476  
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @86222fd
1 1 <!DOCTYPE html>
2 2 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
3 3 <head>
4   -<th:block th:include="include :: header('修改【请填写功能名称】')" />
5   -<th:block th:include="include :: datetimepicker-css" />
6   -<th:block th:include="include :: bootstrap-fileinput-css" />
7   -<th:block th:include="include :: bootstrap-select-css" />
  4 + <th:block th:include="include :: header('修改【请填写功能名称】')" />
  5 + <th:block th:include="include :: datetimepicker-css" />
  6 + <th:block th:include="include :: bootstrap-fileinput-css" />
  7 + <th:block th:include="include :: bootstrap-select-css" />
8 8 <th:block th:include="include :: select2-css"/>
  9 + <th:block th:include="include :: jasny-bootstrap-css" />
9 10 </head>
10 11 <body class="white-bg">
11 12 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
... ... @@ -177,31 +178,37 @@
177 178 </div>
178 179 <!---------------------------------->
179 180 <div class="form-group">
180   - <label class="col-sm-1 control-label" name="firstTime">起点站首末班：</label>
  181 + <label class="col-sm-1 control-label">起点站首末班：</label>
181 182 <div class="col-sm-2">
182   - <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
  183 + <input name="firstTime1" th:field="*{firstTime1}" class="form-control" type="text" data-mask="99:99-99:99">
183 184 </div>
184 185 <!---------------------------------->
185   - <label class="col-sm-1 control-label" name="lastTime">终点站首末班：</label>
  186 + <label class="col-sm-1 control-label">起点站首末班(仅在多时段使用)：</label>
186 187 <div class="col-sm-2">
187   - <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
  188 + <input name="firstTime2" th:field="*{firstTime2}" class="form-control" type="text" data-mask="99:99-99:99">
188 189 </div>
189 190 <!---------------------------------->
190   - <label class="col-sm-1 control-label" name="mileageUp">上行里程数：</label>
  191 + <label class="col-sm-1 control-label">终点站首末班：</label>
191 192 <div class="col-sm-2">
192   - <input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
  193 + <input name="lastTime1" th:field="*{lastTime1}" class="form-control" type="text" data-mask="99:99-99:99">
193 194 </div>
194 195 <!---------------------------------->
195   - <label class="col-sm-1 control-label" name="mileageDown">下行里程数：</label>
  196 + <label class="col-sm-1 control-label">终点站首末班(仅在多时段使用)：</label>
196 197 <div class="col-sm-2">
197   - <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
  198 + <input name="lastTime2" th:field="*{lastTime2}" class="form-control" type="text" data-mask="99:99-99:99">
198 199 </div>
199 200 </div>
  201 +
200 202 <!---------------------------------->
201 203 <div class="form-group">
202   - <label class="col-sm-1 control-label" name="lineDistance">线路长度：</label>
  204 + <label class="col-sm-1 control-label" name="mileageUp">上行里程数：</label>
203 205 <div class="col-sm-2">
204   - <input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
  206 + <input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text" data-mask="99.99">
  207 + </div>
  208 + <!---------------------------------->
  209 + <label class="col-sm-1 control-label" name="mileageDown">下行里程数：</label>
  210 + <div class="col-sm-2">
  211 + <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text" data-mask="99.99">
205 212 </div>
206 213 <!---------------------------------->
207 214 <label class="col-sm-1 control-label" name="isWarrant">是否权证：</label>
... ... @@ -212,7 +219,32 @@
212 219 th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
213 220 </select>
214 221 </div>
  222 + </div>
  223 + <!---------------------------------->
  224 + <div class="form-group">
215 225 <!---------------------------------->
  226 + <label class="col-sm-1 control-label">首站枢纽站：</label>
  227 + <div class="col-sm-2">
  228 + <input name="firstHub" th:field="*{firstHub}" class="form-control" type="text">
  229 + </div>
  230 + <!---------------------------------->
  231 + <label class="col-sm-1 control-label">首站枢纽站地址：</label>
  232 + <div class="col-sm-2">
  233 + <input name="firstHubAddress" th:field="*{firstHubAddress}" class="form-control" type="text">
  234 + </div>
  235 + <!---------------------------------->
  236 + <label class="col-sm-1 control-label">末站枢纽站：</label>
  237 + <div class="col-sm-2">
  238 + <input name="lastHub" th:field="*{lastHub}" class="form-control" type="text">
  239 + </div>
  240 + <!---------------------------------->
  241 + <label class="col-sm-1 control-label">末站枢纽站地址：</label>
  242 + <div class="col-sm-2">
  243 + <input name="lastHubAddress" th:field="*{lastHubAddress}" class="form-control" type="text">
  244 + </div>
  245 + </div>
  246 + <!---------------------------------->
  247 + <div class="form-group">
216 248 <label class="col-sm-1 control-label" name="warrantStartTime">授权起始日期：</label>
217 249 <div class="col-sm-2">
218 250 <div class="input-group date">
... ... @@ -230,9 +262,7 @@
230 262 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
231 263 </div>
232 264 </div>
233   - </div>
234   - <!---------------------------------->
235   - <div class="form-group">
  265 + <!---------------------------------->
236 266 <label class="col-sm-1 control-label" name="warrantYear">授权年限：</label>
237 267 <div class="col-sm-2">
238 268 <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
... ... @@ -248,7 +278,9 @@
248 278 class="fa fa-calendar"></i></span>
249 279 </div>
250 280 </div>
251   - <!---------------------------------->
  281 + </div>
  282 + <!---------------------------------->
  283 + <div class="form-group">
252 284 <label class="col-sm-1 control-label" name="warrantVehiclesLarge">经营权证（大）：</label>
253 285 <div class="col-sm-2">
254 286 <input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
... ... @@ -259,10 +291,7 @@
259 291 <input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control"
260 292 type="text">
261 293 </div>
262   -
263   - </div>
264   - <!---------------------------------->
265   - <div class="form-group">
  294 + <!---------------------------------->
266 295 <label class="col-sm-1 control-label" name="isMetro">是否轨交末班车衔接：</label>
267 296 <div class="col-sm-2">
268 297 <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
... ... @@ -279,7 +308,9 @@
279 308 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
280 309 </div>
281 310 </div>
282   - <!---------------------------------->
  311 + </div>
  312 + <!---------------------------------->
  313 + <div class="form-group">
283 314 <label class="col-sm-1 control-label" name="coldBonusType">冷僻线路补贴类型：</label>
284 315 <div class="col-sm-2">
285 316 <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
... ... @@ -297,9 +328,7 @@
297 328 th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
298 329 </select>
299 330 </div>
300   - </div>
301   - <!---------------------------------->
302   - <div class="form-group">
  331 + <!---------------------------------->
303 332 <label class="col-sm-1 control-label" name="planCancelTime">线路暂停日期：</label>
304 333 <div class="col-sm-2">
305 334 <div class="input-group date">
... ... @@ -317,7 +346,9 @@
317 346 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
318 347 </div>
319 348 </div>
320   - <!---------------------------------->
  349 + </div>
  350 + <!---------------------------------->
  351 + <div class="form-group">
321 352 <label class="col-sm-1 control-label" name="lineUpdateType">性质：</label>
322 353 <div class="col-sm-2">
323 354 <select name="lineUpdateType"
... ... @@ -449,6 +480,7 @@
449 480 </div>
450 481 <th:block th:include="include :: footer" />
451 482 <th:block th:include="include :: datetimepicker-js" />
  483 + <th:block th:include="include :: jasny-bootstrap-js" />
452 484 <th:block th:include="include :: bootstrap-fileinput-js" />
453 485 <th:block th:include="include :: bootstrap-select-js" />
454 486 <th:block th:include="include :: select2-js"/>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @86222fd
... ... @@ -238,6 +238,28 @@
238 238 </div>
239 239 <!---------------------------------->
240 240 <div class="form-group">
  241 + <label class="col-sm-1 control-label"name="firstHub">首站枢纽站：</label>
  242 + <div class="col-sm-2">
  243 + <input name="firstHub" th:field="*{firstHub}" class="form-control" type="text">
  244 + </div>
  245 + <!---------------------------------->
  246 + <label class="col-sm-1 control-label"name="firstHubAddress">首站枢纽站地址：</label>
  247 + <div class="col-sm-2">
  248 + <input name="firstHubAddress" th:field="*{firstHubAddress}" class="form-control" type="text">
  249 + </div>
  250 + <!---------------------------------->
  251 + <label class="col-sm-1 control-label"name="lastHub">末站枢纽站：</label>
  252 + <div class="col-sm-2">
  253 + <input name="lastHub" th:field="*{lastHub}" class="form-control" type="text">
  254 + </div>
  255 + <!---------------------------------->
  256 + <label class="col-sm-1 control-label"name="lastHubAddress">末站枢纽站地址：</label>
  257 + <div class="col-sm-2">
  258 + <input name="lastHubAddress" th:field="*{lastHubAddress}" class="form-control" type="text">
  259 + </div>
  260 + </div>
  261 + <!---------------------------------->
  262 + <div class="form-group">
241 263 <label class="col-sm-1 control-label"name="warrantYear">授权年限：</label>
242 264 <div class="col-sm-2">
243 265 <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @86222fd
... ... @@ -6,6 +6,7 @@
6 6 <th:block th:include="include :: bootstrap-fileinput-css"/>
7 7 <th:block th:include="include :: bootstrap-select-css"/>
8 8 <th:block th:include="include :: select2-css"/>
  9 + <th:block th:include="include :: jasny-bootstrap-css" />
9 10 </head>
10 11 <body class="white-bg">
11 12 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
... ... @@ -176,32 +177,39 @@
176 177 </div>
177 178 </div>
178 179 <!---------------------------------->
  180 + <!---------------------------------->
179 181 <div class="form-group">
180   - <label class="col-sm-1 control-label" name="firstTime">起点站首末班：</label>
  182 + <label class="col-sm-1 control-label" name="firstTime1">起点站首末班：</label>
181 183 <div class="col-sm-2">
182   - <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
  184 + <input name="firstTime1" th:field="*{firstTime1}" class="form-control" type="text" data-mask="99:99-99:99">
183 185 </div>
184 186 <!---------------------------------->
185   - <label class="col-sm-1 control-label" name="lastTime">终点站首末班：</label>
  187 + <label class="col-sm-1 control-label" name="firstTime2">起点站首末班(仅在多时段使用)：</label>
186 188 <div class="col-sm-2">
187   - <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
  189 + <input name="firstTime2" th:field="*{firstTime2}" class="form-control" type="text" data-mask="99:99-99:99">
188 190 </div>
189 191 <!---------------------------------->
190   - <label class="col-sm-1 control-label" name="mileageUp">上行里程数：</label>
  192 + <label class="col-sm-1 control-label" name="lastTime1">终点站首末班：</label>
191 193 <div class="col-sm-2">
192   - <input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
  194 + <input name="lastTime1" th:field="*{lastTime1}" class="form-control" type="text" data-mask="99:99-99:99">
193 195 </div>
194 196 <!---------------------------------->
195   - <label class="col-sm-1 control-label" name="mileageDown">下行里程数：</label>
  197 + <label class="col-sm-1 control-label" name="lastTime2">终点站首末班(仅在多时段使用)：</label>
196 198 <div class="col-sm-2">
197   - <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
  199 + <input name="lastTime2" th:field="*{lastTime2}" class="form-control" type="text" data-mask="99:99-99:99">
198 200 </div>
199 201 </div>
  202 +
200 203 <!---------------------------------->
201 204 <div class="form-group">
202   - <label class="col-sm-1 control-label" name="lineDistance">线路长度：</label>
  205 + <label class="col-sm-1 control-label" name="mileageUp">上行里程数：</label>
203 206 <div class="col-sm-2">
204   - <input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
  207 + <input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text" data-mask="99.99">
  208 + </div>
  209 + <!---------------------------------->
  210 + <label class="col-sm-1 control-label" name="mileageDown">下行里程数：</label>
  211 + <div class="col-sm-2">
  212 + <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text" data-mask="99.99">
205 213 </div>
206 214 <!---------------------------------->
207 215 <label class="col-sm-1 control-label" name="isWarrant">是否权证：</label>
... ... @@ -212,7 +220,32 @@
212 220 th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
213 221 </select>
214 222 </div>
  223 + </div>
  224 + <!---------------------------------->
  225 + <div class="form-group">
  226 + <!---------------------------------->
  227 + <label class="col-sm-1 control-label" name="firstHub">首站枢纽站：</label>
  228 + <div class="col-sm-2">
  229 + <input name="firstHub" th:field="*{firstHub}" class="form-control" type="text">
  230 + </div>
215 231 <!---------------------------------->
  232 + <label class="col-sm-1 control-label" name="firstHubAddress">首站枢纽站地址：</label>
  233 + <div class="col-sm-2">
  234 + <input name="firstHubAddress" th:field="*{firstHubAddress}" class="form-control" type="text">
  235 + </div>
  236 + <!---------------------------------->
  237 + <label class="col-sm-1 control-label" name="lastHub">末站枢纽站：</label>
  238 + <div class="col-sm-2">
  239 + <input name="lastHub" th:field="*{lastHub}" class="form-control" type="text">
  240 + </div>
  241 + <!---------------------------------->
  242 + <label class="col-sm-1 control-label" name="lastHubAddress">末站枢纽站地址：</label>
  243 + <div class="col-sm-2">
  244 + <input name="lastHubAddress" th:field="*{lastHubAddress}" class="form-control" type="text">
  245 + </div>
  246 + </div>
  247 + <!---------------------------------->
  248 + <div class="form-group">
216 249 <label class="col-sm-1 control-label" name="warrantStartTime">授权起始日期：</label>
217 250 <div class="col-sm-2">
218 251 <div class="input-group date">
... ... @@ -230,9 +263,7 @@
230 263 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
231 264 </div>
232 265 </div>
233   - </div>
234   - <!---------------------------------->
235   - <div class="form-group">
  266 + <!---------------------------------->
236 267 <label class="col-sm-1 control-label" name="warrantYear">授权年限：</label>
237 268 <div class="col-sm-2">
238 269 <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
... ... @@ -248,7 +279,9 @@
248 279 class="fa fa-calendar"></i></span>
249 280 </div>
250 281 </div>
251   - <!---------------------------------->
  282 + </div>
  283 + <!---------------------------------->
  284 + <div class="form-group">
252 285 <label class="col-sm-1 control-label" name="warrantVehiclesLarge">经营权证（大）：</label>
253 286 <div class="col-sm-2">
254 287 <input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
... ... @@ -259,10 +292,7 @@
259 292 <input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control"
260 293 type="text">
261 294 </div>
262   -
263   - </div>
264   - <!---------------------------------->
265   - <div class="form-group">
  295 + <!---------------------------------->
266 296 <label class="col-sm-1 control-label" name="isMetro">是否轨交末班车衔接：</label>
267 297 <div class="col-sm-2">
268 298 <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
... ... @@ -279,7 +309,9 @@
279 309 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
280 310 </div>
281 311 </div>
282   - <!---------------------------------->
  312 + </div>
  313 + <!---------------------------------->
  314 + <div class="form-group">
283 315 <label class="col-sm-1 control-label" name="coldBonusType">冷僻线路补贴类型：</label>
284 316 <div class="col-sm-2">
285 317 <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
... ... @@ -297,9 +329,7 @@
297 329 th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
298 330 </select>
299 331 </div>
300   - </div>
301   - <!---------------------------------->
302   - <div class="form-group">
  332 + <!---------------------------------->
303 333 <label class="col-sm-1 control-label" name="planCancelTime">线路暂停日期：</label>
304 334 <div class="col-sm-2">
305 335 <div class="input-group date">
... ... @@ -317,7 +347,9 @@
317 347 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
318 348 </div>
319 349 </div>
320   - <!---------------------------------->
  350 + </div>
  351 + <!---------------------------------->
  352 + <div class="form-group">
321 353 <label class="col-sm-1 control-label" name="lineUpdateType">性质：</label>
322 354 <div class="col-sm-2">
323 355 <select name="lineUpdateType"
... ... @@ -449,6 +481,7 @@
449 481 </div>
450 482 <th:block th:include="include :: footer"/>
451 483 <th:block th:include="include :: datetimepicker-js"/>
  484 +<th:block th:include="include :: jasny-bootstrap-js" />
452 485 <th:block th:include="include :: bootstrap-fileinput-js"/>
453 486 <th:block th:include="include :: bootstrap-select-js"/>
454 487 <th:block th:include="include :: select2-js"/>
... ... @@ -578,7 +611,6 @@
578 611 },
579 612 function (data) {
580 613 var bsthTLineOld = data[0];
581   - console.log(bsthTLineOld)
582 614  
583 615 var bsthTLineNew = data[1];
584 616 if (bsthTLineNew != null) {
... ... @@ -588,8 +620,6 @@
588 620 if (o != n) {
589 621 i = i == 'fcompany' ? 'fCompany' : i;
590 622 i = i == 'plineId' ? 'pLineId' : i;
591   - console.log(o);
592   - console.log(n);
593 623 var input = document.getElementsByName(i)[0];
594 624 if (input != undefined) {
595 625 input.style.color = 'red'
... ...