youxiw2000 / bsthLineProfiles · Commits

Commit 51bfc488e15eb2149cf7635d45268db54a35d7eb

Authored by youxiw2000
1 parent db97f749
build: skipped

commit

Inline Side-by-side
Showing 9 changed files with 1413 additions and 119 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
  View file @51bfc48
@@ -59,7 +59,28 @@ public class BsthTLineHistoryController extends BaseController @@ -59,7 +59,28 @@ public class BsthTLineHistoryController extends BaseController
59 { 59 {
60 return prefix + "/line"; 60 return prefix + "/line";
61 } 61 }
62 - 62 +
  63 + @RequiresPermissions("system:lineHistory:view")
  64 + @GetMapping("/historyCompare")
  65 + public String historyCompare()
  66 + {
  67 + return prefix + "/historyCompare";
  68 + }
  69 +
  70 + @GetMapping("/getListForMap")
  71 + @ResponseBody
  72 + public List<BsthTLine> getListForMap() {
  73 + return bsthTLineService.selectBsthTLineHistoryListGroupByLineName(null);
  74 + }
  75 +
  76 +
  77 +
  78 + @GetMapping("/getListByName")
  79 + @ResponseBody
  80 + public List<BsthTLine> getListByName(String name) {
  81 + return bsthTLineService.getListByName(name);
  82 + }
  83 +
63 /** 84 /**
64 * 查询【请填写功能名称】列表 85 * 查询【请填写功能名称】列表
65 */ 86 */
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
  View file @51bfc48
@@ -92,6 +92,10 @@ public interface BsthTLineMapper @@ -92,6 +92,10 @@ public interface BsthTLineMapper
92 92
93 93
94 public List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport); 94 public List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport);
  95 +
  96 + public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object);
  97 +
  98 + public List<BsthTLine> getListByName(String name);
95 99
96 100
97 } 101 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
  View file @51bfc48
@@ -93,4 +93,8 @@ public interface IBsthTLineService @@ -93,4 +93,8 @@ public interface IBsthTLineService
93 public List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare); 93 public List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare);
94 94
95 public List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport); 95 public List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport);
  96 +
  97 + public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object);
  98 +
  99 + public List<BsthTLine> getListByName(String object);
96 } 100 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
  View file @51bfc48
@@ -315,6 +315,18 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -315,6 +315,18 @@ public class BsthTLineServiceImpl implements IBsthTLineService
315 return bsthTLineMapper.selectLineEditReportList(lineEditReport); 315 return bsthTLineMapper.selectLineEditReportList(lineEditReport);
316 } 316 }
317 317
  318 + @Override
  319 + public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object) {
  320 + // TODO Auto-generated method stub
  321 + return bsthTLineMapper.selectBsthTLineHistoryListGroupByLineName(object);
  322 + }
  323 +
  324 + @Override
  325 + public List<BsthTLine> getListByName(String name) {
  326 + // TODO Auto-generated method stub
  327 + return bsthTLineMapper.getListByName(name);
  328 + }
  329 +
318 330
319 331
320 332
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @51bfc48
@@ -1039,6 +1039,105 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1039,6 +1039,105 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1039 </where> 1039 </where>
1040 </select> 1040 </select>
1041 1041
  1042 + <select id="selectBsthTLineHistoryListGroupByLineName"
  1043 + parameterType="BsthTLine" resultMap="BsthTLineResult">
  1044 + <include refid="selectBsthTLineHistoryVo" />
  1045 + <where>
  1046 + <if test="eventId != null "> and event_id = #{eventId}</if>
  1047 + <if test="lineId != null "> and line_id = #{lineId}</if>
  1048 + <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
  1049 + <if test="company != null and company != ''"> and company = #{company}</if>
  1050 + <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>
  1051 + <if test="pLineId != null "> and p_line_id = #{pLineId}</if>
  1052 + <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>
  1053 + <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>
  1054 + <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>
  1055 + <if test="district != null and district != ''"> and district = #{district}</if>
  1056 + <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>
  1057 + <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>
  1058 + <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
  1059 + <if
  1060 + test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
  1061 + <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
  1062 + <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>
  1063 + <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
  1064 + <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
  1065 + <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>
  1066 + <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>
  1067 + <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
  1068 + <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
  1069 + <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
  1070 + <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
  1071 + <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
  1072 + <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
  1073 + <if test="park != null and park != ''"> and park = #{park}</if>
  1074 + <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
  1075 + <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
  1076 + <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
  1077 + <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
  1078 + <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>
  1079 + <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
  1080 + <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
  1081 + <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
  1082 + <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
  1083 + <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
  1084 + <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
  1085 + <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
  1086 + <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
  1087 + <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
  1088 + <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>
  1089 + <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>
  1090 + <if
  1091 + test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>
  1092 + <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}
  1093 + </if>
  1094 + <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}
  1095 + </if>
  1096 + <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>
  1097 + <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>
  1098 + <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}
  1099 + </if>
  1100 + <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
  1101 + <if test="numberPerson != null "> and number_person = #{numberPerson}</if>
  1102 + <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>
  1103 + <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
  1104 + <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
  1105 + <if test="directions != null and directions != ''"> and directions = #{directions}</if>
  1106 + <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
  1107 + <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
  1108 + <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
  1109 + <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
  1110 + <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
  1111 + <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
  1112 + <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
  1113 + <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
  1114 + <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
  1115 + <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
  1116 + <if test="personMonth != null "> and person_month = #{personMonth}</if>
  1117 + <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
  1118 + <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
  1119 + <if test="revenues != null "> and revenues = #{revenues}</if>
  1120 + <if test="persons != null "> and persons = #{persons}</if>
  1121 + <if test="mileages != null "> and mileages = #{mileages}</if>
  1122 + <if test="personAvg != null "> and person_avg = #{personAvg}</if>
  1123 + <if test="startDate != null "> and start_date > #{startDate}</if>
  1124 + <if test="startReason != null "> and start_reason = #{startReason}</if>
  1125 + <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
  1126 + </where>
  1127 +
  1128 + group by line_name
  1129 + </select>
  1130 +
  1131 + <select id="getListByName" parameterType="java.lang.String" resultMap="BsthTLineResult">
  1132 + <include refid="selectBsthTLineHistoryVo" />
  1133 + <where>
  1134 + and line_name = #{name}
  1135 + </where>
  1136 + ORDER BY start_date DESC
  1137 + </select>
  1138 +
  1139 +
  1140 +
1042 <select id="selectHistoryListNotUpdate" 1141 <select id="selectHistoryListNotUpdate"
1043 parameterType="BsthTLine" resultMap="BsthTLineResult"> 1142 parameterType="BsthTLine" resultMap="BsthTLineResult">
1044 <include refid="selectBsthTLineHistoryVo" /> 1143 <include refid="selectBsthTLineHistoryVo" />
bsthLineProfiles/src/main/resources/templates/system/line/map.html
  View file @51bfc48
@@ -29,25 +29,22 @@ body, html, #container { @@ -29,25 +29,22 @@ body, html, #container {
29 box-shadow: 0 2px 6px 0 rgba(27, 142, 236, 0.5); 29 box-shadow: 0 2px 6px 0 rgba(27, 142, 236, 0.5);
30 } 30 }
31 31
32 -.stationInfo{  
33 -  
34 - right:0px;  
35 -  
36 - top:100px;  
37 -  
38 - display:none;  
39 -  
40 -  
41 - 32 +.stationInfo {
  33 + right: 0px;
  34 + top: 100px;
  35 + display: none;
42 } 36 }
43 </style> 37 </style>
44 <script 38 <script
45 src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script> 39 src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
46 </head> 40 </head>
47 <body> 41 <body>
  42 + <div class="info">
  43 + <input type="text" class="form-control" id="distance"
  44 + placeholder="查询范围(单位米)" value="500" />
  45 + </div>
48 46
49 -  
50 - <div class="info col-lg-6"> 47 + <!-- <div class="info col-lg-6">
51 <div class="input-group"> 48 <div class="input-group">
52 <input type="text" class="form-control" id="text"> 49 <input type="text" class="form-control" id="text">
53 <div class="input-group-btn"> 50 <div class="input-group-btn">
@@ -59,112 +56,144 @@ body, html, #container { @@ -59,112 +56,144 @@ body, html, #container {
59 </ul> 56 </ul>
60 </div> 57 </div>
61 </div> 58 </div>
62 - </div>  
63 - 59 + </div> -->
  60 +
64 <div class="info stationInfo"> 61 <div class="info stationInfo">
65 - <div id="stationInfo">  
66 -  
67 - </div>  
68 - 62 + <div id="stationInfo"></div>
  63 +
69 </div> 64 </div>
70 65
71 <div id="container"></div> 66 <div id="container"></div>
72 <th:block th:include="include :: footer" /> 67 <th:block th:include="include :: footer" />
73 <th:block th:include="include :: bootstrap-suggest-js" /> 68 <th:block th:include="include :: bootstrap-suggest-js" />
74 <script> 69 <script>
75 - $("#text").bsSuggest({  
76 - url : "/system/line/getListForMap",  
77 - effectiveFields : [ "lineName" ],  
78 - searchFields : [ "lineName", "halfwayStation" ],  
79 - effectiveFieldsAlias : {  
80 - lineName : "线路名"  
81 - },  
82 - clearable : true,  
83 - idField : "id",  
84 - keyField : "lineName",  
85 - processData : function(json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数  
86 - var data = {  
87 - 'value' : []  
88 - };  
89 -  
90 - for ( var i in json) {  
91 - data.value.push(json[i]);  
92 - } 70 + var map = new BMapGL.Map('container'); // 创建Map实例
  71 + map.centerAndZoom(new BMapGL.Point(121.528733, 31.237425), 12); // 初始化地图,设置中心点坐标和地图级别
  72 + map.enableScrollWheelZoom(true); // 开启鼠标滚轮缩放
93 73
94 - //字符串转化为 js 对象  
95 - return data; 74 + map.addEventListener('click', function(e) {
  75 + if (e.overlay) {
  76 + return; // 存在覆盖物退出
96 } 77 }
97 - }).on('onDataRequestSuccess', function(e, result) {  
98 - console.log('onDataRequestSuccess: ', result);  
99 - }).on('onSetSelectValue', function(e, selectedData, selectedRawData) { 78 + map.clearOverlays();
  79 +
  80 + $.get("http://180.167.126.126:18991/prod-api/service/interfact/getStation?lng="
  81 + + e.latlng.lng + "&lat=" + e.latlng.lat + "&dis="
  82 + + $("#distance").val() / 1000, function(data) {
  83 + if (data.code == "200") {
  84 + for ( var i in data.data) {
  85 + (function(){
  86 + var station = data.data[i];
  87 + var marker = new BMapGL.Marker(new BMapGL.Point(station.lonBd, station.latBd),{title:station.standardStationCode});
  88 + var label = new BMapGL.Label(station.stationName);
  89 +
  90 + marker.setLabel(label);
  91 +
  92 +
  93 + marker.station = data.data[i];
  94 +
  95 + var opts = {
  96 + width: 200,
  97 + height: 200,
  98 + title: station.stationName
  99 + };
  100 +
  101 + var info = "";
  102 + info += "<span>站点名称：" + data.data[i].stationName
  103 + + "</span><br/>";
  104 + info += "<span>行业编码：" + data.data[i].standardStationCode
  105 + + "</span><br/>";
  106 + info += "<span>站点编码：" + data.data[i].stationCode
  107 + + "</span><br/>";
  108 + info += "<span>经过线路：" + data.data[i].lineList
  109 + + "</span><br/>";
  110 + info += "<span>道路名称：" + data.data[i].roadName
  111 + + "</span><br/>";
  112 +
  113 + var infoWindow = new BMapGL.InfoWindow(info, opts);
  114 +
  115 +
  116 + marker.addEventListener('click', function() {
  117 + map.openInfoWindow(infoWindow, new BMapGL.Point(station.lonBd, station.latBd)); // 开启信息窗口
  118 + });
  119 +
  120 +
  121 + map.addOverlay(marker);
  122 + })();
  123 + }
  124 + }
  125 + });
100 126
101 - busline.getBusList(e.target.value);  
102 -  
103 - }).on('onUnsetSelectValue', function() {  
104 - console.log('onUnsetSelectValue');  
105 - }).on('onShowDropdown', function(e, data) {  
106 - console.log('onShowDropdown', e.target.value, data);  
107 - }).on('onHideDropdown', function(e, data) {  
108 - console.log('onHideDropdown', e.target.value, data);  
109 }); 127 });
110 128
111 - var map = new BMapGL.Map('container'); // 创建Map实例  
112 - map.centerAndZoom(new BMapGL.Point(121.528733, 31.237425), 12); // 初始化地图,设置中心点坐标和地图级别  
113 - map.enableScrollWheelZoom(true); // 开启鼠标滚轮缩放*/  
114 -  
115 - var busline = new BMapGL.BusLineSearch(map, {  
116 - renderOptions : {  
117 - map : map,  
118 - panel : "r-result"  
119 - },  
120 - onGetBusListComplete : function(result) {  
121 - if (result) {  
122 -  
123 - for(var i in result._listItems){  
124 - if(result._listItems[i].name.indexOf($("#text").val()) > -1){  
125 - var fstLine = result.getBusListItem(i);//获取第一个公交列表显示到map上  
126 - busline.getBusLine(fstLine);  
127 - return;  
128 - } 129 + /* $("#text").bsSuggest({
  130 + url : "/system/line/getListForMap",
  131 + effectiveFields : [ "lineName" ],
  132 + searchFields : [ "lineName", "halfwayStation" ],
  133 + effectiveFieldsAlias : {
  134 + lineName : "线路名"
  135 + },
  136 + clearable : true,
  137 + idField : "id",
  138 + keyField : "lineName",
  139 + processData : function(json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
  140 + var data = {
  141 + 'value' : []
  142 + };
  143 +
  144 + for ( var i in json) {
  145 + data.value.push(json[i]);
129 } 146 }
130 -  
131 - }else{  
132 - return; 147 +
  148 + //字符串转化为 js 对象
  149 + return data;
133 } 150 }
134 - },  
135 - onMarkersSet:function(array){  
136 -  
137 - for(var i in array){ 151 + }).on('onDataRequestSuccess', function(e, result) {
  152 + console.log('onDataRequestSuccess: ', result);
  153 + }).on('onSetSelectValue', function(e, selectedData, selectedRawData) {
  154 +
  155 + busline.getBusList(e.target.value);
  156 +
  157 + }).on('onUnsetSelectValue', function() {
  158 + console.log('onUnsetSelectValue');
  159 + }).on('onShowDropdown', function(e, data) {
  160 + console.log('onShowDropdown', e.target.value, data);
  161 + }).on('onHideDropdown', function(e, data) {
  162 + console.log('onHideDropdown', e.target.value, data);
  163 + });
  164 +
  165 +
  166 + var busline = new BMapGL.BusLineSearch(map, {
  167 + renderOptions : {
  168 + map : map,
  169 + panel : "r-result"
  170 + },
  171 + onGetBusListComplete : function(result) {
  172 + if (result) {
  173 +
  174 + for(var i in result._listItems){
  175 + if(result._listItems[i].name.indexOf($("#text").val()) > -1){
  176 + var fstLine = result.getBusListItem(i);//获取第一个公交列表显示到map上
  177 + busline.getBusLine(fstLine);
  178 + return;
  179 + }
  180 + }
  181 +
  182 + }else{
  183 + return;
  184 + }
  185 + },
  186 + onMarkersSet:function(array){
138 187
139 - const overlay = array[i];  
140 - overlay.addEventListener("click", e => {  
141 - $.get("http://180.167.126.126:18991/prod-api/service/interfact/getStation?stationName=" + overlay._stName,function(data){  
142 - $("#stationInfo span").remove();  
143 - if(data.code == 200){  
144 -  
145 - var info = "";  
146 - info += "<span>站点名称：" + data.data.stationName + "</span><br/>";  
147 - info += "<span>行业编码：" + data.data.standardStationCode + "</span><br/>";  
148 - info += "<span>站点编码：" + data.data.stationCode + "</span><br/>";  
149 - info += "<span>经过线路：" + data.data.lineList + "</span><br/>";  
150 - info += "<span>道路名称：" + data.data.roadName + "</span><br/>";  
151 -  
152 - $("#stationInfo").html(info);  
153 -  
154 - $(".stationInfo").show();  
155 -  
156 - }else{  
157 - $(".stationInfo").hide();  
158 - }  
159 -  
160 - });  
161 -  
162 - }); 188 + for(var i in array){
  189 +
  190 + const overlay = array[i];
  191 +
  192 +
  193 + }
163 194
164 } 195 }
165 -  
166 - }  
167 - }); 196 + }); */
168 </script> 197 </script>
169 198
170 199
bsthLineProfiles/src/main/resources/templates/system/lineHistory/detail.html
  View file @51bfc48
@@ -594,7 +594,7 @@ @@ -594,7 +594,7 @@
594 <label class="col-sm-3 control-label">线路性质：</label> 594 <label class="col-sm-3 control-label">线路性质：</label>
595 <div class="col-sm-8"> 595 <div class="col-sm-8">
596 <select name="lineUpdateType" disabled 596 <select name="lineUpdateType" disabled
597 - th:with="type=${@dict.getType('line_update_type')}" 597 + th:with="type=${@dict.getType('lineUpdateType')}"
598 class="form-control m-b"> 598 class="form-control m-b">
599 <option value=""></option> 599 <option value=""></option>
600 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" 600 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @51bfc48
@@ -693,38 +693,33 @@ @@ -693,38 +693,33 @@
693 } 693 }
694 }); */ 694 }); */
695 695
696 - $  
697 - .post(  
698 - "/system/line/findByName", 696 + $.post("/system/line/findByName",
699 { 697 {
700 name : $("#lineName").val() 698 name : $("#lineName").val()
701 }, 699 },
702 function(data) { 700 function(data) {
703 -  
704 for ( var i in data) { 701 for ( var i in data) {
  702 +
  703 + if(i == "fcompany"){
  704 + console.log(i);
  705 + }
  706 +
705 707
706 - if (i == "startDate" || i == "startReason"  
707 - || !data[i]) 708 + if (i == "startDate" || i == "startReason" || i == "id" || i == "lineUpdateType")
708 continue; 709 continue;
709 710
710 var inputValue = ""; 711 var inputValue = "";
711 712
712 if ($("input[name=" + i + "]").length > 1) { 713 if ($("input[name=" + i + "]").length > 1) {
713 714
714 - for (var j = 0; j < $("input[name=" + i  
715 - + "]").length; j++) { 715 + for (var j = 0; j < $("input[name=" + i + "]").length; j++) {
716 if ($("input[name=" + i + "]")[j].checked) 716 if ($("input[name=" + i + "]")[j].checked)
717 - inputValue += $("input[name="  
718 - + i + "]")[j].value  
719 - + ","; 717 + inputValue += $("input[name="+ i + "]")[j].value + ",";
720 } 718 }
721 - inputValue = inputValue.substring(0,  
722 - inputValue.length - 1); 719 + inputValue = inputValue.substring(0,inputValue.length - 1);
723 720
724 if (data[i] != inputValue) { 721 if (data[i] != inputValue) {
725 - $($("input[name=" + i + "]")[0])  
726 - .parent().parent()  
727 - .css("background", "red"); 722 + $($("input[name=" + i + "]")[0]).parent().parent().css("background", "red");
728 } 723 }
729 continue; 724 continue;
730 725
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html 0 → 100644
  View file @51bfc48
  1 +<!DOCTYPE html>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org"
  3 + xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  4 +<head>
  5 +<th:block th:include="include :: header('线路档案信息')" />
  6 +</head>
  7 +<body class="gray-bg">
  8 + <div class="info col-lg-12">
  9 + <div class="input-group">
  10 + <input type="text" class="form-control" id="text">
  11 + <div class="input-group-btn">
  12 + <button type="button" class="btn btn-white dropdown-toggle"
  13 + data-toggle="dropdown">
  14 + <span class="caret"></span>
  15 + </button>
  16 + <ul class="dropdown-menu dropdown-menu-right" role="menu">
  17 + </ul>
  18 + </div>
  19 + </div>
  20 + </div>
  21 + <div class="container-div" id="context" style="padding-top:100px;">
  22 + <el-row>
  23 + <el-col :span="6">
  24 + <el-timeline reverse="reverse">
  25 + <el-timeline-item
  26 + v-for="(line,index) in lines"
  27 + type="primary"
  28 + size="large"
  29 + :timestamp="line.startDate" @click.native="change(index);">
  30 + {{line.lineUpdateType}}
  31 + </el-timeline-item>
  32 + </el-timeline>
  33 + </el-col>
  34 + <el-col :span="18">
  35 + <el-tabs type="border-card" v-model="tab" v-if="line">
  36 + <el-tab-pane label="线路信息" name="first">
  37 + <div class="col-sm-6">
  38 + <label class="col-sm-3 control-label">线路名称：</label>
  39 + <span class="col-sm-9">
  40 + {{line.lineName}}
  41 + </span>
  42 + </div>
  43 + <div class="col-sm-6">
  44 + <label class="col-sm-3 control-label">公司：</label>
  45 + <span class="col-sm-9">
  46 + {{line.company}}
  47 + </span>
  48 + </div>
  49 + <div class="col-sm-6">
  50 + <label class="col-sm-3 control-label">分公司：</label>
  51 + <span class="col-sm-9">
  52 + {{line.fCompany}}
  53 + </span>
  54 + </div>
  55 + <div class="col-sm-6">
  56 + <label class="col-sm-3 control-label">主线路id：</label>
  57 + <span class="col-sm-9">
  58 + {{line.pLineId}}
  59 + </span>
  60 + </div>
  61 + <div class="col-sm-6">
  62 + <label class="col-sm-3 control-label">营运方式：</label>
  63 + <span class="col-sm-9"> {{line.serviceType}}</span>
  64 + </div>
  65 + <div class="col-sm-6">
  66 + <label class="col-sm-3 control-label">营运方式：</label>
  67 + <span class="col-sm-9"> {{line.busType}}</span>
  68 + </div>
  69 + <div class="col-sm-6">
  70 + <label class="col-sm-3 control-label">线路属性：</label>
  71 + <span class="col-sm-9">
  72 + {{line.lineLevel}}
  73 + </span>
  74 + </div>
  75 + <div class="col-sm-6">
  76 + <label class="col-sm-3 control-label">线路类型：</label>
  77 + <span class="col-sm-9">
  78 +
  79 + {{line.lineType}}
  80 +
  81 + </span>
  82 + </div>
  83 + <div class="col-sm-6">
  84 + <label class="col-sm-3 control-label">区属：</label>
  85 + <span class="col-sm-9">
  86 + {{line.district}}
  87 + </span>
  88 + </div>
  89 + <div class="col-sm-6">
  90 + <label class="col-sm-3 control-label">是否区内：</label>
  91 + <span class="col-sm-9">
  92 + {{line.inoutDistrict}}
  93 + </span>
  94 + </div>
  95 + <div class="col-sm-6">
  96 + <label class="col-sm-3 control-label">营运状态：</label>
  97 + <span class="col-sm-9">
  98 +
  99 + {{line.serviceState}}
  100 + </span>
  101 + </div>
  102 + <div class="col-sm-6">
  103 + <label class="col-sm-3 control-label">车辆类型：</label>
  104 + <span class="col-sm-9">
  105 + {{line.busType}}
  106 + </span>
  107 + </div>
  108 + <div class="col-sm-6">
  109 + <label class="col-sm-3 control-label">是否空调：</label>
  110 + <span class="col-sm-9">
  111 +
  112 + {{line.airConditionerType}}
  113 + </span>
  114 + </div>
  115 + <div class="col-sm-6">
  116 + <label class="col-sm-3 control-label">售票类型：</label>
  117 + <span class="col-sm-9">
  118 + {{line.sellTicketType}}
  119 + </span>
  120 + </div>
  121 + <div class="col-sm-6">
  122 + <label class="col-sm-3 control-label">运营时间：</label>
  123 + <span class="col-sm-9">
  124 + {{line.serviceTime}}
  125 + </span>
  126 + </div>
  127 + <div class="col-sm-6">
  128 + <label class="col-sm-3 control-label">线路长度：</label>
  129 + <span class="col-sm-9">
  130 + {{line.lineDistance}}
  131 + </span>
  132 + </div>
  133 + <div class="col-sm-6">
  134 + <label class="col-sm-3 control-label">线路编码：</label>
  135 + <span class="col-sm-9">
  136 + {{line.lineCode}}
  137 + </span>
  138 + </div>
  139 + <div class="col-sm-6">
  140 + <label class="col-sm-3 control-label">授权年限：</label>
  141 + <span class="col-sm-9">
  142 + {{line.warrantYear}}
  143 + </span>
  144 + </div>
  145 + <div class="col-sm-6">
  146 + <label class="col-sm-3 control-label">授权起始日期：</label>
  147 + <span class="col-sm-9">
  148 + {{line.warrantStartTime}}
  149 + </span>
  150 + </div>
  151 + <div class="col-sm-6">
  152 + <label class="col-sm-3 control-label">授权结束日期：</label>
  153 + <span class="col-sm-9">
  154 + {{line.warrantEndTime}}
  155 + </span>
  156 + </div>
  157 + <div class="col-sm-6">
  158 + <label class="col-sm-3 control-label">撤销日期：</label>
  159 + <span class="col-sm-9">
  160 + {{line.planCancelTime}}
  161 + </span>
  162 + </div>
  163 + <div class="col-sm-6">
  164 + <label class="col-sm-3 control-label">实际撤销日期：</label>
  165 + <span class="col-sm-9">
  166 + {{line.cancelTime}}
  167 + </span>
  168 + </div>
  169 + <div class="col-sm-6">
  170 + <label class="col-sm-3 control-label">撤销原因：</label>
  171 + <span class="col-sm-9">
  172 + <textarea name="cancelReason" class="form-control" readonly>{{line.cancelReason}}</textarea>
  173 + </span>
  174 + </div>
  175 + <div class="col-sm-6">
  176 + <label class="col-sm-3 control-label">备注：</label>
  177 + <span class="col-sm-9">
  178 + <textarea name="remark" class="form-control" readonly>{{line.remark}}</textarea>
  179 + </span>
  180 + </div>
  181 + <div class="col-sm-6">
  182 + <label class="col-sm-3 control-label">是否逻辑删除：</label>
  183 + <span class="col-sm-9">
  184 +
  185 + {{line.isLogicDelete}}
  186 + </span>
  187 + </div>
  188 + <div class="col-sm-6">
  189 + <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
  190 + <span class="col-sm-9">
  191 + {{line.timeSchedule}}
  192 + </span>
  193 + </div>
  194 + <div class="col-sm-6">
  195 + <label class="col-sm-3 control-label">停车场：</label>
  196 + <span class="col-sm-9">
  197 + {{line.park}}
  198 + </span>
  199 + </div>
  200 + <div class="col-sm-6">
  201 + <label class="col-sm-3 control-label">是否权证：</label>
  202 + <span class="col-sm-9">
  203 + {{line.isWarran}}
  204 + </span>
  205 + </div>
  206 + <div class="col-sm-6">
  207 + <label class="col-sm-3 control-label">道路类型：</label>
  208 + <span class="col-sm-9">
  209 + {{line.roadType}}
  210 + </span>
  211 + </div>
  212 + <div class="col-sm-6">
  213 + <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
  214 + <span class="col-sm-9">
  215 + {{line.ticketPrice}}
  216 + </span>
  217 + </div>
  218 + <div class="col-sm-6">
  219 + <label class="col-sm-3 control-label">首站：</label>
  220 + <span class="col-sm-9">
  221 + {{line.firstStation}}
  222 + </span>
  223 + </div>
  224 + <div class="col-sm-6">
  225 + <label class="col-sm-3 control-label">起讫站：</label>
  226 + <span class="col-sm-9">
  227 + {{line.startEnd}}
  228 + </span>
  229 + </div>
  230 + <div class="col-sm-6">
  231 + <label class="col-sm-3 control-label">首战时间：</label>
  232 + <span class="col-sm-9">
  233 + {{line.firstTime}}
  234 + </span>
  235 + </div>
  236 + <div class="col-sm-6">
  237 + <label class="col-sm-3 control-label">末站：</label>
  238 + <span class="col-sm-9">
  239 + {{line.lastStation}}
  240 + </span>
  241 + </div>
  242 + <div class="col-sm-6">
  243 + <label class="col-sm-3 control-label">末站首战时间：</label>
  244 + <span class="col-sm-9">
  245 + {{line.lastTime}}
  246 + </span>
  247 + </div>
  248 + <div class="col-sm-6">
  249 + <label class="col-sm-3 control-label">上行里程数：</label>
  250 + <span class="col-sm-9">
  251 + {{line.mileageUp}}
  252 + </span>
  253 + </div>
  254 + <div class="col-sm-6">
  255 + <label class="col-sm-3 control-label">下行里程数：</label>
  256 + <span class="col-sm-9">
  257 + {{line.mileageDown}}
  258 + </span>
  259 + </div>
  260 + <div class="col-sm-6">
  261 + <label class="col-sm-3 control-label">平均里程数：</label>
  262 + <span class="col-sm-9">
  263 + {{line.averageMileage}}
  264 + </span>
  265 + </div>
  266 + <div class="col-sm-6">
  267 + <label class="col-sm-3 control-label">站级数(上行)：</label>
  268 + <span class="col-sm-9">
  269 + {{line.stationUp}}
  270 + </span>
  271 + </div>
  272 + <div class="col-sm-6">
  273 + <label class="col-sm-3 control-label">站级数(下行)：</label>
  274 + <span class="col-sm-9">
  275 + {{line.stationDown}}
  276 + </span>
  277 + </div>
  278 + <div class="col-sm-6">
  279 + <label class="col-sm-3 control-label">行驶时间(上行)：</label>
  280 + <span class="col-sm-9">
  281 + {{line.travelTimeUp}}
  282 + </span>
  283 + </div>
  284 + <div class="col-sm-6">
  285 + <label class="col-sm-3 control-label">行驶时间(下行)：</label>
  286 + <span class="col-sm-9">
  287 + {{line.travelTimeDown}}
  288 + </span>
  289 + </div>
  290 + <div class="col-sm-6">
  291 + <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
  292 + <span class="col-sm-9">
  293 + {{line.travelIntervalUp}}
  294 + </span>
  295 + </div>
  296 + <div class="col-sm-6">
  297 + <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
  298 + <span class="col-sm-9">
  299 + {{line.travelIntervalDown}}
  300 + </span>
  301 + </div>
  302 + <div class="col-sm-6">
  303 + <label class="col-sm-3 control-label">经营权证（大巴）：</label>
  304 + <span class="col-sm-9">
  305 + {{line.warrantVehiclesLarge}}
  306 + </span>
  307 + </div>
  308 + <div class="col-sm-6">
  309 + <label class="col-sm-3 control-label">经营权证（中巴）：</label>
  310 + <span class="col-sm-9">
  311 + {{line.warrantVehiclesMiddle}}
  312 + </span>
  313 + </div>
  314 + <div class="col-sm-6">
  315 + <label class="col-sm-3 control-label">实际配车数：</label>
  316 + <span class="col-sm-9">
  317 + {{line.vehiclesNumber}}
  318 + </span>
  319 + </div>
  320 + <div class="col-sm-6">
  321 + <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
  322 + <span class="col-sm-9">
  323 + {{line.numberVehiclesLarge}}
  324 + </span>
  325 + </div>
  326 + <div class="col-sm-6">
  327 + <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
  328 + <span class="col-sm-9">
  329 + {{line.numberVehiclesMiddle}}
  330 + </span>
  331 + </div>
  332 + <div class="col-sm-6">
  333 + <label class="col-sm-3 control-label">车辆自编号：</label>
  334 + <span class="col-sm-9">
  335 + {{line.carPlate}}
  336 + </span>
  337 + </div>
  338 + <div class="col-sm-6">
  339 + <label class="col-sm-3 control-label">线路总配人数：</label>
  340 + <span class="col-sm-9">
  341 + {{line.numberPerson}}
  342 + </span>
  343 + </div>
  344 + <div class="col-sm-6">
  345 + <label class="col-sm-3 control-label">人数司机：</label>
  346 + <span class="col-sm-9">
  347 + {{line.numberPersonDriver}}
  348 + </span>
  349 + </div>
  350 + <div class="col-sm-6">
  351 + <label class="col-sm-3 control-label">售票员数：</label>
  352 + <span class="col-sm-9">
  353 + {{line.numberPersonSales}}
  354 + </span>
  355 + </div>
  356 + <div class="col-sm-6">
  357 + <label class="col-sm-3 control-label">新能源车数：</label>
  358 + <span class="col-sm-9">
  359 + {{line.busEvNumber}}
  360 + </span>
  361 + </div>
  362 + <div class="col-sm-6">
  363 + <label class="col-sm-3 control-label">线路走向：</label>
  364 + <span class="col-sm-9">
  365 + <textarea name="directions" class="form-control" readonly>{{line.directions}}</textarea>
  366 + </span>
  367 + </div>
  368 + <div class="col-sm-6">
  369 + <label class="col-sm-3 control-label">经营权证数：</label>
  370 + <span class="col-sm-9">
  371 + {{line.numberOfManage}}
  372 + </span>
  373 + </div>
  374 + <div class="col-sm-6">
  375 + <label class="col-sm-3 control-label">站点名称：</label>
  376 + <span class="col-sm-9">
  377 + <textarea name="halfwayStation" class="form-control" readonly>{{line.halfwayStation}}</textarea>
  378 + </span>
  379 + </div>
  380 + <div class="col-sm-6">
  381 + <label class="col-sm-3 control-label">高峰系数：</label>
  382 + <span class="col-sm-9">
  383 + {{line.fullCustomerPercent}}
  384 + </span>
  385 + </div>
  386 + <div class="col-sm-6">
  387 + <label class="col-sm-3 control-label">低谷系数：</label>
  388 + <span class="col-sm-9">
  389 + {{line.lowCustomerPercent}}
  390 + </span>
  391 + </div>
  392 + <div class="col-sm-6">
  393 + <label class="col-sm-3 control-label">间隔等级：</label>
  394 + <span class="col-sm-9">
  395 + {{line.divideLevel}}
  396 + </span>
  397 + </div>
  398 + <div class="col-sm-6">
  399 + <label class="col-sm-3 control-label">是否挂牌：</label>
  400 + <span class="col-sm-9">
  401 + {{line.hasTimelists}}
  402 + </span>
  403 + </div>
  404 + <div class="col-sm-6">
  405 + <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
  406 + <span class="col-sm-9">
  407 + {{line.isMetro}}
  408 + </span>
  409 + </div>
  410 + <div class="col-sm-6">
  411 + <label class="col-sm-3 control-label">轨交时间：</label>
  412 + <span class="col-sm-9">
  413 + {{line.metroTime}}
  414 + </span>
  415 + </div>
  416 + <div class="col-sm-6">
  417 + <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
  418 + <span class="col-sm-9">
  419 + {{line.coldBonusType}}
  420 + </span>
  421 + </div>
  422 + <div class="col-sm-6">
  423 + <label class="col-sm-3 control-label">月度营收：</label>
  424 + <span class="col-sm-9">
  425 + {{line.revenuesMonth}}
  426 + </span>
  427 + </div>
  428 + <div class="col-sm-6">
  429 + <label class="col-sm-3 control-label">月度人次：</label>
  430 + <span class="col-sm-9">
  431 + {{line.personMonth}}
  432 + </span>
  433 + </div>
  434 + <div class="col-sm-6">
  435 + <label class="col-sm-3 control-label">月度里程：</label>
  436 + <span class="col-sm-9">
  437 + {{line.mileageMonth}}
  438 + </span>
  439 + </div>
  440 + <div class="col-sm-6">
  441 + <label class="col-sm-3 control-label">百公里人次：</label>
  442 + <span class="col-sm-9">
  443 + {{line.personMonthAvg}}
  444 + </span>
  445 + </div>
  446 + <div class="col-sm-6">
  447 + <label class="col-sm-3 control-label">营收：</label>
  448 + <span class="col-sm-9">
  449 + {{line.revenues}}
  450 + </span>
  451 + </div>
  452 + <div class="col-sm-6">
  453 + <label class="col-sm-3 control-label">人次：</label>
  454 + <span class="col-sm-9">
  455 + {{line.persons}}
  456 + </span>
  457 + </div>
  458 + <div class="col-sm-6">
  459 + <label class="col-sm-3 control-label">里程：</label>
  460 + <span class="col-sm-9">
  461 + {{line.mileages}}
  462 + </span>
  463 + </div>
  464 + <div class="col-sm-6">
  465 + <label class="col-sm-3 control-label">百公里人次：</label>
  466 + <span class="col-sm-9">
  467 + {{line.personAvg}}
  468 + </span>
  469 + </div>
  470 +
  471 + <div class="col-sm-6">
  472 + <label class="col-sm-3 control-label">启用时间：</label>
  473 + <span class="col-sm-9">
  474 + {{line.startDate}}
  475 +
  476 + </span>
  477 + </div>
  478 + <div class="col-sm-6">
  479 + <label class="col-sm-3 control-label">启用原因：</label>
  480 + <span class="col-sm-9">
  481 + <textarea name="startReason" class="form-control" readonly>{{line.startReason}}</textarea>
  482 + </span>
  483 + </div>
  484 +
  485 + <div class="col-sm-12" v-if="line.files">
  486 + <label class="col-sm-3 control-label">附件：</label>
  487 + <span class="col-sm-9" v-for="path in line.files.split(',')" >
  488 + <a :href="path.replace(path.split(':')[0] + ':' , '')">
  489 + {{path.split(":")[0]}}
  490 + </a>
  491 + </span>
  492 + </div>
  493 +
  494 +
  495 + </el-tab-pane>
  496 + <el-tab-pane label="对比数据" name="second" v-if="oldLine">
  497 + <div class="col-sm-6">
  498 + <label class="col-sm-3 control-label">线路名称：</label>
  499 + <span class="col-sm-9">
  500 + {{oldLine.lineName}}
  501 + </span>
  502 + </div>
  503 + <div class="col-sm-6">
  504 + <label class="col-sm-3 control-label">公司：</label>
  505 + <span class="col-sm-9">
  506 + {{oldLine.company}}
  507 + </span>
  508 + </div>
  509 + <div class="col-sm-6">
  510 + <label class="col-sm-3 control-label">分公司：</label>
  511 + <span class="col-sm-9">
  512 + {{oldLine.fCompany}}
  513 + </span>
  514 + </div>
  515 + <div class="col-sm-6">
  516 + <label class="col-sm-3 control-label">主线路id：</label>
  517 + <span class="col-sm-9">
  518 + {{oldLine.pLineId}}
  519 + </span>
  520 + </div>
  521 + <div class="col-sm-6">
  522 + <label class="col-sm-3 control-label">营运方式：</label>
  523 + <span class="col-sm-9"> {{oldLine.serviceType}}</span>
  524 + </div>
  525 + <div class="col-sm-6">
  526 + <label class="col-sm-3 control-label">营运方式：</label>
  527 + <span class="col-sm-9"> {{oldLine.busType}}</span>
  528 + </div>
  529 + <div class="col-sm-6">
  530 + <label class="col-sm-3 control-label">线路属性：</label>
  531 + <span class="col-sm-9">
  532 + {{oldLine.lineLevel}}
  533 + </span>
  534 + </div>
  535 + <div class="col-sm-6">
  536 + <label class="col-sm-3 control-label">线路类型：</label>
  537 + <span class="col-sm-9">
  538 +
  539 + {{oldLine.lineType}}
  540 +
  541 + </span>
  542 + </div>
  543 + <div class="col-sm-6">
  544 + <label class="col-sm-3 control-label">区属：</label>
  545 + <span class="col-sm-9">
  546 + {{oldLine.district}}
  547 + </span>
  548 + </div>
  549 + <div class="col-sm-6">
  550 + <label class="col-sm-3 control-label">是否区内：</label>
  551 + <span class="col-sm-9">
  552 + {{oldLine.inoutDistrict}}
  553 + </span>
  554 + </div>
  555 + <div class="col-sm-6">
  556 + <label class="col-sm-3 control-label">营运状态：</label>
  557 + <span class="col-sm-9">
  558 +
  559 + {{oldLine.serviceState}}
  560 + </span>
  561 + </div>
  562 + <div class="col-sm-6">
  563 + <label class="col-sm-3 control-label">车辆类型：</label>
  564 + <span class="col-sm-9">
  565 + {{oldLine.busType}}
  566 + </span>
  567 + </div>
  568 + <div class="col-sm-6">
  569 + <label class="col-sm-3 control-label">是否空调：</label>
  570 + <span class="col-sm-9">
  571 +
  572 + {{oldLine.airConditionerType}}
  573 + </span>
  574 + </div>
  575 + <div class="col-sm-6">
  576 + <label class="col-sm-3 control-label">售票类型：</label>
  577 + <span class="col-sm-9">
  578 + {{oldLine.sellTicketType}}
  579 + </span>
  580 + </div>
  581 + <div class="col-sm-6">
  582 + <label class="col-sm-3 control-label">运营时间：</label>
  583 + <span class="col-sm-9">
  584 + {{oldLine.serviceTime}}
  585 + </span>
  586 + </div>
  587 + <div class="col-sm-6">
  588 + <label class="col-sm-3 control-label">线路长度：</label>
  589 + <span class="col-sm-9">
  590 + {{oldLine.lineDistance}}
  591 + </span>
  592 + </div>
  593 + <div class="col-sm-6">
  594 + <label class="col-sm-3 control-label">线路编码：</label>
  595 + <span class="col-sm-9">
  596 + {{oldLine.lineCode}}
  597 + </span>
  598 + </div>
  599 + <div class="col-sm-6">
  600 + <label class="col-sm-3 control-label">授权年限：</label>
  601 + <span class="col-sm-9">
  602 + {{oldLine.warrantYear}}
  603 + </span>
  604 + </div>
  605 + <div class="col-sm-6">
  606 + <label class="col-sm-3 control-label">授权起始日期：</label>
  607 + <span class="col-sm-9">
  608 + {{oldLine.warrantStartTime}}
  609 + </span>
  610 + </div>
  611 + <div class="col-sm-6">
  612 + <label class="col-sm-3 control-label">授权结束日期：</label>
  613 + <span class="col-sm-9">
  614 + {{oldLine.warrantEndTime}}
  615 + </span>
  616 + </div>
  617 + <div class="col-sm-6">
  618 + <label class="col-sm-3 control-label">撤销日期：</label>
  619 + <span class="col-sm-9">
  620 + {{oldLine.planCancelTime}}
  621 + </span>
  622 + </div>
  623 + <div class="col-sm-6">
  624 + <label class="col-sm-3 control-label">实际撤销日期：</label>
  625 + <span class="col-sm-9">
  626 + {{oldLine.cancelTime}}
  627 + </span>
  628 + </div>
  629 + <div class="col-sm-6">
  630 + <label class="col-sm-3 control-label">撤销原因：</label>
  631 + <span class="col-sm-9">
  632 + <textarea name="cancelReason" class="form-control" readonly>{{oldLine.cancelReason}}</textarea>
  633 + </span>
  634 + </div>
  635 + <div class="col-sm-6">
  636 + <label class="col-sm-3 control-label">备注：</label>
  637 + <span class="col-sm-9">
  638 + <textarea name="remark" class="form-control" readonly>{{oldLine.remark}}</textarea>
  639 + </span>
  640 + </div>
  641 + <div class="col-sm-6">
  642 + <label class="col-sm-3 control-label">是否逻辑删除：</label>
  643 + <span class="col-sm-9">
  644 +
  645 + {{oldLine.isLogicDelete}}
  646 + </span>
  647 + </div>
  648 + <div class="col-sm-6">
  649 + <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
  650 + <span class="col-sm-9">
  651 + {{oldLine.timeSchedule}}
  652 + </span>
  653 + </div>
  654 + <div class="col-sm-6">
  655 + <label class="col-sm-3 control-label">停车场：</label>
  656 + <span class="col-sm-9">
  657 + {{oldLine.park}}
  658 + </span>
  659 + </div>
  660 + <div class="col-sm-6">
  661 + <label class="col-sm-3 control-label">是否权证：</label>
  662 + <span class="col-sm-9">
  663 + {{oldLine.isWarran}}
  664 + </span>
  665 + </div>
  666 + <div class="col-sm-6">
  667 + <label class="col-sm-3 control-label">道路类型：</label>
  668 + <span class="col-sm-9">
  669 + {{oldLine.roadType}}
  670 + </span>
  671 + </div>
  672 + <div class="col-sm-6">
  673 + <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
  674 + <span class="col-sm-9">
  675 + {{oldLine.ticketPrice}}
  676 + </span>
  677 + </div>
  678 + <div class="col-sm-6">
  679 + <label class="col-sm-3 control-label">首站：</label>
  680 + <span class="col-sm-9">
  681 + {{oldLine.firstStation}}
  682 + </span>
  683 + </div>
  684 + <div class="col-sm-6">
  685 + <label class="col-sm-3 control-label">起讫站：</label>
  686 + <span class="col-sm-9">
  687 + {{oldLine.startEnd}}
  688 + </span>
  689 + </div>
  690 + <div class="col-sm-6">
  691 + <label class="col-sm-3 control-label">首战时间：</label>
  692 + <span class="col-sm-9">
  693 + {{oldLine.firstTime}}
  694 + </span>
  695 + </div>
  696 + <div class="col-sm-6">
  697 + <label class="col-sm-3 control-label">末站：</label>
  698 + <span class="col-sm-9">
  699 + {{oldLine.lastStation}}
  700 + </span>
  701 + </div>
  702 + <div class="col-sm-6">
  703 + <label class="col-sm-3 control-label">末站首战时间：</label>
  704 + <span class="col-sm-9">
  705 + {{oldLine.lastTime}}
  706 + </span>
  707 + </div>
  708 + <div class="col-sm-6">
  709 + <label class="col-sm-3 control-label">上行里程数：</label>
  710 + <span class="col-sm-9">
  711 + {{oldLine.mileageUp}}
  712 + </span>
  713 + </div>
  714 + <div class="col-sm-6">
  715 + <label class="col-sm-3 control-label">下行里程数：</label>
  716 + <span class="col-sm-9">
  717 + {{oldLine.mileageDown}}
  718 + </span>
  719 + </div>
  720 + <div class="col-sm-6">
  721 + <label class="col-sm-3 control-label">平均里程数：</label>
  722 + <span class="col-sm-9">
  723 + {{oldLine.averageMileage}}
  724 + </span>
  725 + </div>
  726 + <div class="col-sm-6">
  727 + <label class="col-sm-3 control-label">站级数(上行)：</label>
  728 + <span class="col-sm-9">
  729 + {{oldLine.stationUp}}
  730 + </span>
  731 + </div>
  732 + <div class="col-sm-6">
  733 + <label class="col-sm-3 control-label">站级数(下行)：</label>
  734 + <span class="col-sm-9">
  735 + {{oldLine.stationDown}}
  736 + </span>
  737 + </div>
  738 + <div class="col-sm-6">
  739 + <label class="col-sm-3 control-label">行驶时间(上行)：</label>
  740 + <span class="col-sm-9">
  741 + {{oldLine.travelTimeUp}}
  742 + </span>
  743 + </div>
  744 + <div class="col-sm-6">
  745 + <label class="col-sm-3 control-label">行驶时间(下行)：</label>
  746 + <span class="col-sm-9">
  747 + {{oldLine.travelTimeDown}}
  748 + </span>
  749 + </div>
  750 + <div class="col-sm-6">
  751 + <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
  752 + <span class="col-sm-9">
  753 + {{oldLine.travelIntervalUp}}
  754 + </span>
  755 + </div>
  756 + <div class="col-sm-6">
  757 + <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
  758 + <span class="col-sm-9">
  759 + {{oldLine.travelIntervalDown}}
  760 + </span>
  761 + </div>
  762 + <div class="col-sm-6">
  763 + <label class="col-sm-3 control-label">经营权证（大巴）：</label>
  764 + <span class="col-sm-9">
  765 + {{oldLine.warrantVehiclesLarge}}
  766 + </span>
  767 + </div>
  768 + <div class="col-sm-6">
  769 + <label class="col-sm-3 control-label">经营权证（中巴）：</label>
  770 + <span class="col-sm-9">
  771 + {{oldLine.warrantVehiclesMiddle}}
  772 + </span>
  773 + </div>
  774 + <div class="col-sm-6">
  775 + <label class="col-sm-3 control-label">实际配车数：</label>
  776 + <span class="col-sm-9">
  777 + {{oldLine.vehiclesNumber}}
  778 + </span>
  779 + </div>
  780 + <div class="col-sm-6">
  781 + <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
  782 + <span class="col-sm-9">
  783 + {{oldLine.numberVehiclesLarge}}
  784 + </span>
  785 + </div>
  786 + <div class="col-sm-6">
  787 + <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
  788 + <span class="col-sm-9">
  789 + {{oldLine.numberVehiclesMiddle}}
  790 + </span>
  791 + </div>
  792 + <div class="col-sm-6">
  793 + <label class="col-sm-3 control-label">车辆自编号：</label>
  794 + <span class="col-sm-9">
  795 + {{oldLine.carPlate}}
  796 + </span>
  797 + </div>
  798 + <div class="col-sm-6">
  799 + <label class="col-sm-3 control-label">线路总配人数：</label>
  800 + <span class="col-sm-9">
  801 + {{oldLine.numberPerson}}
  802 + </span>
  803 + </div>
  804 + <div class="col-sm-6">
  805 + <label class="col-sm-3 control-label">人数司机：</label>
  806 + <span class="col-sm-9">
  807 + {{oldLine.numberPersonDriver}}
  808 + </span>
  809 + </div>
  810 + <div class="col-sm-6">
  811 + <label class="col-sm-3 control-label">售票员数：</label>
  812 + <span class="col-sm-9">
  813 + {{oldLine.numberPersonSales}}
  814 + </span>
  815 + </div>
  816 + <div class="col-sm-6">
  817 + <label class="col-sm-3 control-label">新能源车数：</label>
  818 + <span class="col-sm-9">
  819 + {{oldLine.busEvNumber}}
  820 + </span>
  821 + </div>
  822 + <div class="col-sm-6">
  823 + <label class="col-sm-3 control-label">线路走向：</label>
  824 + <span class="col-sm-9">
  825 + <textarea name="directions" class="form-control" readonly>{{oldLine.directions}}</textarea>
  826 + </span>
  827 + </div>
  828 + <div class="col-sm-6">
  829 + <label class="col-sm-3 control-label">经营权证数：</label>
  830 + <span class="col-sm-9">
  831 + {{oldLine.numberOfManage}}
  832 + </span>
  833 + </div>
  834 + <div class="col-sm-6">
  835 + <label class="col-sm-3 control-label">站点名称：</label>
  836 + <span class="col-sm-9">
  837 + <textarea name="halfwayStation" class="form-control" readonly>{{oldLine.halfwayStation}}</textarea>
  838 + </span>
  839 + </div>
  840 + <div class="col-sm-6">
  841 + <label class="col-sm-3 control-label">高峰系数：</label>
  842 + <span class="col-sm-9">
  843 + {{oldLine.fullCustomerPercent}}
  844 + </span>
  845 + </div>
  846 + <div class="col-sm-6">
  847 + <label class="col-sm-3 control-label">低谷系数：</label>
  848 + <span class="col-sm-9">
  849 + {{oldLine.lowCustomerPercent}}
  850 + </span>
  851 + </div>
  852 + <div class="col-sm-6">
  853 + <label class="col-sm-3 control-label">间隔等级：</label>
  854 + <span class="col-sm-9">
  855 + {{oldLine.divideLevel}}
  856 + </span>
  857 + </div>
  858 + <div class="col-sm-6">
  859 + <label class="col-sm-3 control-label">是否挂牌：</label>
  860 + <span class="col-sm-9">
  861 + {{oldLine.hasTimelists}}
  862 + </span>
  863 + </div>
  864 + <div class="col-sm-6">
  865 + <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
  866 + <span class="col-sm-9">
  867 + {{oldLine.isMetro}}
  868 + </span>
  869 + </div>
  870 + <div class="col-sm-6">
  871 + <label class="col-sm-3 control-label">轨交时间：</label>
  872 + <span class="col-sm-9">
  873 + {{oldLine.metroTime}}
  874 + </span>
  875 + </div>
  876 + <div class="col-sm-6">
  877 + <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
  878 + <span class="col-sm-9">
  879 + {{oldLine.coldBonusType}}
  880 + </span>
  881 + </div>
  882 + <div class="col-sm-6">
  883 + <label class="col-sm-3 control-label">月度营收：</label>
  884 + <span class="col-sm-9">
  885 + {{oldLine.revenuesMonth}}
  886 + </span>
  887 + </div>
  888 + <div class="col-sm-6">
  889 + <label class="col-sm-3 control-label">月度人次：</label>
  890 + <span class="col-sm-9">
  891 + {{oldLine.personMonth}}
  892 + </span>
  893 + </div>
  894 + <div class="col-sm-6">
  895 + <label class="col-sm-3 control-label">月度里程：</label>
  896 + <span class="col-sm-9">
  897 + {{oldLine.mileageMonth}}
  898 + </span>
  899 + </div>
  900 + <div class="col-sm-6">
  901 + <label class="col-sm-3 control-label">百公里人次：</label>
  902 + <span class="col-sm-9">
  903 + {{oldLine.personMonthAvg}}
  904 + </span>
  905 + </div>
  906 + <div class="col-sm-6">
  907 + <label class="col-sm-3 control-label">营收：</label>
  908 + <span class="col-sm-9">
  909 + {{oldLine.revenues}}
  910 + </span>
  911 + </div>
  912 + <div class="col-sm-6">
  913 + <label class="col-sm-3 control-label">人次：</label>
  914 + <span class="col-sm-9">
  915 + {{oldLine.persons}}
  916 + </span>
  917 + </div>
  918 + <div class="col-sm-6">
  919 + <label class="col-sm-3 control-label">里程：</label>
  920 + <span class="col-sm-9">
  921 + {{oldLine.mileages}}
  922 + </span>
  923 + </div>
  924 + <div class="col-sm-6">
  925 + <label class="col-sm-3 control-label">百公里人次：</label>
  926 + <span class="col-sm-9">
  927 + {{oldLine.personAvg}}
  928 + </span>
  929 + </div>
  930 +
  931 + <div class="col-sm-6">
  932 + <label class="col-sm-3 control-label">启用时间：</label>
  933 + <span class="col-sm-9">
  934 + {{oldLine.startDate}}
  935 +
  936 + </span>
  937 + </div>
  938 + <div class="col-sm-6">
  939 + <label class="col-sm-3 control-label">启用原因：</label>
  940 + <span class="col-sm-9">
  941 + <textarea name="startReason" class="form-control" readonly>{{oldLine.startReason}}</textarea>
  942 + </span>
  943 + </div>
  944 +
  945 + <div class="col-sm-12" v-if="oldLine.files">
  946 + <label class="col-sm-3 control-label">附件：</label>
  947 + <span class="col-sm-9" v-for="path in oldLine.files.split(',')" >
  948 + <a :href="path.replace(path.split(':')[0] + ':' , '')">
  949 + {{path.split(":")[0]}}
  950 + </a>
  951 + </span>
  952 + </div>
  953 +
  954 + </el-tab-pane>
  955 + </el-tabs>
  956 + </el-col>
  957 + </el-row>
  958 +
  959 + </div>
  960 + <th:block th:include="include :: footer" />
  961 + <th:block th:include="include :: bootstrap-suggest-js" />
  962 +
  963 +
  964 +
  965 + <script th:inline="javascript">
  966 +
  967 +
  968 + var dicts = [[${@dict.getType("")}]];
  969 +
  970 + $("#text").bsSuggest({
  971 + url : "/system/lineHistory/getListForMap",
  972 + effectiveFields : [ "lineName" ],
  973 + searchFields : [ "lineName"],
  974 + effectiveFieldsAlias : {
  975 + lineName : "线路名"
  976 + },
  977 + clearable : true,
  978 + idField : "id",
  979 + keyField : "lineName",
  980 + processData : function(json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
  981 + var data = {
  982 + 'value' : []
  983 + };
  984 +
  985 + for ( var i in json) {
  986 + data.value.push(json[i]);
  987 + }
  988 +
  989 + //字符串转化为 js 对象
  990 + return data;
  991 + }
  992 + }).on('onDataRequestSuccess', function(e, result) {
  993 + console.log('onDataRequestSuccess: ', result);
  994 + }).on('onSetSelectValue', function(e, selectedData, selectedRawData) {
  995 +
  996 + $.get("/system/lineHistory/getListByName",{name:selectedData.key},function(data){
  997 +
  998 + getData(data);
  999 +
  1000 + });
  1001 +
  1002 + });
  1003 +
  1004 +
  1005 + function getData(data){
  1006 + for(var index in data){
  1007 + var obj = data[index];
  1008 +
  1009 + for(var field in obj){
  1010 +
  1011 + var value = data[index][field];
  1012 +
  1013 + if(field == "roadType" || field == "busType"){
  1014 + if(data[index][field] != null){
  1015 +
  1016 + var arr = value.split(",");
  1017 + value = "";
  1018 + for(var i in arr){
  1019 + for(var j in dicts[field]){
  1020 + if(dicts[field][j].dictValue == arr[i]){
  1021 + value += dicts[field][j].dictLabel + ","
  1022 + break;
  1023 + }
  1024 + }
  1025 +
  1026 + }
  1027 +
  1028 +
  1029 + data[index][field] = value.substring(0,value.length -1);
  1030 +
  1031 + }
  1032 + continue;
  1033 + }
  1034 +
  1035 + if(field == "isLogicDelete" || field == "inoutDistrict"|| field == "isMetro" || field == "hasTimelists"){
  1036 + for(var j in dicts["trueFalse"]){
  1037 + if(dicts["trueFalse"][j].dictValue == value){
  1038 + value = dicts["trueFalse"][j].dictLabel;
  1039 + data[index][field] = value;
  1040 + break;
  1041 + }
  1042 + }
  1043 +
  1044 + continue;
  1045 + }
  1046 +
  1047 + if(field == "lineUpdateType")
  1048 + console.log("123");
  1049 +
  1050 + if(dicts[field]){
  1051 + for(var j in dicts[field]){
  1052 + if(dicts[field][j].dictValue == value){
  1053 + value = dicts[field][j].dictLabel;
  1054 + data[index][field] = value;
  1055 + break;
  1056 + }
  1057 + }
  1058 + continue;
  1059 + }
  1060 +
  1061 + }
  1062 +
  1063 +
  1064 + if(!data[index].lineUpdateType){
  1065 + data[index].lineUpdateType = '初始化';
  1066 + }
  1067 +
  1068 + }
  1069 +
  1070 + vueObj._data.lines = data;
  1071 +
  1072 + console.log(data);
  1073 + }
  1074 +
  1075 + var vueObj = new Vue({
  1076 + el: '#context',
  1077 + data: function() {
  1078 + return {
  1079 + tab: 'first',
  1080 + lines : null,
  1081 + line:null,
  1082 + oldLine: null,
  1083 +
  1084 + visible: false }
  1085 + },
  1086 + methods:{
  1087 + change(index){
  1088 + console.log(index);
  1089 +
  1090 + this.line = this.lines[index];
  1091 +
  1092 + this.oldLine = this.lines[index+1];
  1093 +
  1094 + },
  1095 +
  1096 + }
  1097 + })
  1098 + var dicts = [[${@dict.getType('')}]];
  1099 +
  1100 + var editFlag = [[${@permission.hasPermi('system:lineHistory:edit')}]];
  1101 + var removeFlag = [[${@permission.hasPermi('system:lineHistory:remove')}]];
  1102 + var prefix = ctx + "system/lineHistory";
  1103 +
  1104 + $(function() {
  1105 + var allDicts = {};
  1106 +
  1107 + for(var i in dicts){
  1108 + if(!allDicts[dicts[i].dictType]){
  1109 + allDicts[dicts[i].dictType] = [];
  1110 + }
  1111 + allDicts[dicts[i].dictType].push(dicts[i]);
  1112 + }
  1113 +
  1114 + dicts = allDicts;
  1115 +
  1116 + });
  1117 + </script>
  1118 +
  1119 + <style>
  1120 + .info{
  1121 + margin-top:5px;
  1122 + }
  1123 +
  1124 +.col_checkbox {
  1125 + width: 33%;
  1126 + float: left;
  1127 +}
  1128 +</style>
  1129 +</body>
  1130 +</html>
0 \ No newline at end of file 1131 \ No newline at end of file