1.英文翻译缺漏及bug修复

王通
1 parent fd8b2921
Showing 29 changed files with 115 additions and 77 deletions
pom.xml
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/resources/application-test.properties
src/main/resources/datatools/config-test.properties
src/main/resources/message_en_US.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/favicon.ico
src/main/resources/static/gpsTest/test.html
src/main/resources/static/index.html
src/main/resources/static/other/video/video.html
src/main/resources/static/pages/base/carpark/js/add-vmap-world.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-map.js
src/main/resources/static/pages/base/section/js/add-vmap-world.js
src/main/resources/static/pages/base/station/js/station-positions-map.js
src/main/resources/static/pages/base/stationroute/css/bmap_base.css
src/main/resources/static/pages/base/stationroute/doublename_road.html
src/main/resources/static/pages/base/stationroute/js/routes-operation.js
src/main/resources/static/pages/excep/js/map.js
src/main/resources/static/pages/excep/js/outbound-map.js
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.38</version>
+			<version>8.0.33</version>
 		</dependency>
  
 		<dependency>
@@ -62,8 +62,18 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	 * @return int <sectionCode路段编码>
 	 */
 	@RequestMapping(value="doubleName", method = RequestMethod.POST)
-	public Map<String, Object> doubleName(@RequestParam Map<String, Object> map) {
-		return sectionService.doubleName(map);
+	public Map<String, Object> doubleName(Section section) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			section.setId(sectionRepository.findLatestSectionId() + 1);
+			sectionService.add(section);
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			log.error("", e);
+		}
+
+		return result;
 	}
  
 	@RequestMapping(value="add", method = RequestMethod.POST)
@@ -363,4 +363,19 @@ public class ServiceDataInterface {
  
         return result;
     }
+
+    @RequestMapping("/shiftsForDevice")
+    public List<ScheduleRealInfo> shiftsForDevice(
+            @RequestParam String device,
+            @RequestParam String secretKey) {
+
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+        String nbbm = BasicData.deviceId2NbbmMap.get(device);
+        if (nbbm == null) {
+            return null;
+        }
+
+        return dayOfSchedule.findByNbbm(nbbm);
+    }
 }
@@ -14,7 +14,7 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS
  
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.242/control_pd?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.168.152/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= root2jsp
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
@@ -41,7 +41,7 @@ spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
-http.gps.real.url= http://192.170.100.252:8080/transport_server/rtgps/
+http.gps.real.url= http://10.10.2.20:8080/transport_server/rtgps/
 ## gateway send directive
 ##http.send.directive = http://192.170.100.252:8080/transport_server/message/
 ## rfid data
@@ -5,17 +5,17 @@ datatools.kettle_properties=/datatools/kettle.properties
  
 # 2、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
-datatools.fileupload_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
+datatools.fileupload_dir=/home/bsth_control_u_d_files
 # ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
-datatools.trans_errordir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/erroroutput
+datatools.trans_errordir=/home/bsth_control_u_d_files/erroroutput
 # 临时输出文件目录
-datatools.trans_tempdir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/temp
+datatools.trans_tempdir=/home/bsth_control_u_d_files/temp
 # 模版文件目录
-datatools.trans_templatedir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/template
+datatools.trans_templatedir=/home/bsth_control_u_d_files/template
  
 # 3、数据导出配置信息
 # 导出数据文件目录配置（根据不同的环境需要修正）
-datatools.fileoutput_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
+datatools.fileoutput_dir=/home/bsth_control_u_d_files
  
 ##---------------------------- 时刻表数据相关ktr（以下）----------------------------##
 datatools.en_ttinfo_detail_meta_data_for_export=/datatools/ktrs/en/ttinfo-detail-metadata_for_export.ktr
@@ -9,7 +9,7 @@ txt-8=Currently it is a split shift, change the departure time, change the first
 txt-9=Change the departure time, change the first departure time of the specified road sign (the first departure time)
 txt-10=The addition was successful, and the original version of the line has been automatically generated for you. You can view it under the line version information!
 txt-11=Parking lots entered in the system basic information must draw a closed polygon geographic location before they can be included in the options
-txt-12=With 'Polygon Buffer' selected, draw a polygon area after confirming the center point, and then double-click the polygon area to continue the operation.
+txt-12=With &apos;Polygon Buffer&apos; selected, draw a polygon area after confirming the center point, and then double-click the polygon area to continue the operation.
 txt-13=The system generated the line ######{0} when obtaining the station and road section abnormalities! Please contact the administrator or check whether the network connection is abnormal!
 txt-14=Manual drawing: draw the parking lot range on the map manually , then double-click the right mouse button to save
 txt-15=If the deletion fails, the scheduling command may be up to a moment. Wait a few seconds before deleting it.After the shift is deleted, the scheduling instructions will be retained
@@ -45,7 +45,7 @@ txt-44=3.The system will automatically fill in the actual departure and arrival 
 txt-45=2.After enabling this option, the system will no longer rely on relevant positioning signals to execute shifts
 txt-46=The total number of shift road signs is less than the number of overtime road signs, then ignore the number of other shift road signs
 txt-47=2.Only update the current equipment number of the vehicle, and do not synchronize the historical equipment change records
-txt-48=Tried to open a new window, if you can't see it, it may be blocked by the browser
+txt-48=Tried to open a new window, if you can&apos;t see it, it may be blocked by the browser
 txt-49=If the "U-turn site" does not exist in the other direction, you need to manually select the second operation starting point
 txt-50=The line ID is missing,Please click back,Re-add line standard information
 txt-51=ID is missing,Please click back,Re-check the line standard information operation
@@ -73,8 +73,8 @@ txt-72=The added shift has a time conflict with the preceding and following shif
 txt-73=Remove equipment [<strong style="color: red;">######{0}</strong>] from list? If the device continues to send data to the platform, it will still be included
 txt-74=Timetable name [######{0}].<br/>Abolished schedules will not be included in the shift calculation regardless of whether they are enabled or not!
 txt-75=The server did not return data, please check your input parameters!
-txt-76=2)When the 'Circular Buffer' is selected, double-click the center point after confirming it to continue the operation
-txt-77=The system cannot generate the stations and sections for this line [######{0}]! Please click back to select other ways to plan'
+txt-76=2)When the &apos;Circular Buffer&apos; is selected, double-click the center point after confirming it to continue the operation
+txt-77=The system cannot generate the stations and sections for this line [######{0}]! Please click back to select other ways to plan&apos;
 txt-78=The shift switch was successful. After the switch, the delivery time of the shift is 0 minutes, which is meaningless, so delete the changed shift!
 txt-79=The system will no longer receive and display GPS points that are marked as invalid by the device itself. If the device continuously sends invalid points, it is equivalent to being offline.
 txt-80=2.The starting station different from the first selected shift will also be ignored
@@ -101,7 +101,7 @@ txt-100=The current first bad shift is the starting point, and adjust the interv
 txt-101=2)Draw new road segments by drawing lines, and add new road segments and road segment routes
 txt-102=Enter the cutting section state, please select the end point of this section!
 txt-103=The section was successfully cut, please select the end point of the next section
-txt-104=<strong>The system has not initialized the downstream stations on the line.</strong>Please click from the above to select any one of the following methods to plan the route's downstream station approach and exit paths.
+txt-104=<strong>The system has not initialized the downstream stations on the line.</strong>Please click from the above to select any one of the following methods to plan the route&apos;s downstream station approach and exit paths.
 txt-105=
 txt-106=The route was generated successfully. The generated route may have errors.Please click on the road segment first, drag to edit,then double-click to save!
 txt-107=B)Edit original Location: Edit the original location with site information 
@@ -183,7 +183,7 @@ txt-182=Parking lot location missing,whether to automatically continue to add pa
 txt-183=
 txt-184=
 txt-185=
-txt-186=Access is denied, you don't have this permission!
+txt-186=Access is denied, you don&apos;t have this permission!
 txt-187=
 txt-188=
 txt-189=No downshift, data cannot be exported!
@@ -204,7 +204,7 @@ txt-203=Added scrapped vehicle equipment data error file
 txt-204=
 txt-205=
 txt-206=Statistics of vehicle dispatch rate during morning peak hours on operating routes
-txt-207=No previous station, can't enter data!
+txt-207=No previous station, can&apos;t enter data!
 txt-208=Export the daily large interval details of the selected route
 txt-209=Please save the section information being edited first
 txt-210=
@@ -337,7 +337,7 @@ txt-336=Automatically adjust the interval of subsequent shifts to
 txt-337=I can swallow glass without hurting my body
 txt-338=Generate routes (stations and sections)
 txt-339=Generate route (stations and sections)
-txt-340=Select shift for the previous day's shift
+txt-340=Select shift for the previous day&apos;s shift
 txt-341=The coordinate points cannot be less than three
 txt-342=Please cancel all the points for cutting sections first
 txt-343=The first vehicle currently selected is the focus
@@ -428,7 +428,7 @@ txt-427=The user with login name [######{0}] has been unlocked successfully!
 txt-428=The system does not have the up and down starting and ending stations of this line
 txt-429=Route operation statistics daily report
 txt-430=Full-day operating mileage (km)(Note:The actual operation mileage, actual empty mileage and actual total mileage are include temporary mileage)
-txt-431=Controller's corresponding mapping address, such as:/module
+txt-431=Controller&apos;s corresponding mapping address, such as:/module
 txt-432=Total working hours: 15 minutes of reporting time + total time from exit to return, plus 10 minutes of re-driving time if there is another exit during this period
 txt-433=Operating vehicle time(Planned operating time/km)
 txt-434=
@@ -472,9 +472,9 @@ txt-471=Jingao Company (Fourth Branch)
 txt-472=Calculate expected arrival time and actual arrival time comparison
 txt-473=Off-line overspeed valve:
 txt-474=Save left menu permissions successfully!
-txt-475=User's subordinate roles have problems
+txt-475=User&apos;s subordinate roles have problems
 txt-476=Simulated trajectory (after)
-txt-477=This route is not available in Baidu Maps can't be systematically planned!
+txt-477=This route is not available in Baidu Maps can&apos;t be systematically planned!
 txt-478=The same car
 txt-479=Upload failed, route number is 0
 txt-480=Enter work rest and non-operating working hours
@@ -592,7 +592,7 @@ txt-591=Shift vehicle personnel daily statistics
 txt-592=Dispatcher work summary daily
 txt-593=Maximum interval time (seconds)
 txt-594=Maximum interval time (min)
-txt-595=Controller's corresponding mapping symbols, such as: /module
+txt-595=Controller&apos;s corresponding mapping symbols, such as: /module
 txt-596=Get parking lot location method
 txt-597=Daily statistics of personnel and vehicle changes
 txt-598=
@@ -872,7 +872,7 @@ txt-871=Valley maximum departure interval
 txt-872=Equipment message reporting record
 txt-873=Vehicle equipment data migration
 txt-874=Missing parking lot options?
-txt-875=I'm sure it's this shift.
+txt-875=I&apos;m sure it&apos;s this shift.
 txt-876=Timetable used, total {{$saScpdateCtrl.$$ds.length}}
 txt-877=Confirm remove the today&apos;s actual schedule of line [######{0}]?
 txt-878=Rule configuration details
@@ -1025,7 +1025,7 @@ txt-1024=Please enter the line name
 txt-1025=Failed to generate route!
 txt-1026=Connection to server timed out
 txt-1027=Route schedule schedule
-txt-1028=Select shift for the previous day's shift,please select an auto-complete shift.
+txt-1028=Select shift for the previous day&apos;s shift,please select an auto-complete shift.
 txt-1029=Route on-time rate details
 txt-1030=Searching for driver
 txt-1031=Route planning completed
@@ -1187,7 +1187,7 @@ txt-1186=Shift change and auto-completion
 txt-1187=Arrival buffer settings
 txt-1188=Clear unselected shifts
 txt-1189=Delay mechanism time:
-txt-1190=Update to the current day's shift schedule
+txt-1190=Update to the current day&apos;s shift schedule
 txt-1191=Description of the shift format,[1] represents turn over sign,[0] represents rest skip
 txt-1192=Initial shift personnel,
 txt-1193=Anting Old Street, Hejing Road
@@ -1586,7 +1586,7 @@ txt-1585=Issuing the instruction
 txt-1586=Intercepted instruction
 txt-1587=Start generating data
 txt-1588=Please select a branch
-txt-1589=Which days' GPS data to use
+txt-1589=Which days&apos; GPS data to use
 txt-1590=Peak stop gap
 txt-1591=Enter new password:
 txt-1592=Confirm new password:
@@ -2178,7 +2178,7 @@ txt-2177=Data before reorganization
 txt-2178=Data after reorganization
 txt-2179=Confirm to publish!
 txt-2180=Change car to [######{0}] continue operation
-txt-2181=I'm considering
+txt-2181=I&apos;m considering
 txt-2182=Cancel publishing!
 txt-2183=Are you sure you want to delete
 txt-2184=New equipment number
@@ -2187,7 +2187,7 @@ txt-2186=Associated timetable
 txt-2187=Cross lines timetable
 txt-2188=Branch
 txt-2189=Conductor employee number
-txt-2190=road section serial number
+txt-2190=Road section serial:
 txt-2191=Attention!!! Relevant "equipment debugging personnel" and "testing personnel" should not enter line scheduling in master mode.
 txt-2192=Revoke the actual arrival time {{jsonArray.old_sdsj}}
 txt-2193=Monthly oil storage report
@@ -2372,7 +2372,7 @@ txt-2371=
 txt-2372=Enter username
 txt-2373=Unknown direction
 txt-2374=Not yet open
-txt-2375=Use the new echart to draw pictures, and don't use d3 for now. I will put d3 into a new file later.
+txt-2375=Use the new echart to draw pictures, and don&apos;t use d3 for now. I will put d3 into a new file later.
 txt-2376=Equipment management
 txt-2377=Loading
 txt-2378=Phase setting
@@ -2991,10 +2991,10 @@ txt-2990=Temporary addition approach
 txt-2991=Extra appearance
 txt-2992=Click to Dial
 txt-2993=Fuel consumption per kilometer
-txt-2994=Today's hydrogen consumption {{hn}}
-txt-2995=Today's electricity consumption {{yh}}
+txt-2994=Today&apos;s hydrogen consumption {{hn}}
+txt-2995=Today&apos;s electricity consumption {{yh}}
 txt-2996=Oil filling(L)
-txt-2997=Today's fuel {{yh}}(L)
+txt-2997=Today&apos;s fuel {{yh}}(L)
 txt-2998=Fuel filling
 txt-2999=Departure delay
 txt-3000=Arrival delay
@@ -3648,7 +3648,7 @@ txt-3647=(Execute shift that departure time is ######{0})
 txt-3648=Hydrogen consumption
 txt-3649=Hydrogen filling amount
 txt-3650=Yes
-txt-3651=Don't understand!
+txt-3651=Don&apos;t understand!
 txt-3652=Team Six
 txt-3653=Team Five
 txt-3654=Medium capacity
@@ -3663,7 +3663,7 @@ txt-3662=
 txt-3663=Executed
 txt-3664=Vehicles are adjusted from {{jsonArray.old_nbbm}} to
 txt-3665=Extension number
-txt-3666=I'm sure
+txt-3666=I&apos;m sure
 txt-3667=Empty from {{qdzName}} to {{zdzName}}
 txt-3668=Exit {{qdzName}} to {{zdzName}}
 txt-3669=Shift:
@@ -3872,7 +3872,7 @@ txt-3871=User
 txt-3872=
 txt-3873=Content
 txt-3874=Status
-txt-3875=When the 'Circular Buffer' is selected, double-click the center point after confirming it to continue the operation
+txt-3875=When the &apos;Circular Buffer&apos; is selected, double-click the center point after confirming it to continue the operation
 txt-3876=Reduction
 txt-3877=Urea
 txt-3878=Name
@@ -4348,7 +4348,7 @@ txt-4347=######{0}(######{1}) Timetable details-&gt;Delete road sign
 txt-4348=######{0}(######{1}) Timetable details->Swap road sign
 txt-4349=######{0}(######{1}) Timetable details
 txt-4350=######{0}(######{1}) Timetable details->Data import from excel
-txt-4351=('Departure is exit parking lot' only affects shifts issued by the parking lot configured in the <a href="/pages/base/lineinformation/list.html?no={{conf.line.id}}" target="_blank" style="color: grey;margin: 0 2px;">[Line standard]</a>)
+txt-4351=(&apos;Departure is exit parking lot&apos; only affects shifts issued by the parking lot configured in the <a href="/pages/base/lineinformation/list.html?no={{conf.line.id}}" target="_blank" style="color: grey;margin: 0 2px;">[Line standard]</a>)
 txt-4352=Timetable analysis(summary)
 txt-4353=Arrival and departure details                [######{0}]   [######{1}]   [######{2}]   [######{3}]
 txt-4354=The actual total mileage includes temporary mileage
@@ -3,7 +3,7 @@
 #ms.mysql.username= root
 #ms.mysql.password= 123456
  
-ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.170.100.63/ms?useUnicode=true&characterEncoding=utf-8
-ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.driver= com.mysql.cj.jdbc.Driver
+ms.mysql.url= jdbc:mysql://10.10.2.20/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ms.mysql.username= schedule
+ms.mysql.password= fsodlgjiuigAQF2$9fs9
 \ No newline at end of file
@@ -84,7 +84,7 @@ form .item select {
 	<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
 	<script src="/assets/plugins/jquery.serializejson.js"></script>
 	<script
-		src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+		src="//api.map.baidu.com/api?v=2.0&ak=dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv"></script>
 	<script type="text/javascript"
 		src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>
 	<!-- moment.js 日期处理类库 -->
@@ -673,7 +673,7 @@
 <!-- 地图相关 -->
 <!-- 百度 -->
 <script
-		src="//api.map.baidu.com/api?v=3.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
+		src="//api.map.baidu.com/api?v=3.0&ak=dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv"
 		data-exclude=1></script>
 <script
 		src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
@@ -230,7 +230,7 @@
     <!-- 地图相关 -->
     <!-- 百度 -->
     <script
-            src="//api.map.baidu.com/api?v=3.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
+            src="//api.map.baidu.com/api?v=3.0&ak=dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv"
             data-exclude=1></script>
     <script
             src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
@@ -5,7 +5,7 @@ var addCarParkVmapWorlds = function() {
 				// 设置中心点,
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = 'dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv';
 				// 初始化百度地图
 				mapB = new BMap.Map("addCarParkbmap_basic");
 				//中心点和缩放级别
@@ -12,7 +12,7 @@ var CarParkPWorldsBMap = function () {
 				// 设置中心点,
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = 'dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv';
 				// 初始化百度地图
 				mapValue = new BMap.Map("carParkbmap_basic");
 				//中心点和缩放级别
@@ -3,7 +3,7 @@ var SectionVmapWorlds = function() {
 	var Bmap = {
 		init : function() {
 			var CENTER_POINT = {lng : 121.528733,lat : 31.237425};// 设置中心点.
-			var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';// 百度API Key
+			var bdKey = 'dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv';// 百度API Key
 			mapB = new BMap.Map("sectionBmap_basic");// 初始化百度地图
 			mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);//中心点和缩放级别
 			mapB.enableDragging(); //启用地图拖拽事件，默认启用(可不写)
@@ -50,7 +50,7 @@ var StationPositionsWorldsBMap = function () {
 			},
 			position : function(station, html, opts) {
 				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-				mapBValue.setZoom(17);
+				mapBValue.centerAndZoom(station.point, 17);
 		  		// 创建信息窗口
 		  		infoWindow = new BMap.InfoWindow(html, opts);
 		  	  	// 创建点
@@ -171,7 +171,7 @@ html,body{
 }*/
  
 .add_road_search_point_wrap{
-	width: 280px;
+	width: 300px;
 	height: 120px;
 	position: absolute;
 	top: 40px;
@@ -94,12 +94,12 @@
             submitHandler : function(f) {
                 var data = form.serializeJSON();
                 if(data.sectionrouteCode==i18n('txt-138')) {
-                    params.sectionrouteCode = '';
+                    params.sectionrouteCode = '100';
                 } else {
-                    params.sectionrouteCode = data.sectionrouteCode;
+                    params.sectionrouteCode = parseInt(data.sectionrouteCode) + 1;
                 }
                 params.versions = properties.versions;
-                $.post('/section/doubleName', params, function (res) {
+                $.post('/api/lssectionroute/add', params, function (res) {
                     if(res.status == 'SUCCESS') {
                         layer.msg(i18n('txt-3271'));
                     } else if (res.status == 'Failure') {
@@ -959,11 +959,13 @@ var RoutesOperation = (function () {
                     });
                     label.addEventListener('click', function () {
                         var params = {};
-                        params.lineId = startStationRoute.line.id;
+                        params['line.id'] = startStationRoute.line.id;
                         params.lineCode = startStationRoute.lineCode;
                         params.directions = startStationRoute.directions;
-                        params.stationRouteBegin = startStationRoute.stationName;
-                        params.stationRouteFinish = endStationRoute.stationName;
+                        //params.stationRouteBegin = startStationRoute.stationName;
+                        //params.stationRouteFinish = endStationRoute.stationName;
+                        params.sectionName = `${startStationRoute.stationName}-${endStationRoute.stationName}`;
+                        params['section.sectionName'] = params.sectionName;
                         layer.confirm(i18n('txt-3272'), {
                             btn : [ i18n('txt-1837'),i18n('txt-3327'),i18n('txt-3869')], icon: 3, title:i18n('txt-3816')
                             ,btn3: function(index, layero){
@@ -973,12 +975,17 @@ var RoutesOperation = (function () {
                             }
                         }, function(index, layero){
                             layer.close(index);
-                            params.route = $("#routePlanning").val();
-                            i18n4get('doublename_road.html', function (m) {
-                                $(pjaxContainer).append(m);
-                                $('#doublename_road_modal').trigger('modal.show', [params]);
-                            });
-                            operation.editMapStatusRemove();
+                            params['section.bsectionVectorWkt'] = $("#routePlanning").val();
+                            RoutesService.getSectionCode(function (sectionCode) {
+                                params['section.id'] = sectionCode;
+                                params['section.sectionCode'] = sectionCode;
+                                params.sectionCode = sectionCode;
+                                i18n4get('doublename_road.html', function (m) {
+                                    $(pjaxContainer).append(m);
+                                    $('#doublename_road_modal').trigger('modal.show', [params]);
+                                });
+                                operation.editMapStatusRemove();
+                            })
                         });
                     });
                     // 路径规划
@@ -992,12 +999,15 @@ var RoutesOperation = (function () {
  
                     function searchPolylinesSet(results) {
                         if (transit.getStatus() == BMAP_STATUS_SUCCESS) {
-                            var sectionArrayList = [];
+                            var sectionArrayList = [], bsectionVector = [];
                             for (i = 0; i < results.length; i++) {
-                                sectionArrayList = sectionArrayList.concat(results[i].getPolyline().getPath());
+                                sectionArrayList = sectionArrayList.concat(results[i].getPath());
                             }
                             sectionList = sectionArrayList;//JSON.stringify()
-                            $("#routePlanning").val(JSON.stringify(sectionArrayList));
+                            for (var i = 0;i < sectionArrayList.length;i++) {
+                                bsectionVector.push(sectionArrayList[i].lng + ' ' + sectionArrayList[i].lat);
+                            }
+                            $("#routePlanning").val('LINESTRING(' + bsectionVector.join(',') + ')');
                             var pointMap = new Map();
                             pointMap = sectionArrayList[sectionArrayList.length - 1];
                             var pointLabel = new BMap.Point(pointMap.lng, pointMap.lat);
@@ -24,7 +24,7 @@ var BasicMap = function () {
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
  
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = 'dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv';
  
 				// 初始化百度地图
 				mapBValue = new BMap.Map("BasicMap");
@@ -35,7 +35,7 @@ var WorldsBMap = function () {
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
  
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = 'dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv';
  
 				// 初始化百度地图
 				mapBValue = new BMap.Map("bmap_basic");
@@ -24,7 +24,7 @@ var SpeedingMap = function () {
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
  
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = 'dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv';
  
 				// 初始化百度地图
 				mapBValue = new BMap.Map("speedingMap");
@@ -15,11 +15,14 @@
  
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
-	   
+	.table-checkable tr>th:first-child, .table-checkable tr>td:first-child {
+		max-width: 100px;
+	}
  
  
-	   #ddrbBody   tr> td >span{
-	     word-break: keep-all;white-space:nowrap; 
+	   #ddrbBody  > tr> td >span{
+	     word-break: keep-all;white-space:nowrap;
+		   letter-spacing: normal;
 	   }
 </style>
  
@@ -18,7 +18,7 @@
 	   #forms > thead > tr> td >span{
 	    width: 5px; 
 		word-wrap: break-word; 
-		letter-spacing: 20px; 
+		letter-spacing: normal;
 	  }
  
 	  #forms   > thead > tr> td >label{
@@ -37,7 +37,7 @@ var realMap = (function() {
 	var city = "上海";
  
 	//百度API Key
-	var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+	var bdKey = 'dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv';
  
 	var bd_gps_info_win_opts = {
 	  		width : 190,
@@ -72,7 +72,7 @@
  
  
 <!-- 地图相关 -->
-<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv"></script>
 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
@@ -60,7 +60,7 @@
     <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">$$$$$${txt-3431}...</span>
 </div>
 <!-- 地图相关 -->
-<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv"></script>
 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
@@ -361,7 +361,7 @@
                 },
                 items: {
                     'edit': {
-                        name: '编辑'
+                        name: i18n('txt-4147')
                     },
                     'add': {
                         name: i18n('txt-1801')
@@ -110,7 +110,7 @@
 </script>
  
 <!-- 地图相关 -->
-<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=dr4jSsmL7M0b1kbUSVVAO7KbleSUNdpv"></script>
 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
@@ -4,8 +4,8 @@
             <div class="uk-form-row">
                 <span class="uk-form-label">$$$$$${txt-4094}</span>
                 <div class="uk-form-controls">
-                    <label><input type="radio" value="baidu" name="map_type" {{if map_type=='baidu'}}checked{{/if}}> $$$$$${txt-4125}</label>
-                    <label><input type="radio" value="gaode" name="map_type" {{if map_type=='gaode'}}checked{{/if}}> $$$$$${txt-4124}</label>
+                    <label style="display: none"><input type="radio" value="baidu" name="map_type" {{if map_type=='baidu'}}checked{{/if}}> $$$$$${txt-4125}</label>
+                    <label style="display: none"><input type="radio" value="gaode" name="map_type" {{if map_type=='gaode'}}checked{{/if}}> $$$$$${txt-4124}</label>
                     <label><input type="checkbox" name="traffic" {{if traffic}}checked{{/if}}> $$$$$${txt-2410}</label>
                 </div>
             </div>