bf

yiming
1 parent dcc48b86
Showing 14 changed files with 513 additions and 253 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/monitor/job/task/RyTask.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/resources/application-druid.yml
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/system/line/detail.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
@@ -109,8 +109,8 @@ public class RyTask {
 	}
-	/*public void createLineMonthReport() {
-		System.out.println("生成月报表");
-		lineService.createLineMonthReport();
-	}*/
+	public void getCarPlate() {
+		System.out.println("获取车辆自编号");
+		lineService.getCarPlate();
+	}
 }
@@ -109,4 +109,10 @@ public class DictDataServiceImpl implements IDictDataService
         }
         return row;
     }
+
+    @Override
+    public void insert(DictData dictData)
+    {
+       dictDataMapper.insertDictData(dictData);
+    }
 }
@@ -58,4 +58,6 @@ public interface IDictDataService
      * @return 结果
      */
     public int updateDictData(DictData dictData);
+
+    void insert(DictData dictData);
 }
@@ -118,6 +118,7 @@ public class BsthTLineAddController extends BaseController
         bl=bsthTLineService.selectBsthTLineExamineByLineName(bl);
         if(bl==null){
             bsthTLine.setLineUpdateType("0");
+            bsthTLine.setExamineType("0");
             return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
         }else {
             bsthTLine.setId(bl.getId());
@@ -133,6 +134,8 @@ public class BsthTLineAddController extends BaseController
     public String edit(@PathVariable("id") Long id, ModelMap mmap)
     {
         BsthTLine bsthTLine = bsthTLineService.selectBsthTLineExamineById(id);
+        List<Map> companyList=bsthTLineService.selectCompany();
+        mmap.put("companyList",companyList);
         mmap.put("bsthTLine", bsthTLine);
         return prefix + "/edit";
     }
@@ -251,8 +251,8 @@ public class BsthTLineController extends BaseController
         BsthTLine bsthTLine = new BsthTLine();
         bsthTLine.setLineName(name);
-        BsthTLine bsthTLineOld=bsthTLineService.selectBsthTLineList(bsthTLine).get(0);
         BsthTLine bsthTLineNew=bsthTLineService.selectBsthTLineExamineByLineName(bsthTLine);
+        BsthTLine bsthTLineOld=bsthTLineService.selectBsthTLineList(bsthTLine).size()>0?bsthTLineService.selectBsthTLineList(bsthTLine).get(0):bsthTLineNew;
         List<BsthTLine> bsthTLines=new ArrayList<>();
         bsthTLines.add(bsthTLineOld);
         bsthTLines.add(bsthTLineNew);
@@ -311,4 +311,5 @@ public class BsthTLineController extends BaseController
         return bsthTLineKFKS;
     }
+
 }
@@ -72,4 +72,6 @@ public interface IBsthTLineService
 	void sendKFK(BsthTLineKFK bsthTLine);
 	List<BsthTLineKFK> changeCN(List<BsthTLineKFK> list);
+
+	void getCarPlate();
 }
 package com.ruoyi.project.system.line.service.impl;
 import java.lang.reflect.Field;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
+import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.utils.security.ShiroUtils;
 import com.ruoyi.project.system.dict.domain.DictData;
 import com.ruoyi.project.system.dict.service.IDictDataService;
 import com.ruoyi.project.system.line.domain.BsthTLineKFK;
 import com.ruoyi.project.system.line.domain.LineHistoryReport;
+import com.ruoyi.project.system.user.domain.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -385,4 +391,85 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 		}
 		return list;
 	}
+
+	@Override
+	public void getCarPlate(){
+		//查询车辆类型
+		DictData dictData=new DictData();
+		dictData.setDictType("busType");
+		List<DictData> dicts = dictDataService.selectDictDataList(dictData);
+		Long dictSort = 0L;
+		int dictValue=0;
+		List<String> list=new ArrayList<>();//车辆类型
+		for (DictData dict : dicts) {
+			list.add(dict.getDictLabel());
+			if(dict.getDictSort()>dictSort){
+				dictSort=dict.getDictSort();
+			}
+			if(Integer.parseInt(dict.getDictValue())>dictValue){
+				dictValue=Integer.parseInt(dict.getDictValue());
+			}
+		}
+		//调接口获取车辆自编号和对于车辆类型
+		String s= HttpUtil.get("http://180.166.5.82:8076/cars/getAllMeasuredBusData?password=13q64164a86001t7");
+		JSONArray jsonArray= JSONObject.parseArray(s);
+		Map<String,String> map=new HashMap();
+		Set<String> set=new HashSet();
+		Set<String> set2=new HashSet();
+		for (Object o : jsonArray) {
+			JSONObject jsonObject=JSONObject.parseObject(o.toString());
+			String sample_code=jsonObject.get("sample_code").toString();
+			String car_energy_type=jsonObject.get("car_energy_type").toString();
+			map.put(sample_code,car_energy_type);
+			set.add(car_energy_type);
+			set2.add(sample_code);
+		}
+
+		//不存在该类型加一条
+		for (String s1 : set) {
+			if(!list.contains(s1)){
+				DictData dd=dicts.get(0);
+				dd.setDictLabel(s1);
+				dictSort++;
+				dictValue++;
+				dd.setDictSort(dictSort);
+				dd.setDictValue(String.valueOf(dictValue));
+				dictDataService.insert(dd);
+			}
+		}
+
+
+		dicts = dictDataService.selectDictDataList(dictData);
+		Map<String,String> m=new HashMap();
+		for (DictData dict : dicts) {
+			m.put(dict.getDictLabel(),dict.getDictValue());
+		}
+
+		//查询车辆自编号
+		dictData=new DictData();
+		dictData.setDictType("carPlate");
+		dicts = dictDataService.selectDictDataList(dictData);
+		dictSort = 0L;
+		list=new ArrayList<>();//车辆自编号
+		for (DictData dict : dicts) {
+			list.add(dict.getDictLabel());
+			if(dict.getDictSort()>dictSort){
+				dictSort=dict.getDictSort();
+			}
+		}
+
+		//不存在该类型加一条
+		for (String s1 : set2) {
+			if(!list.contains(s1)){
+				DictData dd=dicts.get(0);
+				dd.setDictLabel(s1);
+				dictSort++;
+				dd.setDictSort(dictSort);
+				String car_energy_type=map.get(s1);
+				dd.setDictValue(m.get(car_energy_type));
+				dictDataService.insert(dd);
+			}
+		}
+	}
+
 }
@@ -9,7 +9,7 @@ spring:
                 url: jdbc:mysql://192.168.101.111:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: xldasys
                 password: bsth@pj2021
-            # 主库数据源
+#            # 主库数据源
 #            master:
 #                url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
@@ -173,6 +173,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="createTimeEnd != null  and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
 		</where>
+		order by id desc
 	</select>
@@ -547,6 +548,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="createTimeStr != null  and createTimeStr != ''"> and create_time >= #{createTimeStr}</if>
 			<if test="createTimeEnd != null  and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
 		</where>
+		order by id desc
 	</select>
@@ -860,6 +862,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="updateStatus != null  and updateStatus != ''"> and update_status #{updateStatus}</if>
 			<if test="lineUpdateType != null  and lineUpdateType != ''"> and line_update_type =#{lineUpdateType}</if>
 		</where>
+		order by id desc
 	</select>
@@ -1322,6 +1325,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		<if test="company != null  and company != ''"> and bsth_t_line.company = #{company}</if>
 		<if test="fCompany != null  and fCompany != ''"> and bsth_t_line.f_company = #{fCompany}</if>
 		</where>
+		order by bsth_t_line.id desc
 	</select>
@@ -278,7 +278,12 @@
                 <!---------------------------------->
                 <li id="carPlate">
                     <label>车辆自编号：</label>
-                    <input name="carPlate" th:field="*{carPlate}" type="text" disabled>
+                    <select name="carPlate" th:with="type=${@dict.getType('carPlate')}" class="selectpicker" multiple
+                            title="" disabled>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                th:selected="${#arrays.contains(#strings.toString(bsthTLine.carPlate== null ? '' : bsthTLine.carPlate),#strings.toString(dict.dictLabel))}">
+                        </option>
+                    </select>
                 </li>
                 <!---------------------------------->
                 <li id="numberPerson">
@@ -341,10 +341,13 @@
             <div class="hr-line-dashed"></div>
             <h3>调度</h3>
             <div class="form-group">
-                <label class="col-sm-1 control-label">车辆自编号：</label>
+                <label class="col-sm-1 control-label" name="carPlate">车辆自编号：</label>
                 <div class="col-sm-2">
-                    <input name="carPlate" class="form-control" type="text">
+                    <select name="carPlate" id="carPlate" th:with="type=${@dict.getType('carPlate')}" class="selectpicker form-control" multiple title="" onchange="getBusType()">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
+                    </select>
                 </div>
+                <input type="hidden" name="busType" id="busType" th:value="*{busType}">
                 <!---------------------------------->
                 <label class="col-sm-1 control-label">是否挂牌：</label>
                 <div class="col-sm-2">
@@ -682,7 +685,26 @@
     }
-
+    var cl=[[${@dict.getType('carPlate')}]]
+    function getBusType(){
+        var s = new Set();
+        var carPlate=$("#carPlate").val();
+        for (let o of carPlate) {
+            for (let o2 of cl) {
+                var dictLabel=o2.dictLabel;
+                var dictValue=o2.dictValue;
+                if(o==dictLabel){
+                    s.add(dictValue)
+                }
+            }
+        }
+        var str='';
+        for (let o of s) {
+            str+=(o+',');
+        }
+        str=str.substr(0,str.length-1);
+        $('#busType').val(str);
+    }
 </script>
 </body>
 </html>
 \ No newline at end of file
@@ -5,45 +5,42 @@
 <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"/>
 </head>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-line-edit" th:object="${bsthTLine}">
 			<input name="id" th:field="*{id}" type="hidden">
+			<h3>路务</h3>
 			<div class="form-group">
-				<label class="col-sm-1 control-label">线路名称：</label>
+				<label class="col-sm-1 control-label" name="lineName">线路名称：</label>
 				<div class="col-sm-2">
-					<input name="lineName" th:field="*{lineName}" class="form-control" type="text" readonly>
+					<input th:field="*{lineName}" class="form-control" type="text" readonly>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">主线路id：</label>
+				<label class="col-sm-1 control-label" name="company">公司：</label>
 				<div class="col-sm-2">
-					<input name="pLineId" th:field="*{pLineId}" class="form-control" type="text">
+					<select id='company' name="company"></select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">公司：</label>
+				<label class="col-sm-1 control-label" name="fCompany">分公司：</label>
 				<div class="col-sm-2">
-					<input name="company" th:field="*{company}" class="form-control" type="text">
+					<select id='fCompany'name="fCompany"></select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">分公司：</label>
+				<label class="col-sm-1 control-label" name="lineType">线路类型：</label>
 				<div class="col-sm-2">
-					<input name="fCompany" th:field="*{fCompany}" 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="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
+					<select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
 						<option value=""></option>
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}">
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}">
 						</option>
 					</select>
 				</div>
-				<!---------------------------------->
-				<label class="col-sm-1 control-label">线路属性：</label>
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
+				<label class="col-sm-1 control-label" name="lineLevel">线路属性：</label>
 				<div class="col-sm-2">
 					<select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
 						<option value=""></option>
@@ -53,38 +50,38 @@
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">线路类型：</label>
+				<label class="col-sm-1 control-label" name="serviceType">营运方式：</label>
 				<div class="col-sm-2">
-					<select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
+					<select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
 						<option value=""></option>
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}">
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}">
 						</option>
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">道路类型：</label>
-				<div class="col-sm-2" >
-					<!--data-max-options="2" 限制多选数量-->
-					<select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control"  multiple title=""  >
-						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.roadType== null ? '' : bsthTLine.roadType),#strings.toString(dict.dictValue))}">
-						</option>
+				<label class="col-sm-1 control-label" name="revenueType">营收类型：</label>
+				<div class="col-sm-2">
+					<select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>
+						></option>></option>
 					</select>
 				</div>
-			</div>
-
-			<div class="form-group">
-				<label class="col-sm-1 control-label">区属：</label>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label" name="district">区属：</label>
 				<div class="col-sm-2">
-					<select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b">
-						<option value=""></option>
+					<select name="district" th:with="type=${@dict.getType('district')}" class="selectpicker form-control"
+							multiple title="">
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 								th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-				<!---------------------------------->
-				<label class="col-sm-1 control-label">是否区内：</label>
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
+				<label class="col-sm-1 control-label" name="inoutDistrict">是否区内：</label>
 				<div class="col-sm-2">
 					<select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
 						<option value=""></option>
@@ -93,121 +90,139 @@
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">车辆类型：</label>
-				<div class="col-sm-2" th:with="type=${@dict.getType('busType')}">
+				<label class="col-sm-1 control-label" name="roadType">道路类型：</label>
+				<div class="col-sm-2">
 					<!--data-max-options="2" 限制多选数量-->
-					<select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control"  multiple title=""  >
-						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.busType== null ? '' : bsthTLine.busType),#strings.toString(dict.dictValue))}">
+					<select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control"
+							multiple title="">
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.roadType== null ? '' : bsthTLine.roadType),#strings.toString(dict.dictValue))}">
 						</option>
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">是否空调：</label>
+				<label class="col-sm-1 control-label" name="serviceTime">运营时间：</label>
 				<div class="col-sm-2">
-					<select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b">
+					<select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
+					</select>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label" name="airConditionerType">是否空调：</label>
+				<div class="col-sm-2">
+					<select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}"
+							class="form-control m-b">
 						<option value=""></option>
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 								th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">售票类型：</label>
+				<label class="col-sm-1 control-label" name="sellTicketType">售票类型：</label>
 				<div class="col-sm-2">
-					<select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b">
+					<select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}"
+							class="form-control m-b">
 						<option value=""></option>
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 								th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">票价：</label>
-				<div class="col-sm-2" th:with="type=${@dict.getType('ticketPrice')}">
+				<label class="col-sm-1 control-label" name="ticketPrice">票价：</label>
+				<div class="col-sm-2">
 					<!--data-max-options="2" 限制多选数量-->
-					<select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control"  multiple title=""  >
-						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+					<select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}"
+							class="selectpicker form-control" multiple title="">
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 								th:selected="${#arrays.contains(#strings.toString(bsthTLine.ticketPrice== null ? '' : bsthTLine.ticketPrice),#strings.toString(dict.dictValue))}">
 						</option>
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">运营时间：</label>
+				<label class="col-sm-1 control-label" name="halfwayStation">站点名称：</label>
 				<div class="col-sm-2">
-					<select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
-					</select>
+					<textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
 				</div>
 				<!---------------------------------->
-<!--				<label class="col-sm-1 control-label">线路编码：</label>-->
-<!--				<div class="col-sm-2">-->
-<!--					<input name="lineCode" th:field="*{lineCode}" class="form-control" type="text">-->
-<!--				</div>-->
+				<label class="col-sm-1 control-label" name="directions">线路走向：</label>
+				<div class="col-sm-2">
+					<textarea name="directions" class="form-control">[[*{directions}]]</textarea>
+				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">线路长度：</label>
+				<label class="col-sm-1 control-label" name="stationUp">站级数(上行)：</label>
 				<div class="col-sm-2">
-					<input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
+					<input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">首站：</label>
+				<label class="col-sm-1 control-label" name="stationDown">站级数(下行)：</label>
+				<div class="col-sm-2">
+					<input name="stationDown" th:field="*{stationDown}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label" name="firstStation">首站：</label>
 				<div class="col-sm-2">
 					<input name="firstStation" th:field="*{firstStation}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">末站：</label>
+				<label class="col-sm-1 control-label" name="lastStation">末站：</label>
 				<div class="col-sm-2">
 					<input name="lastStation" th:field="*{lastStation}" class="form-control" type="text">
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">站点名称：</label>
+				<label class="col-sm-1 control-label" name="firstTime">起点站首末班：</label>
 				<div class="col-sm-2">
-					<textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
+					<input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">线路走向：</label>
+				<label class="col-sm-1 control-label" name="lastTime">终点站首末班：</label>
 				<div class="col-sm-2">
-					<textarea name="directions" class="form-control">[[*{directions}]]</textarea>
+					<input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">起点站首末班：</label>
+				<label class="col-sm-1 control-label" name="mileageUp">上行里程数：</label>
 				<div class="col-sm-2">
-					<input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
+					<input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">终点站首末班：</label>
+				<label class="col-sm-1 control-label" name="mileageDown">下行里程数：</label>
 				<div class="col-sm-2">
-					<input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
+					<input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-<!--				<label class="col-sm-1 control-label">停车场：</label>-->
-<!--				<div class="col-sm-2">-->
-<!--					<input name="park" th:field="*{park}" class="form-control" type="text">-->
-<!--				</div>-->
+				<label class="col-sm-1 control-label" name="lineDistance">线路长度：</label>
+				<div class="col-sm-2">
+					<input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
+				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">授权年限：</label>
+				<label class="col-sm-1 control-label" name="isWarrant">是否权证：</label>
 				<div class="col-sm-2">
-					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
+					<select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}"
+							class="form-control m-b">
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
+					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">授权起始日期：</label>
+				<label class="col-sm-1 control-label" name="warrantStartTime">授权起始日期：</label>
 				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="warrantStartTime" th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
-						   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">授权结束日期：</label>
+				<label class="col-sm-1 control-label" name="warrantEndTime">授权结束日期：</label>
 				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="warrantEndTime" th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
@@ -216,27 +231,14 @@
 					</div>
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">线路暂停日期：</label>
-				<div class="col-sm-2">
-					<div class="input-group date">
-						<input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
-							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
-				</div>
-				<!---------------------------------->
-				<label class="col-sm-1 control-label">实际撤销日期：</label>
+				<label class="col-sm-1 control-label" name="warrantYear">授权年限：</label>
 				<div class="col-sm-2">
-					<div class="input-group date">
-						<input name="cancelTime" th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
-							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
+					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">行车作业计划报备时间：</label>
+				<label class="col-sm-1 control-label" name="timeSchedule">行车作业计划报备时间：</label>
 				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="timeSchedule"
@@ -246,212 +248,201 @@
 							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">
-					<select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
-					</select>
-				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">经营权证（大）：</label>
+				<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">
 				</div>
-			</div>
-
-			<div class="form-group">
-				<label class="col-sm-1 control-label">经营权证（中）：</label>
-				<div class="col-sm-2">
-					<input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control" type="text">
-				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">实际配车数：</label>
+				<label class="col-sm-1 control-label" name="warrantVehiclesMiddle">经营权证（中）：</label>
 				<div class="col-sm-2">
-					<input name="vehiclesNumber" th:field="*{vehiclesNumber}" class="form-control" type="text">
+					<input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control"
+						   type="text">
 				</div>
-				<!---------------------------------->
-				<label class="col-sm-1 control-label">实际车辆数（大）：</label>
+
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
+				<label class="col-sm-1 control-label" name="isMetro">是否轨交末班车衔接：</label>
 				<div class="col-sm-2">
-					<input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" class="form-control" type="text">
+					<select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
+					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">实际车辆数（中）：</label>
+				<label class="col-sm-1 control-label" name="metroTime">轨交时间：</label>
 				<div class="col-sm-2">
-					<input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" class="form-control" type="text">
-				</div>
-			</div>
-
-			<div class="form-group">
-				<label class="col-sm-1 control-label">上行里程数：</label>
-				<div class="col-sm-2">
-					<input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
+					<div class="input-group date">
+						<input name="metroTime" class="form-control" placeholder="HH:mm:ss" th:value="*{metroTime}">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+					</div>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">下行里程数：</label>
+				<label class="col-sm-1 control-label" name="coldBonusType">冷僻线路补贴类型：</label>
 				<div class="col-sm-2">
-					<input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
+					<select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option>
+					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">站级数(上行)：</label>
+				<label class="col-sm-1 control-label" name="serviceState">营运状态：</label>
 				<div class="col-sm-2">
-					<input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
+					<select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								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">站级数(下行)：</label>
+				<label class="col-sm-1 control-label" name="planCancelTime">线路暂停日期：</label>
 				<div class="col-sm-2">
-					<input name="stationDown" th:field="*{stationDown}" class="form-control" type="text">
+					<div class="input-group date">
+						<input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+					</div>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">行驶时间(上行)：</label>
+				<label class="col-sm-1 control-label" name="cancelTime">实际撤销日期：</label>
 				<div class="col-sm-2">
-					<input name="travelTimeUp" th:field="*{travelTimeUp}" class="form-control" type="text">
+					<div class="input-group date">
+						<input name="cancelTime" th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+					</div>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">行驶时间(下行)：</label>
+				<label class="col-sm-1 control-label" name="lineUpdateType">性质：</label>
 				<div class="col-sm-2">
-					<input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text">
+					<select name="lineUpdateType"
+							th:with="type=${@dict.getType('lineUpdateType')}"
+							class="form-control m-b">
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+								th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null||bsthTLine.lineUpdateType=='3' ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>
+						></option>
+					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
+				<label class="col-sm-1 control-label" name="remark">备注：</label>
 				<div class="col-sm-2">
-					<input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text">
+					<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
-				<div class="col-sm-2">
-					<input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text">
-				</div>
-				<!---------------------------------->
-				<label class="col-sm-1 control-label">间隔等级：</label>
-				<div class="col-sm-2">
-					<input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text">
+				<div class="form-group">
+					<label class="col-sm-1 control-label" name="files">附件：</label>
+					<div class="col-sm-5">
+						<div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}">
+							<input name="files" type="hidden" th:value="${path}">
+							<a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}"
+							   th:text="${#strings.arraySplit(path,':')[0]}">
+							</a>
+							<button onclick="deleteFile(this);">删除</button>
+						</div>
+						<div class="file-loading" id="uploadDiv">
+							<input id="fileinput" type="file" multiple>
+						</div>
+					</div>
 				</div>
 			</div>
-
+			<!---------------------------------->
+			<div class="hr-line-dashed"></div>
+			<h3>调度</h3>
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">车辆自编号：</label>
+				<label class="col-sm-1 control-label" name="carPlate">车辆自编号：</label>
 				<div class="col-sm-2">
-					<input name="carPlate" th:field="*{carPlate}" class="form-control" type="text">
+					<select name="carPlate" id="carPlate" th:with="type=${@dict.getType('carPlate')}" class="selectpicker form-control" multiple title="" onchange="getBusType()">
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.carPlate== null ? '' : bsthTLine.carPlate),#strings.toString(dict.dictLabel))}"></option>
+					</select>
 				</div>
+				<input type="hidden" name="busType" id="busType" th:value="*{busType}">
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">线路配档数：</label>
+				<label class="col-sm-1 control-label" name="hasTimelists">是否挂牌：</label>
 				<div class="col-sm-2">
-					<input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
+					<select name="hasTimelists"
+							th:with="type=${@dict.getType('trueFalse')}"
+							class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+								th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
+					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">司机人数：</label>
+				<label class="col-sm-1 control-label" name="travelTimeUp">行驶时间(上行)：</label>
 				<div class="col-sm-2">
-					<input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
+					<input name="travelTimeUp" th:field="*{travelTimeUp}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">售票员数：</label>
+				<label class="col-sm-1 control-label" name="travelTimeDown">行驶时间(下行)：</label>
 				<div class="col-sm-2">
-					<input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text">
+					<input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text">
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">新能源车数：</label>
+				<label class="col-sm-1 control-label" name="travelIntervalUp">行驶间隔(高峰)：</label>
 				<div class="col-sm-2">
-					<input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text">
+					<input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
+				<label class="col-sm-1 control-label" name="travelIntervalDown">行驶间隔(低谷)：</label>
 				<div class="col-sm-2">
-					<select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
-					</select>
+					<input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">轨交时间：</label>
+				<label class="col-sm-1 control-label" name="divideLevel">间隔等级：</label>
 				<div class="col-sm-2">
-					<div class="input-group date">
-						<input name="metroTime" class="form-control" placeholder="HH:mm:ss" th:value="*{metroTime}">
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
+					<input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">是否挂牌：</label>
+				<label class="col-sm-1 control-label" name="vehiclesNumber">实际配车数：</label>
 				<div class="col-sm-2">
-					<select name="hasTimelists"
-							th:with="type=${@dict.getType('trueFalse')}"
-							class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-								th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
-					</select>
+					<input name="vehiclesNumber" th:field="*{vehiclesNumber}" class="form-control" type="text">
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
+				<label class="col-sm-1 control-label" name="numberVehiclesLarge">实际车辆数（大）：</label>
+				<div class="col-sm-2">
+					<input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" class="form-control" type="text">
+				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">营运状态：</label>
+				<label class="col-sm-1 control-label" name="numberVehiclesMiddle">实际车辆数（中）：</label>
 				<div class="col-sm-2">
-					<select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
-					</select>
+					<input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
+				<label class="col-sm-1 control-label" name="busEvNumber">新能源车数：</label>
 				<div class="col-sm-2">
-					<select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option>></option>></option>
-					</select>
+					<input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">营收类型：</label>
+				<label class="col-sm-1 control-label" name="numberPerson">线路配档数：</label>
 				<div class="col-sm-2">
-					<select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
-					</select>
+					<input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">性质：</label>
+				<label class="col-sm-1 control-label" name="numberPersonDriver">司机人数：</label>
 				<div class="col-sm-2">
-					<select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" readonly>
-						<option value="0" selected="selected">新辟</option>
-					</select>
+					<input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">备注：</label>
+				<label class="col-sm-1 control-label" name="numberPersonSales">售票员数：</label>
 				<div class="col-sm-2">
-					<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
-				</div>
-			</div>
-
-			<div class="form-group">
-				<div class="form-group">
-					<label class="col-sm-1 control-label">附件：</label>
-					<div class="col-sm-5">
-						<div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" >
-							<input name="files" type="hidden" th:value="${path}" >
-							<a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
-							</a>
-							<button onclick="deleteFile(this);">删除</button>
-						</div>
-						<div class="file-loading" id="uploadDiv">
-							<input id="fileinput" type="file" multiple>
-						</div>
-					</div>
+					<input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text">
 				</div>
 			</div>
 		</form>
@@ -460,12 +451,104 @@
 	<th:block th:include="include :: datetimepicker-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";
 		function deleteFile(obj){
 			$(obj).parent().remove();
 		}
-		
+
+		//公司分公司联动
+		var companyList = [[${companyList}]];
+		var companies = new Array();
+		var fCompanies = new Array();
+		var bsthTLine = [[${bsthTLine}]];
+		$(function () {
+			for (let i in companyList) {
+				companies[i] = companyList[i].company;
+				fCompanies[i] = companyList[i].fCompany;
+			}
+			companies = Array.from(new Set(companies));
+			companySelect();
+			fCompanySelect();
+			$('#company').on('change.select2', function (e) {
+				fCompanySelect()
+			});
+			//初始选中
+			$("#company").val(bsthTLine.company).trigger("change");
+			$("#fCompany").val(bsthTLine.fCompany).trigger("change");
+
+			// 获取 div 标签下的所有子节点
+			/*  var pObjs = document.getElementById('lw').getElementsByTagName("*")
+              for (var i = 0 ; i <pObjs.length; i++) { // 一定要倒序，正序是删不干净的，可自行尝试
+                  pObjs[i].setAttribute("disabled",true);
+              }
+              var pObjs = document.getElementById('dd').getElementsByTagName("*")
+              for (var i = 0 ; i <pObjs.length; i++) { // 一定要倒序，正序是删不干净的，可自行尝试
+                  pObjs[i].setAttribute("disabled",true);
+              }*/
+		});
+
+		function companySelect() {
+
+			var arr = new Array();
+			var company = new Object();
+			company.id = '';
+			company.text = '';
+			company.value = '';
+			arr.push(company)
+			for (var i = 0; i < companies.length; i++) {
+				company = new Object();
+				company.id = companies[i];
+				company.text = companies[i];
+				company.value = companies[i];
+				arr.push(company);
+			}
+			$("#company").select2({
+				data: arr,
+				placeholder: '请选择',
+				allowClear: true
+			})
+		}
+
+		function fCompanySelect() {
+			$('#fCompany').empty();
+			var company = $('#company').select2('val');
+			var arr = new Array();
+			var fCompany = new Object();
+			fCompany.id = '';
+			fCompany.text = '';
+			fCompany.value = '';
+			arr.push(fCompany)
+			if (company == '') {
+				for (let i in companyList) {
+					var companyName = companyList[i].company;
+					var fCompanyName = companyList[i].fCompany;
+					fCompany = new Object();
+					fCompany.id = fCompanyName;
+					fCompany.text = fCompanyName;
+					fCompany.value = fCompanyName;
+					arr.push(fCompany);
+				}
+			} else {
+				for (let i in companyList) {
+					var companyName = companyList[i].company;
+					var fCompanyName = companyList[i].fCompany;
+					if (companyName == company) {
+						fCompany = new Object();
+						fCompany.id = fCompanyName;
+						fCompany.text = fCompanyName;
+						fCompany.value = fCompanyName;
+						arr.push(fCompany);
+					}
+				}
+			}
+			$("#fCompany").select2({
+				data: arr,
+				placeholder: '请选择',
+				allowClear: true
+			});
+		}
 		$(function() {
 			$("#fileinput").fileinput({
@@ -567,7 +650,26 @@
 			autoclose : true
 		});
-
+		var cl=[[${@dict.getType('carPlate')}]]
+		function getBusType(){
+			var s = new Set();
+			var carPlate=$("#carPlate").val();
+			for (let o of carPlate) {
+				for (let o2 of cl) {
+					var dictLabel=o2.dictLabel;
+					var dictValue=o2.dictValue;
+					if(o==dictLabel){
+						s.add(dictValue)
+					}
+				}
+			}
+			var str='';
+			for (let o of s) {
+				str+=(o+',');
+			}
+			str=str.substr(0,str.length-1);
+			$('#busType').val(str);
+		}
 	</script>
 </body>
 </html>
 \ No newline at end of file
@@ -263,7 +263,6 @@
 				<div class="col-sm-2">
 					<input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control" type="text">
 				</div>
-
 			</div>
 			<!---------------------------------->
 			<div class="form-group">
@@ -285,11 +284,14 @@
 				</div>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label"name="coldBonusType">冷僻线路补贴类型：</label>
-				<select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
-					<option value=""></option>
-					<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option>
-				</select>
+				<div class="col-sm-2">
+					<select name="coldBonusType" th:with="type=${@dict.getType('coldBonusType')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.coldBonusType== null ? '' : bsthTLine.coldBonusType),#strings.toString(dict.dictValue))}"></option>
+					</select>
+				</div>
+
 				<!---------------------------------->
 				<label class="col-sm-1 control-label"name="serviceState">营运状态：</label>
 				<div class="col-sm-2">
@@ -360,7 +362,10 @@
 			<div class="form-group">
 				<label class="col-sm-1 control-label"name="carPlate">车辆自编号：</label>
 				<div class="col-sm-2">
-					<input name="carPlate" th:field="*{carPlate}" class="form-control" type="text">
+					<select name="carPlate" id="carPlate" th:with="type=${@dict.getType('carPlate')}" class="selectpicker form-control" multiple title="" >
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:dd="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.carPlate== null ? '' : bsthTLine.carPlate),#strings.toString(dict.dictLabel))}"></option>
+					</select>
 				</div>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label"name="hasTimelists">是否挂牌：</label>
@@ -360,8 +360,12 @@
         <div class="form-group">
             <label class="col-sm-1 control-label" name="carPlate">车辆自编号：</label>
             <div class="col-sm-2">
-                <input name="carPlate" th:field="*{carPlate}" class="form-control" type="text">
+                <select name="carPlate" id="carPlate" th:with="type=${@dict.getType('carPlate')}" class="selectpicker form-control" multiple title="" onchange="getBusType()">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${#arrays.contains(#strings.toString(bsthTLine.carPlate== null ? '' : bsthTLine.carPlate),#strings.toString(dict.dictLabel))}"></option>
+                </select>
             </div>
+            <input type="hidden" name="busType" id="busType" th:value="*{busType}">
             <!---------------------------------->
             <label class="col-sm-1 control-label" name="hasTimelists">是否挂牌：</label>
             <div class="col-sm-2">
@@ -577,14 +581,11 @@
                 console.log(bsthTLineOld)
                 var bsthTLineNew = data[1];
-                console.log(bsthTLineNew)
                 if (bsthTLineNew != null) {
                     for (let i in bsthTLineOld) {
                         var o = bsthTLineOld[i] == null ? '' : bsthTLineOld[i];
                         var n = bsthTLineNew[i] == null ? '' : bsthTLineNew[i];
                         if (o != n) {
-                            console.log(o)
-                            console.log(n)
                             i = i == 'fcompany' ? 'fCompany' : i;
                             i = i == 'plineId' ? 'pLineId' : i;
                             var input = document.getElementsByName(i)[0];
@@ -659,6 +660,26 @@
         autoclose: true
     });
+    var cl=[[${@dict.getType('carPlate')}]]
+    function getBusType(){
+        var s = new Set();
+        var carPlate=$("#carPlate").val();
+        for (let o of carPlate) {
+            for (let o2 of cl) {
+                var dictLabel=o2.dictLabel;
+                var dictValue=o2.dictValue;
+                if(o==dictLabel){
+                    s.add(dictValue)
+                }
+            }
+        }
+        var str='';
+        for (let o of s) {
+            str+=(o+',');
+        }
+        str=str.substr(0,str.length-1);
+        $('#busType').val(str);
+    }
 </script>
 </body>
 </html>
 \ No newline at end of file