线路档案整改内容

yiming
1 parent 8d1bc40a
Showing 9 changed files with 430 additions and 85 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/static/ruoyi/js/ry-ui.js
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
bsthLineProfiles/src/main/resources/templates/system/line/line.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
 package com.ruoyi.project.system.line.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
@@ -288,6 +289,22 @@ public class BsthTLine extends BaseEntity
     private Long deptId;
+    private String firstTime1;
+
+    private String firstTime2;
+
+    private String lastTime1;
+
+    private String lastTime2;
+
+    private String firstHub;
+
+    private String firstHubAddress;
+
+    private String lastHub;
+
+    private String lastHubAddress;
+
     public Long getId() {
         return id;
     }
@@ -425,6 +442,17 @@ public class BsthTLine extends BaseEntity
     }
     public String getLineDistance() {
+        int i=0;
+        double k=0;
+        if(!StringUtils.isEmpty(mileageUp)&&Double.parseDouble(mileageUp)>0){
+            i++;
+            k+=Double.parseDouble(mileageUp);
+        }
+        if(!StringUtils.isEmpty(mileageDown)&&Double.parseDouble(mileageDown)>0){
+            i++;
+            k+=Double.parseDouble(mileageDown);
+        }
+        lineDistance=i>0?String.valueOf(k/i):null;
         return lineDistance;
     }
@@ -556,30 +584,56 @@ public class BsthTLine extends BaseEntity
         this.firstStation = firstStation;
     }
+    public String getLastStation() {
+        return lastStation;
+    }
+
     public String getFirstTime() {
+        if(!StringUtils.isEmpty(firstTime1)){
+            firstTime=firstTime1;
+        }
+        if(!StringUtils.isEmpty(firstTime)&&!StringUtils.isEmpty(firstTime2)){
+            firstTime+=","+firstTime2;
+        }
         return firstTime;
     }
     public void setFirstTime(String firstTime) {
         this.firstTime = firstTime;
-    }
-
-    public String getLastStation() {
-        return lastStation;
-    }
-
-    public void setLastStation(String lastStation) {
-        this.lastStation = lastStation;
+        if(firstTime!=null){
+           String[] arr=firstTime.split(",");
+           if(arr.length>=1){
+               firstTime1=arr[0];
+           }if(arr.length==2){
+                firstTime2=arr[1];
+            }
+        }
     }
     public String getLastTime() {
+        if(!StringUtils.isEmpty(lastTime1)){
+            lastTime=lastTime1;
+        }
+        if(!StringUtils.isEmpty(lastTime)&&!StringUtils.isEmpty(lastTime2)){
+            lastTime+=","+lastTime2;
+        }
         return lastTime;
     }
     public void setLastTime(String lastTime) {
         this.lastTime = lastTime;
+        if(lastTime!=null){
+            String[] arr=lastTime.split(",");
+            if(arr.length>=1){
+                lastTime1=arr[0];
+            }if(arr.length==2){
+                lastTime2=arr[1];
+            }
+        }
     }
+
+
     public String getMileageUp() {
         return mileageUp;
     }
@@ -867,4 +921,72 @@ public class BsthTLine extends BaseEntity
     public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
+
+    public String getFirstTime1() {
+        return firstTime1;
+    }
+
+    public void setFirstTime1(String firstTime1) {
+        this.firstTime1 = firstTime1;
+    }
+
+    public String getFirstTime2() {
+        return firstTime2;
+    }
+
+    public void setFirstTime2(String firstTime2) {
+        this.firstTime2 = firstTime2;
+    }
+
+    public String getLastTime1() {
+        return lastTime1;
+    }
+
+    public void setLastTime1(String lastTime1) {
+        this.lastTime1 = lastTime1;
+    }
+
+    public String getLastTime2() {
+        return lastTime2;
+    }
+
+    public void setLastTime2(String lastTime2) {
+        this.lastTime2 = lastTime2;
+    }
+
+    public void setLastStation(String lastStation) {
+        this.lastStation = lastStation;
+    }
+
+    public String getFirstHub() {
+        return firstHub;
+    }
+
+    public void setFirstHub(String firstHub) {
+        this.firstHub = firstHub;
+    }
+
+    public String getFirstHubAddress() {
+        return firstHubAddress;
+    }
+
+    public void setFirstHubAddress(String firstHubAddress) {
+        this.firstHubAddress = firstHubAddress;
+    }
+
+    public String getLastHub() {
+        return lastHub;
+    }
+
+    public void setLastHub(String lastHub) {
+        this.lastHub = lastHub;
+    }
+
+    public String getLastHubAddress() {
+        return lastHubAddress;
+    }
+
+    public void setLastHubAddress(String lastHubAddress) {
+        this.lastHubAddress = lastHubAddress;
+    }
 }
@@ -75,6 +75,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		<result property="lineUpdateType" column="line_update_type" />
 		<result property="examineStatus" column="examine_status" />
 		<result property="examineType" column="examine_type" />
+		<result property="firstHub" column="firstHub" />
+		<result property="firstHubAddress" column="firstHubAddress" />
+		<result property="lastHub" column="lastHub" />
+		<result property="lastHubAddress" column="lastHubAddress" />
 	</resultMap>
@@ -254,6 +258,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="lineUpdateType != null">line_update_type,</if>
 			<if test="revenueType != null">revenue_type,</if>
 			<if test="deptId != null">dept_id,</if>
+			<if test="firstHub != null">firstHub,</if>
+			<if test="firstHubAddress != null">firstHubAddress,</if>
+			<if test="lastHub != null">lastHub,</if>
+			<if test="lastHubAddress != null">lastHubAddress,</if>
 			create_time,
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -320,6 +328,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="lineUpdateType != null">#{lineUpdateType},</if>
 			<if test="revenueType != null">#{revenueType},</if>
 			<if test="deptId != null">#{deptId},</if>
+			<if test="firstHub != null">#{firstHub},</if>
+			<if test="firstHubAddress != null">#{firstHubAddress},</if>
+			<if test="lastHub != null">#{lastHub},</if>
+			<if test="lastHubAddress != null">#{lastHubAddress},</if>
 			sysdate(),
 		</trim>
 	</insert>
@@ -393,6 +405,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="revenueType != null">revenue_type = #{revenueType},</if>
 			<if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
 			<if test="deptId != null">dept_id = #{deptId},</if>
+			<if test="firstHub != null">firstHub = #{firstHub},</if>
+			<if test="firstHubAddress != null">firstHubAddress = #{firstHubAddress},</if>
+			<if test="lastHub != null">lastHub = #{lastHub},</if>
+			<if test="lastHubAddress != null">lastHubAddress = #{lastHubAddress},</if>
 		</trim>
 		where id = #{id}
 	</update>
@@ -464,6 +480,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
 			<if test="revenueType != null">revenue_type = #{revenueType},</if>
 			<if test="deptId != null">dept_id = #{deptId},</if>
+			<if test="firstHub != null">firstHub = #{firstHub},</if>
+			<if test="firstHubAddress != null">firstHubAddress = #{firstHubAddress},</if>
+			<if test="lastHub != null">lastHub = #{lastHub},</if>
+			<if test="lastHubAddress != null">lastHubAddress = #{lastHubAddress},</if>
 		</trim>
 		where line_name = #{lineName}
 	</update>
@@ -611,6 +631,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="lineUpdateType != null">line_update_type,</if>
 			<if test="examineStatus != null">examine_status,</if>
 			<if test="deptId != null">dept_id,</if>
+			<if test="firstHub != null">firstHub,</if>
+			<if test="firstHubAddress != null">firstHubAddress,</if>
+			<if test="lastHub != null">lastHub,</if>
+			<if test="lastHubAddress != null">lastHubAddress,</if>
 			create_time,
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -679,6 +703,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="lineUpdateType != null">#{lineUpdateType},</if>
 			<if test="examineStatus != null">#{examineStatus},</if>
 			<if test="deptId != null">#{deptId},</if>
+			<if test="firstHub != null">#{firstHub},</if>
+			<if test="firstHubAddress != null">#{firstHubAddress},</if>
+			<if test="lastHub != null">#{lastHub},</if>
+			<if test="lastHubAddress != null">#{lastHubAddress},</if>
 			sysdate(),
 		</trim>
 	</insert>
@@ -771,6 +799,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="examineType != null">examine_type = #{examineType},</if>
 			<if test="examineStatus != null">examine_status = #{examineStatus},</if>
 			<if test="deptId != null">dept_id=#{deptId},</if>
+			<if test="firstHub != null">firstHub = #{firstHub},</if>
+			<if test="firstHubAddress != null">firstHubAddress = #{firstHubAddress},</if>
+			<if test="lastHub != null">lastHub = #{lastHub},</if>
+			<if test="lastHubAddress != null">lastHubAddress = #{lastHubAddress},</if>
 		</trim>
 		where id = #{id}
 	</update>
@@ -945,6 +977,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="updateStatus != null">update_status,</if>
 			<if test="historyId != null">history_id,</if>
 			<if test="deptId != null">dept_id,</if>
+			<if test="firstHub != null">firstHub,</if>
+			<if test="firstHubAddress != null">firstHubAddress,</if>
+			<if test="lastHub != null">lastHub,</if>
+			<if test="lastHubAddress != null">lastHubAddress,</if>
 			create_time,
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -1013,6 +1049,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="updateStatus != null">#{updateStatus},</if>
 			<if test="historyId != null">#{historyId},</if>
 			<if test="deptId != null">#{deptId},</if>
+			<if test="firstHub != null">#{firstHub},</if>
+			<if test="firstHubAddress != null">#{firstHubAddress},</if>
+			<if test="lastHub != null">#{lastHub},</if>
+			<if test="lastHubAddress != null">#{lastHubAddress},</if>
 			sysdate(),
 		</trim>
 	</insert>
@@ -1086,6 +1126,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="revenueType != null">revenue_type = #{revenueType},</if>
 			<if test="updateStatus != null ">update_status = #{updateStatus},</if>
 			<if test="deptId != null">dept_id=#{deptId},</if>
+			<if test="firstHub != null">firstHub = #{firstHub},</if>
+			<if test="firstHubAddress != null">firstHubAddress = #{firstHubAddress},</if>
+			<if test="lastHub != null">lastHub = #{lastHub},</if>
+			<if test="lastHubAddress != null">lastHubAddress = #{lastHubAddress},</if>
 		</trim>
 		where id = #{id}
 	</update>
@@ -1361,9 +1405,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		       h1.vehicles_number vehiclesNumber,h1.number_vehicles_large numberVehiclesLarge,h1.number_vehicles_middle numberVehiclesMiddle,
 		       h1.car_plate carPlate,h1.number_person numberPerson,h1.number_person_driver numberPersonDriver,h1.number_person_sales numberPersonSales,
 		       h1.bus_ev_number busEvNumber,h1.directions directions,h1.halfway_station halfwayStation,
-		       h1.divide_level divideLevel,
+		       h1.divide_level divideLevel,h1.nightParking nightParking
 		       h1.has_timelists hasTimelists,h1.is_metro isMetro,h1.metro_time metroTime,h1.cold_bonus_type coldBonusType,
 			   h1.line_update_type lineUpdateType,h1.revenue_type revenueType,
+			   h1.firstHub firstHub,h1.firstHubAddress firstHubAddress,h1.lastHub lastHub,h1.lastHubAddress lastHubAddress,
 			   h2.id  idOld,h2.line_name lineNameOld,h2.company companyOld,h2.f_company fCompanyOld,h2.p_line_id pLineIdOld,
 			   h2.service_type serviceTypeOld,h2.line_level lineLevelOld,h2.line_type lineTypeOld,h2.district districtOld,
 			   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;
 			   h2.vehicles_number vehiclesNumberOld,h2.number_vehicles_large numberVehiclesLargeOld,h2.number_vehicles_middle numberVehiclesMiddleOld,
 			   h2.car_plate carPlateOld,h2.number_person numberPersonOld,h2.number_person_driver numberPersonDriverOld,h2.number_person_sales numberPersonSalesOld,
 			   h2.bus_ev_number busEvNumberOld,h2.directions directionsOld,h2.halfway_station halfwayStationOld,
-			   h2.divide_level divideLevelOld,
+			   h2.divide_level divideLevelOld,h2.nightParking nightParkingOld
 			   h2.has_timelists hasTimelistsOld,h2.is_metro isMetroOld,h2.metro_time metroTimeOld,h2.cold_bonus_type coldBonusTypeOld,
-			   h2.line_update_type lineUpdateTypeOld,h2.revenue_type revenueTypeOld
+			   h2.line_update_type lineUpdateTypeOld,h2.revenue_type revenueTypeOld,
+		       h2.firstHub firstHubOld,h2.firstHubAddress firstHubAddressOld,h2.lastHub lastHubOld,h2.lastHubAddress lastHubAddressOld
 		FROM bsth_t_line_history h1 LEFT JOIN bsth_t_line_history h2 on h1.history_id=h2.id
 		<where>
 			<if test="createTimeStr != null  and createTimeStr != ''"> and h1.create_time >= #{createTimeStr}</if>
@@ -842,7 +842,7 @@ var table = {
                 var index = layer.open($.extend({
                     type: 2,
                     maxmin: $.common.isEmpty(options.maxmin) ? true : options.maxmin,
-                    shade: 0.3,
+                    shade: 0.0,
                     title: _title,
                     fix: false,
                     area: [_width + 'px', _height + 'px'],
@@ -240,6 +240,33 @@
                     <label>下行里程数：</label>
                     <input name="mileageDown" th:field="*{mileageDown}" type="text" disabled>
                 </li>
+
+
+                <!---------------------------------->
+                <li id="firstHub">
+                    <label>首站枢纽站：</label>
+                    <input name="firstHub" th:field="*{firstHub}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="firstHubAddress">
+                    <label>首站枢纽站地址：</label>
+                    <input name="firstHubAddress" th:field="*{firstHubAddress}" type="text" disabled>
+                </li>
+
+                <!---------------------------------->
+                <li id="lastHub">
+                    <label>末站枢纽站：</label>
+                    <input name="lastHub" th:field="*{lastHub}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="lastHubAddress">
+                    <label>末站枢纽站地址：</label>
+                    <input name="lastHubAddress" th:field="*{lastHubAddress}" type="text" disabled>
+                </li>
+
+
+
+
                 <!---------------------------------->
                 <li id="stationUp">
                     <label>站级数(上行)：</label>
@@ -142,6 +142,16 @@
 						<!---------------------------------->
 						<li><label>下行里程：</label> <input type="text" name="mileageDown" /></li>
 						<!---------------------------------->
+						<li><label>夜间停车场：</label> <input type="text" name="nightParking" /></li>
+						<!---------------------------------->
+						<li><label>首站枢纽站：</label> <input type="text" name="firstHub" /></li>
+						<!---------------------------------->
+						<li><label>首站枢纽站地址：</label> <input type="text" name="firstHubAddress" /></li>
+						<!---------------------------------->
+						<li><label>末站枢纽站：</label> <input type="text" name="lastHub" /></li>
+						<!---------------------------------->
+						<li><label>末站枢纽站地址：</label> <input type="text" name="lastHubAddress" /></li>
+						<!---------------------------------->
 						<li><label>站级数(上行)：</label> <input type="text" name="stationUp" /></li>
 						<!---------------------------------->
 						<li><label>站级数(下行)：</label> <input type="text" name="stationDown" /></li>
@@ -590,6 +600,18 @@
 				field: 'lastStation',
 				title: '末站'
 			},{
+				field: 'firstHub',
+				title: '首站枢纽站'
+			},{
+				field: 'firstHubAddress',
+				title: '首站枢纽站地址'
+			},{
+				field: 'lastHub',
+				title: '末站枢纽站'
+			},{
+				field: 'lastHubAddress',
+				title: '末站枢纽站地址'
+			},{
 				field: 'firstTime',
 				title: '起点站首末班'
 			},{
@@ -768,6 +790,13 @@
 		minView : "month",
 		autoclose : true
 	});
+	document.onkeydown= function (e) { // 回车提交表单
+		var theEvent = window.event || e;
+		var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+		if (code == 13) {
+			$.table.search();
+		}
+	}
 </script>
 <style>
@@ -6,6 +6,7 @@
     <th:block th:include="include :: bootstrap-fileinput-css"/>
     <th:block th:include="include :: bootstrap-select-css"/>
     <th:block th:include="include :: select2-css"/>
+    <th:block th:include="include :: jasny-bootstrap-css" />
 </head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -176,29 +177,36 @@
             <div class="form-group">
                 <label class="col-sm-1 control-label">起点站首末班：</label>
                 <div class="col-sm-2">
-                    <input name="firstTime" class="form-control" type="text">
+                    <input name="firstTime1"  class="form-control" type="text" data-mask="99:99-99:99">
                 </div>
                 <!---------------------------------->
-                <label class="col-sm-1 control-label">终点站首末班：</label>
+                <label class="col-sm-1 control-label">起点站首末班(仅在多时段使用)：</label>
                 <div class="col-sm-2">
-                    <input name="lastTime" class="form-control" type="text">
+                    <input name="firstTime2"  class="form-control" type="text" data-mask="99:99-99:99">
                 </div>
                 <!---------------------------------->
-                <label class="col-sm-1 control-label">上行里程数：</label>
+                <label class="col-sm-1 control-label">终点站首末班：</label>
                 <div class="col-sm-2">
-                    <input name="mileageUp" class="form-control" type="text">
+                    <input name="lastTime1"   class="form-control" type="text" data-mask="99:99-99:99">
                 </div>
                 <!---------------------------------->
-                <label class="col-sm-1 control-label">下行里程数：</label>
+                <label class="col-sm-1 control-label">终点站首末班(仅在多时段使用)：</label>
                 <div class="col-sm-2">
-                    <input name="mileageDown" class="form-control" type="text">
+                    <input name="lastTime2"   class="form-control" type="text" data-mask="99:99-99:99">
                 </div>
             </div>
+
             <!---------------------------------->
             <div class="form-group">
-                <label class="col-sm-1 control-label">线路长度：</label>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">上行里程数：</label>
                 <div class="col-sm-2">
-                    <input name="lineDistance" class="form-control" type="text">
+                    <input name="mileageUp" class="form-control" type="text" data-mask="99.99">
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">下行里程数：</label>
+                <div class="col-sm-2">
+                    <input name="mileageDown" class="form-control" type="text" data-mask="99.99">
                 </div>
                 <!---------------------------------->
                 <label class="col-sm-1 control-label">是否权证：</label>
@@ -210,7 +218,32 @@
                         </option>
                     </select>
                 </div>
+            </div>
+            <!---------------------------------->
+            <div class="form-group">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">首站枢纽站：</label>
+                <div class="col-sm-2">
+                    <input name="firstHub" class="form-control" type="text">
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">首站枢纽站地址：</label>
+                <div class="col-sm-2">
+                    <input name="firstHubAddress" class="form-control" type="text">
+                </div>
                 <!---------------------------------->
+                <label class="col-sm-1 control-label">末站枢纽站：</label>
+                <div class="col-sm-2">
+                    <input name="lastHub" class="form-control" type="text">
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">末站枢纽站地址：</label>
+                <div class="col-sm-2">
+                    <input name="lastHubAddress" class="form-control" type="text">
+                </div>
+            </div>
+            <!---------------------------------->
+            <div class="form-group">
                 <label class="col-sm-1 control-label">授权起始日期：</label>
                 <div class="col-sm-2">
                     <div class="input-group date">
@@ -228,9 +261,7 @@
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
-            </div>
-            <!---------------------------------->
-            <div class="form-group">
+                <!---------------------------------->
                 <label class="col-sm-1 control-label">授权年限：</label>
                 <div class="col-sm-2">
                     <input name="warrantYear" class="form-control" type="text">
@@ -244,7 +275,9 @@
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
-                <!---------------------------------->
+            </div>
+            <!---------------------------------->
+            <div class="form-group">
                 <label class="col-sm-1 control-label">经营权证（大）：</label>
                 <div class="col-sm-2">
                     <input name="warrantVehiclesLarge" class="form-control" type="text">
@@ -254,9 +287,7 @@
                 <div class="col-sm-2">
                     <input name="warrantVehiclesMiddle" class="form-control" type="text">
                 </div>
-            </div>
-            <!---------------------------------->
-            <div class="form-group">
+                <!---------------------------------->
                 <label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
                 <div class="col-sm-2">
                     <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
@@ -273,6 +304,8 @@
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
+            </div>
+            <div class="form-group">
                 <!---------------------------------->
                 <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
                 <div class="col-sm-2">
@@ -293,9 +326,7 @@
                         </option>
                     </select>
                 </div>
-            </div>
-            <!---------------------------------->
-            <div class="form-group">
+                <!---------------------------------->
                 <label class="col-sm-1 control-label">线路暂停日期：</label>
                 <div class="col-sm-2">
                     <div class="input-group date">
@@ -313,6 +344,9 @@
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
+            </div>
+            <!---------------------------------->
+            <div class="form-group">
                 <!---------------------------------->
                 <label class="col-sm-1 control-label">性质：</label>
                 <div class="col-sm-2">
@@ -431,9 +465,12 @@
 </div>
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: datetimepicker-js"/>
-<th:block th:include="include :: bootstrap-fileinput-js"/>
+<th:block th:include="include :: jasny-bootstrap-js" />
+<th:block th:include="include :: bootstrap-fileinput-js" />
 <th:block th:include="include :: bootstrap-select-js"/>
 <th:block th:include="include :: select2-js"/>
+
+
 <script th:inline="javascript">
     var prefix = ctx + "system/lineAdd"
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-<th:block th:include="include :: header('修改【请填写功能名称】')" />
-<th:block th:include="include :: datetimepicker-css" />
-<th:block th:include="include :: bootstrap-fileinput-css" />
-<th:block th:include="include :: bootstrap-select-css" />
+	<th:block th:include="include :: header('修改【请填写功能名称】')" />
+	<th:block th:include="include :: datetimepicker-css" />
+	<th:block th:include="include :: bootstrap-fileinput-css" />
+	<th:block th:include="include :: bootstrap-select-css" />
 	<th:block th:include="include :: select2-css"/>
+	<th:block th:include="include :: jasny-bootstrap-css" />
 </head>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -177,31 +178,37 @@
 			</div>
 			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label" name="firstTime">起点站首末班：</label>
+				<label class="col-sm-1 control-label">起点站首末班：</label>
 				<div class="col-sm-2">
-					<input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
+					<input name="firstTime1" th:field="*{firstTime1}"  class="form-control" type="text" data-mask="99:99-99:99">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label" name="lastTime">终点站首末班：</label>
+				<label class="col-sm-1 control-label">起点站首末班(仅在多时段使用)：</label>
 				<div class="col-sm-2">
-					<input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
+					<input name="firstTime2" th:field="*{firstTime2}" class="form-control" type="text" data-mask="99:99-99:99">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label" name="mileageUp">上行里程数：</label>
+				<label class="col-sm-1 control-label">终点站首末班：</label>
 				<div class="col-sm-2">
-					<input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
+					<input name="lastTime1" th:field="*{lastTime1}"  class="form-control" type="text" data-mask="99:99-99:99">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label" name="mileageDown">下行里程数：</label>
+				<label class="col-sm-1 control-label">终点站首末班(仅在多时段使用)：</label>
 				<div class="col-sm-2">
-					<input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
+					<input name="lastTime2" th:field="*{lastTime2}"  class="form-control" type="text" data-mask="99:99-99:99">
 				</div>
 			</div>
+
 			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label" name="lineDistance">线路长度：</label>
+				<label class="col-sm-1 control-label" name="mileageUp">上行里程数：</label>
 				<div class="col-sm-2">
-					<input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
+					<input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text" data-mask="99.99">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label" name="mileageDown">下行里程数：</label>
+				<div class="col-sm-2">
+					<input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text" data-mask="99.99">
 				</div>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label" name="isWarrant">是否权证：</label>
@@ -212,7 +219,32 @@
 								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
 				<!---------------------------------->
+				<label class="col-sm-1 control-label">首站枢纽站：</label>
+				<div class="col-sm-2">
+					<input name="firstHub" th:field="*{firstHub}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">首站枢纽站地址：</label>
+				<div class="col-sm-2">
+					<input name="firstHubAddress" th:field="*{firstHubAddress}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">末站枢纽站：</label>
+				<div class="col-sm-2">
+					<input name="lastHub" th:field="*{lastHub}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">末站枢纽站地址：</label>
+				<div class="col-sm-2">
+					<input name="lastHubAddress" th:field="*{lastHubAddress}" class="form-control" type="text">
+				</div>
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
 				<label class="col-sm-1 control-label" name="warrantStartTime">授权起始日期：</label>
 				<div class="col-sm-2">
 					<div class="input-group date">
@@ -230,9 +262,7 @@
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<!---------------------------------->
-			<div class="form-group">
+				<!---------------------------------->
 				<label class="col-sm-1 control-label" name="warrantYear">授权年限：</label>
 				<div class="col-sm-2">
 					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
@@ -248,7 +278,9 @@
 							class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-				<!---------------------------------->
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
 				<label class="col-sm-1 control-label" name="warrantVehiclesLarge">经营权证（大）：</label>
 				<div class="col-sm-2">
 					<input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
@@ -259,10 +291,7 @@
 					<input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control"
 						   type="text">
 				</div>
-
-			</div>
-			<!---------------------------------->
-			<div class="form-group">
+				<!---------------------------------->
 				<label class="col-sm-1 control-label" name="isMetro">是否轨交末班车衔接：</label>
 				<div class="col-sm-2">
 					<select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
@@ -279,7 +308,9 @@
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-				<!---------------------------------->
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
 				<label class="col-sm-1 control-label" name="coldBonusType">冷僻线路补贴类型：</label>
 				<div class="col-sm-2">
 					<select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
@@ -297,9 +328,7 @@
 								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<!---------------------------------->
-			<div class="form-group">
+				<!---------------------------------->
 				<label class="col-sm-1 control-label" name="planCancelTime">线路暂停日期：</label>
 				<div class="col-sm-2">
 					<div class="input-group date">
@@ -317,7 +346,9 @@
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-				<!---------------------------------->
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
 				<label class="col-sm-1 control-label" name="lineUpdateType">性质：</label>
 				<div class="col-sm-2">
 					<select name="lineUpdateType"
@@ -449,6 +480,7 @@
 	</div>
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: datetimepicker-js" />
+	<th:block th:include="include :: jasny-bootstrap-js" />
 	<th:block th:include="include :: bootstrap-fileinput-js" />
 	<th:block th:include="include :: bootstrap-select-js" />
 	<th:block th:include="include :: select2-js"/>
@@ -238,6 +238,28 @@
 			</div>
 			<!---------------------------------->
 			<div class="form-group">
+				<label class="col-sm-1 control-label"name="firstHub">首站枢纽站：</label>
+				<div class="col-sm-2">
+					<input name="firstHub" th:field="*{firstHub}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label"name="firstHubAddress">首站枢纽站地址：</label>
+				<div class="col-sm-2">
+					<input name="firstHubAddress" th:field="*{firstHubAddress}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label"name="lastHub">末站枢纽站：</label>
+				<div class="col-sm-2">
+					<input name="lastHub" th:field="*{lastHub}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label"name="lastHubAddress">末站枢纽站地址：</label>
+				<div class="col-sm-2">
+					<input name="lastHubAddress" th:field="*{lastHubAddress}" class="form-control" type="text">
+				</div>
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
 				<label class="col-sm-1 control-label"name="warrantYear">授权年限：</label>
 				<div class="col-sm-2">
 					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
@@ -6,6 +6,7 @@
     <th:block th:include="include :: bootstrap-fileinput-css"/>
     <th:block th:include="include :: bootstrap-select-css"/>
     <th:block th:include="include :: select2-css"/>
+    <th:block th:include="include :: jasny-bootstrap-css" />
 </head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -176,32 +177,39 @@
             </div>
         </div>
         <!---------------------------------->
+        <!---------------------------------->
         <div class="form-group">
-            <label class="col-sm-1 control-label" name="firstTime">起点站首末班：</label>
+            <label class="col-sm-1 control-label" name="firstTime1">起点站首末班：</label>
             <div class="col-sm-2">
-                <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
+                <input name="firstTime1" th:field="*{firstTime1}"  class="form-control" type="text" data-mask="99:99-99:99">
             </div>
             <!---------------------------------->
-            <label class="col-sm-1 control-label" name="lastTime">终点站首末班：</label>
+            <label class="col-sm-1 control-label" name="firstTime2">起点站首末班(仅在多时段使用)：</label>
             <div class="col-sm-2">
-                <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
+                <input name="firstTime2" th:field="*{firstTime2}" class="form-control" type="text" data-mask="99:99-99:99">
             </div>
             <!---------------------------------->
-            <label class="col-sm-1 control-label" name="mileageUp">上行里程数：</label>
+            <label class="col-sm-1 control-label" name="lastTime1">终点站首末班：</label>
             <div class="col-sm-2">
-                <input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
+                <input name="lastTime1" th:field="*{lastTime1}"  class="form-control" type="text" data-mask="99:99-99:99">
             </div>
             <!---------------------------------->
-            <label class="col-sm-1 control-label" name="mileageDown">下行里程数：</label>
+            <label class="col-sm-1 control-label" name="lastTime2">终点站首末班(仅在多时段使用)：</label>
             <div class="col-sm-2">
-                <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
+                <input name="lastTime2" th:field="*{lastTime2}"  class="form-control" type="text" data-mask="99:99-99:99">
             </div>
         </div>
+
         <!---------------------------------->
         <div class="form-group">
-            <label class="col-sm-1 control-label" name="lineDistance">线路长度：</label>
+            <label class="col-sm-1 control-label" name="mileageUp">上行里程数：</label>
             <div class="col-sm-2">
-                <input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
+                <input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text" data-mask="99.99">
+            </div>
+            <!---------------------------------->
+            <label class="col-sm-1 control-label" name="mileageDown">下行里程数：</label>
+            <div class="col-sm-2">
+                <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text" data-mask="99.99">
             </div>
             <!---------------------------------->
             <label class="col-sm-1 control-label" name="isWarrant">是否权证：</label>
@@ -212,7 +220,32 @@
                             th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
                 </select>
             </div>
+        </div>
+        <!---------------------------------->
+        <div class="form-group">
+            <!---------------------------------->
+            <label class="col-sm-1 control-label" name="firstHub">首站枢纽站：</label>
+            <div class="col-sm-2">
+                <input name="firstHub" th:field="*{firstHub}" class="form-control" type="text">
+            </div>
             <!---------------------------------->
+            <label class="col-sm-1 control-label" name="firstHubAddress">首站枢纽站地址：</label>
+            <div class="col-sm-2">
+                <input name="firstHubAddress" th:field="*{firstHubAddress}" class="form-control" type="text">
+            </div>
+            <!---------------------------------->
+            <label class="col-sm-1 control-label" name="lastHub">末站枢纽站：</label>
+            <div class="col-sm-2">
+                <input  name="lastHub" th:field="*{lastHub}" class="form-control" type="text">
+            </div>
+            <!---------------------------------->
+            <label class="col-sm-1 control-label" name="lastHubAddress">末站枢纽站地址：</label>
+            <div class="col-sm-2">
+                <input name="lastHubAddress" th:field="*{lastHubAddress}" class="form-control" type="text">
+            </div>
+        </div>
+        <!---------------------------------->
+        <div class="form-group">
             <label class="col-sm-1 control-label" name="warrantStartTime">授权起始日期：</label>
             <div class="col-sm-2">
                 <div class="input-group date">
@@ -230,9 +263,7 @@
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
-        </div>
-        <!---------------------------------->
-        <div class="form-group">
+            <!---------------------------------->
             <label class="col-sm-1 control-label" name="warrantYear">授权年限：</label>
             <div class="col-sm-2">
                 <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
@@ -248,7 +279,9 @@
                         class="fa fa-calendar"></i></span>
                 </div>
             </div>
-            <!---------------------------------->
+        </div>
+        <!---------------------------------->
+        <div class="form-group">
             <label class="col-sm-1 control-label" name="warrantVehiclesLarge">经营权证（大）：</label>
             <div class="col-sm-2">
                 <input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
@@ -259,10 +292,7 @@
                 <input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control"
                        type="text">
             </div>
-
-        </div>
-        <!---------------------------------->
-        <div class="form-group">
+            <!---------------------------------->
             <label class="col-sm-1 control-label" name="isMetro">是否轨交末班车衔接：</label>
             <div class="col-sm-2">
                 <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
@@ -279,7 +309,9 @@
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
-            <!---------------------------------->
+        </div>
+        <!---------------------------------->
+        <div class="form-group">
             <label class="col-sm-1 control-label" name="coldBonusType">冷僻线路补贴类型：</label>
             <div class="col-sm-2">
                 <select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
@@ -297,9 +329,7 @@
                             th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
                 </select>
             </div>
-        </div>
-        <!---------------------------------->
-        <div class="form-group">
+            <!---------------------------------->
             <label class="col-sm-1 control-label" name="planCancelTime">线路暂停日期：</label>
             <div class="col-sm-2">
                 <div class="input-group date">
@@ -317,7 +347,9 @@
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
-            <!---------------------------------->
+        </div>
+        <!---------------------------------->
+        <div class="form-group">
             <label class="col-sm-1 control-label" name="lineUpdateType">性质：</label>
             <div class="col-sm-2">
                 <select name="lineUpdateType"
@@ -449,6 +481,7 @@
 </div>
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: datetimepicker-js"/>
+<th:block th:include="include :: jasny-bootstrap-js" />
 <th:block th:include="include :: bootstrap-fileinput-js"/>
 <th:block th:include="include :: bootstrap-select-js"/>
 <th:block th:include="include :: select2-js"/>
@@ -578,7 +611,6 @@
             },
             function (data) {
                 var bsthTLineOld = data[0];
-                console.log(bsthTLineOld)
                 var bsthTLineNew = data[1];
                 if (bsthTLineNew != null) {
@@ -588,8 +620,6 @@
                         if (o != n) {
                             i = i == 'fcompany' ? 'fCompany' : i;
                             i = i == 'plineId' ? 'pLineId' : i;
-                            console.log(o);
-                            console.log(n);
                             var input = document.getElementsByName(i)[0];
                             if (input != undefined) {
                                 input.style.color = 'red'