Commit 1170f1603fcd92b0dce31548806f66ebe28af8f1
Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
Showing
6 changed files
with
10 additions
and
11 deletions
src/main/resources/static/pages/base/line/list.html
| ... | ... | @@ -347,7 +347,7 @@ |
| 347 | 347 | <a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a> |
| 348 | 348 | </td> |
| 349 | 349 | <td> |
| 350 | - <a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a> | |
| 350 | + <a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a> | |
| 351 | 351 | </td> |
| 352 | 352 | <td> |
| 353 | 353 | <a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a> | ... | ... |
src/main/resources/static/pages/base/roadspeed/add.html
| ... | ... | @@ -102,10 +102,10 @@ |
| 102 | 102 | <div class="col-md-9"> |
| 103 | 103 | <div class="icheck-list"> |
| 104 | 104 | <label> |
| 105 | - <input type="radio" class="icheck" name="baseRes" value=0 > 系统生成 | |
| 105 | + <input type="radio" class="icheck" name="baseRes" value=0 checked> 系统生成 | |
| 106 | 106 | </label> |
| 107 | 107 | <label > |
| 108 | - <input type="radio" class="icheck" name="baseRes" value=1 checked> 手动添加 | |
| 108 | + <input type="radio" class="icheck" name="baseRes" value=1 > 手动添加 | |
| 109 | 109 | </label> |
| 110 | 110 | </div> |
| 111 | 111 | </div> | ... | ... |
src/main/resources/static/pages/base/roadspeed/editroadspeed.html
| ... | ... | @@ -155,7 +155,7 @@ $('#edit_roadspeed_mobal').on('editRoadspeedMobal_show', function(e, map_,ajaxd, |
| 155 | 155 | }, |
| 156 | 156 | submitHandler : function(f) { |
| 157 | 157 | var params = form.serializeJSON(); |
| 158 | - params.bRoadVector = EditRoadspeedObj.getEitdRoadspeed().bRoadVector; | |
| 158 | + params.bRoadVector = Roadspeed.bRoadVector; | |
| 159 | 159 | error.hide(); |
| 160 | 160 | ajaxd.roadspeedUpdate(params,function(resuntDate) { |
| 161 | 161 | if(resuntDate.status=='SUCCESS') { |
| ... | ... | @@ -164,7 +164,6 @@ $('#edit_roadspeed_mobal').on('editRoadspeedMobal_show', function(e, map_,ajaxd, |
| 164 | 164 | }else { |
| 165 | 165 | // 弹出添加失败提示消息 |
| 166 | 166 | layer.msg('修改失败...'); |
| 167 | - | |
| 168 | 167 | } |
| 169 | 168 | $('#edit_roadspeed_mobal').modal('hide'); |
| 170 | 169 | closeMobleSetClean(); | ... | ... |
src/main/resources/static/pages/base/roadspeed/js/add-form-wizard.js
| ... | ... | @@ -146,8 +146,8 @@ var FormWizard = function() { |
| 146 | 146 | var stationStartValue = $('#stationStartInput').val(); |
| 147 | 147 | var stationEndValue = $('#stationEndInput').val(); |
| 148 | 148 | var paramsStationsArray = []; |
| 149 | - paramsStationsArray[0] = stationStartValue+'公交车站'; | |
| 150 | - paramsStationsArray[1]= stationEndValue+'公交车站'; | |
| 149 | + paramsStationsArray[0] = stationStartValue; | |
| 150 | + paramsStationsArray[1]= stationEndValue; | |
| 151 | 151 | $('#nameInput').val(stationStartValue + '至' + stationEndValue ); |
| 152 | 152 | if(baseResValue == 0) { |
| 153 | 153 | $('.leftUtils').hide(); |
| ... | ... | @@ -161,8 +161,8 @@ var FormWizard = function() { |
| 161 | 161 | }); |
| 162 | 162 | }); |
| 163 | 163 | }else if(baseResValue ==1) { |
| 164 | - SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue+'公交车站'); | |
| 165 | - SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue+'公交车站'); | |
| 164 | + SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue); | |
| 165 | + SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue); | |
| 166 | 166 | // SectionVmapWorlds.drawingManagerOpen(); |
| 167 | 167 | } |
| 168 | 168 | $('html,body').animate({scrollTop: ($('#form-wizard-info').offset().top-5) + "px"},500); | ... | ... |
src/main/resources/static/pages/base/roadspeed/js/add-vmap-world.js
| ... | ... | @@ -174,7 +174,7 @@ var SectionVmapWorlds = function() { |
| 174 | 174 | var f = arguments.callee; |
| 175 | 175 | var poiOne = new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat); |
| 176 | 176 | var poiTwo = new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat); |
| 177 | - var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB},onPolylinesSet: searchPolylinesSet}); | |
| 177 | + var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB,enableDragging : true},onPolylinesSet: searchPolylinesSet}); | |
| 178 | 178 | function searchPolylinesSet(results){ |
| 179 | 179 | if (transit.getStatus() != BMAP_STATUS_SUCCESS){ |
| 180 | 180 | }else { | ... | ... |
src/main/resources/static/real_control_v2/main.html
| ... | ... | @@ -117,7 +117,7 @@ |
| 117 | 117 | <!-- 高德 --> |
| 118 | 118 | <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script> |
| 119 | 119 | <!-- jquery --> |
| 120 | -<script src="http://180.168.57.114:4244/Scripts/jquery-3.2.1.min.js"></script> | |
| 120 | +<script src="/real_control_v2/assets/js/jquery.min.js"></script> | |
| 121 | 121 | <!-- jquery actual --> |
| 122 | 122 | <script src="/real_control_v2/assets/js/jquery.actual.min.js" merge="plugins"></script> |
| 123 | 123 | <!-- jquery.serializejson JSON序列化插件 --> | ... | ... |