update

潘钊
1 parent df6bf5a4
Showing 13 changed files with 194 additions and 82 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/real_control_v2/fragments/geo/calc_station_space.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/js/data/data_gps.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/utils/svg_chart_tooltip.js
src/main/resources/static/real_control_v2/main.html
src/main/resources/static/real_control_v2/mapmonitor/js/real.js
@@ -74,8 +74,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
 	public Map<String, Object> destroy(@RequestParam String idsStr
 			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
-			@RequestParam String remarks/*, @RequestParam String reason, @RequestParam(defaultValue = "0") int spaceNum*/) {
-		return scheduleRealInfoService.destroy(idsStr/*, spaceAdjust*/, remarks/*, reason, spaceNum*/);
+			@RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
+		return scheduleRealInfoService.destroy(idsStr/*, spaceAdjust*/, remarks, adjustExps/*, spaceNum*/);
 	}
 	/**
@@ -128,6 +128,8 @@ public class ScheduleRealInfo {
 	/**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
 	private int status;
+
+	private String adjustExps;
 	/** 是否是临加班次 */
 	private boolean sflj;
@@ -817,4 +819,12 @@ public class ScheduleRealInfo {
 	public void setLate(boolean late) {
 		this.late = late;
 	}
+
+	public String getAdjustExps() {
+		return adjustExps;
+	}
+
+	public void setAdjustExps(String adjustExps) {
+		this.adjustExps = adjustExps;
+	}
 }
@@ -17,7 +17,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj/*,String nbbm,String jsy,String spy*/);
-	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks/*, String reason, int spaceNum*/);
+	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks, String reason/*, int spaceNum*/);
 	List<Map<String, String>> findDriverByLine(String lineCode);
@@ -154,7 +154,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
 	@Override
-	public Map<String, Object> destroy(String idsStr, /*int spaceAdjust, */String remarks/*, String reason, int spaceNum*/) {
+	public Map<String, Object> destroy(String idsStr, /*int spaceAdjust, */String remarks, String reason/*, int spaceNum*/) {
 		Map<String, Object> map = new HashMap<>();
 		List<ScheduleRealInfo> rsList = new ArrayList<>();
@@ -170,7 +170,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					map.put("msg", "不必要的重复烂班！");
 					return map;
 				}
-				
+
+				schedule.setAdjustExps(reason);
 				schedule.destroy();
 				schedule.addRemarks(remarks);
@@ -405,7 +405,7 @@ $(function(){
 				,item = lsData[i];
 			//$.get('/realMap/findRouteByLine', {lineCode: item.lineCode}, function(rs){
-			$.get('/realSchedule/findRouteByLine', {lineCode: item.lineCode}, function(rs){
+				$.get('/realSchedule/findRouteByLine', {lineCode: item.lineCode}, function(rs){
 				if(rs && rs.lineId){
 					cacheData[item.lineCode] = rs;
 					i ++;
@@ -4,7 +4,7 @@
     <div style="text-align: center;padding-top: 30px;" class="calcBeforePanel">
         <p style="margin: 9px 0 9px 0;">当前站点间里程数据取自 <a target="_blank" id="stationRouteLink">基础信息->线路信息->站点详细</a>
             你可以手动编辑。</p>
-        <p style="margin: 9px 0 9px 0;">此外，我们提供另一种选择，根据路段和站点空间坐标计算站间距。计算后的数据将另存一份副本，不影响原数据。
+        <p style="margin: 9px 0 9px 0;">此外，我们提供另一种选择，根据路段和站点空间坐标计算站间距。计算后的数据将存储在本地。
         </p>
         <p style="margin: 0px 0 9px 0;">
             <span style="color: grey;font-size: 12px;">该操作会借用本地计算能力进行，如果你同意，请点击下方按钮！</span>
@@ -64,25 +64,23 @@
                 stations[1].sort(stationArrSort);
                 setCalcText('拼接路段，计算重叠区域');
-                console.log('路段', sections);
-                console.log('站点', stations);
-
-                //完整的线路路段（去掉重叠区域）
                 var fullSections = [
                     connectSections(sections[0]),
                     connectSections(sections[1])
                 ];
-                console.log('fullSections', fullSections);
-                setCalcText('计算上行站距');
-                calcStationSpace(stations[0], fullSections[0]);
-                /*$.each(stations[0], function (i) {
-                    if(i==0)
-                        return true;
+                setCalcText('计算上行数据');
+                var upCalcRs = calcStationSpace(stations[0], fullSections[0]);
+
+                setCalcText('计算下行数据');
+                var downCalcRs = calcStationSpace(stations[1], fullSections[1]);
+
+                var locData={
+                    stations: {up: upCalcRs,down: downCalcRs},
+                    sections: {up: fullSections[0], down: fullSections[1]}
+                };
-                    calcStationSpace(fullSections[0], this);
-                });*/
-                //fullSections[0]
+                window.localStorage.setItem('control_route_distance_'+sch.xlBm, JSON.stringify(locData));
             }
             function sectionArrSort(s1, s2) {
@@ -110,20 +108,20 @@
                 }
                 return coords;
             }
-            
+
             function connectCoords(all, subArr) {
-                var point,ts,len=all.length, inLine, sIndex=0;
-                if(len > 0){
+                var point, ts, len = all.length, inLine, sIndex = 0;
+                if (len > 0) {
                     $.each(subArr, function (i, p) {
                         ts = p.split(' ');
-                        point={latitude: parseFloat(ts[1]), longitude: parseFloat(ts[0])};
+                        point = {latitude: parseFloat(ts[1]), longitude: parseFloat(ts[0])};
                         //找到起始点
-                        sIndex=0;
-                        for(var j = 1; j < len; j++){
-                            inLine=geolib.isPointInLine(point, all[j - 1], all[j]);
+                        sIndex = 0;
+                        for (var j = 1; j < len; j++) {
+                            inLine = geolib.isPointInLine(point, all[j - 1], all[j]);
-                            if(inLine)
+                            if (inLine)
                                 break;
                             else
                                 sIndex = i;
@@ -132,7 +130,7 @@
                 }
                 //拼接
-                for(var i=sIndex; i<subArr.length; i++){
+                for (var i = sIndex; i < subArr.length; i++) {
                     ts = subArr[i].split(' ');
                     all.push({
                         latitude: parseFloat(ts[1]), longitude: parseFloat(ts[0])
@@ -143,55 +141,82 @@
             //计算站点间距
             function calcStationSpace(stations, coords) {
+                var nearArray = [];
+                for (var i = 1; i < stations.length; i++) {
+
+                    //点到线的最短距离 并计算交点坐标
+                    var rs = calcPointToLineNearPoint({
+                        latitude: stations[i].G_LATY,
+                        longitude: stations[i].G_LONX
+                    }, coords);
+                    rs.station = stations[i];
-                var point,pSection;
-                for(var i=1; i<stations.length; i++){
+                    //将交点插入线路中
+                    coords.splice(rs.index, 0, rs.intersection);
-                    point = {latitude: stations[i].G_LATY, longitude: stations[i].G_LONX};
-                    //最近的路段点
-                    //near=calcPointToArrayNear(point, coords);
-                    //计算前后点位，得到站点在路段中的位置
-                    //console.log('站点' + i + '最近索引', near, stations[i]);
-                    //pSection = calcPointInSection(point, coords);
-                    //console.log('站点' + i + '包含在路段'+pSection, stations[i]);
+                    nearArray.push(rs);
+                    //console.log('站点' + i + '计算结果', rs.intersection, rs);
                 }
-            }
-/*            //点在路段上， 返回路段
-            function calcPointInSection(point, array) {
-                /!*$.each(array, function (i) {
-
-                });*!/
-                var index=-1;
-                for(var i=1; i<array.length; i++){
-                    console.log(point, array[i - 1], array[i], geolib.getDistanceSimple(point, array[i - 1]));
-                    if(geolib.isPointInLine(point, array[i-1], array[i])){
-                        index=i;
-                        break;
+                //根据交点截断line，并计算距离
+                var s = 0, e, distance;
+                $.each(nearArray, function (i) {
+                    e = this.index;
+                    distance = 0;
+                    for (; s < e; s++) {
+                        distance += geolib.getDistance(coords[s], coords[s + 1]);
                     }
-                }
-                return index;
-            }*/
-
-            //计算点 与 点数组中最近的索引
-            /*function calcPointToArrayNear(point, array) {
-                //var rs, distance, temp;
-                var distances=[];
-                $.each(array, function (i) {
-                    distances.push({
-                        index: i,
-                        d: geolib.getDistanceSimple(this, point)
-                    });
+
+                    this.toDistance = distance;
+                    s = e;
                 });
+                return nearArray;
+            }
+
+            function calcPointToLineNearPoint(point, coords) {
+                var minRs, rs;
+                for (var i = 1; i < coords.length; i++) {
-                var rs=distances[0];
-                for(var i=1;i<distances.length;i++){
-                    if(rs.d > distances[i].d)
-                        rs=distances[i];
+                    var start = coords[i - 1], end = coords[i];
+                    var d1 = geolib.getDistance(start, point, 1, 3);
+                    var d2 = geolib.getDistance(point, end, 1, 3);
+                    var d3 = geolib.getDistance(start, end, 1, 3);
+
+                    var alpha = Math.acos((d1 * d1 + d3 * d3 - d2 * d2) / (2 * d1 * d3));
+                    var beta = Math.acos((d2 * d2 + d3 * d3 - d1 * d1) / (2 * d2 * d3));
+
+                    if (d3 < 0.5 || isNaN(alpha) || isNaN(beta))
+                        continue;
+
+                    rs = {index: i};
+                    if (alpha > Math.PI / 2) {
+                        rs.distance = d1;
+                        rs.intersection = start;
+                    }
+                    else if (beta > Math.PI / 2) {
+                        rs.distance = d2;
+                        rs.intersection = end;
+                    }
+                    else {
+                        rs.distance = Math.sin(alpha) * d1;
+                        rs.intersection = perpendularPoint(start, end, point);
+                    }
+
+                    if (!minRs || minRs.distance > rs.distance)
+                        minRs = rs
                 }
-                return rs;
-            }*/
+                return minRs;
+            }
+
+            //获取点 到 线的垂直交点
+            function perpendularPoint(lp1, lp2, p) {
+                var a = lp1.latitude - lp2.latitude, b = lp2.longitude - lp1.longitude, c = lp1.longitude * lp2.latitude - lp2.longitude * lp1.latitude;
+                var lon = (Math.pow(b, 2) * p.longitude - a * b * p.latitude - a * c) / (Math.pow(a, 2) + Math.pow(b, 2));
+                var lat = (Math.pow(a, 2) * p.latitude - a * b * p.longitude - b * c) / (Math.pow(a, 2) + Math.pow(b, 2));
+                return {longitude: lon, latitude: lat};
+            }
+
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -121,7 +121,7 @@
       tl-zzzx
     {{else if status == 0 && late}}
         tl-wd
-    {{/if}}">
+    {{/if}} fcsjActualCell">
         {{fcsjActual}}<span class="fcsj-diff">{{fcsj_diff}}</span>
     </dd>
     </script>
@@ -141,8 +141,8 @@
             <li><span>实发：</span>{{fcsjActual}}</li>
             <li><span>计达：</span>{{zdsj}}</li>
             <li><span>实达：</span>{{zdsjActual}}</li>
-            <li><span>驾驶员：</span>{{jName}}</li>
-            <li><span>售票员：</span>{{sName}}</li>
+            <li><span>驾驶员：</span>{{jGh}}/{{jName}}</li>
+            <li><span>售票员：</span>{{sGh}}/{{sName}}</li>
             <li><span>终点站：</span>{{zdzName}}</li>
         </ul>
     </script>
@@ -15,11 +15,23 @@ var gb_data_gps = (function() {
     };
     var refresh = function(cb) {
-        $.get('/gps/real/line', {
+        /*$.get('/gps/real/line', {
             lineCodes: gb_data_basic.line_idx
         }, function(rs) {
             refreshData(rs);
             cb();
+        });*/
+        $.ajax({
+            url: '/gps/real/line',
+            data:{lineCodes: gb_data_basic.line_idx},
+            success: function (rs) {
+                refreshData(rs);
+                cb();
+            },
+            error: function (xr, t) {
+                notify_err('刷新GPS失败，稍后重试' + t);
+                cb();
+            }
         });
     };
@@ -68,11 +68,42 @@ var gb_schedule_table = (function() {
             fcsjActualCellQtip();
             cb && cb();
         });
-    }
+    };
     function fcsjActualCellQtip(){
         //单击实发单元格显示详细信息
-        $('dd.fcsjActualCell').qtip({
+        $(document).on('click', 'dd.fcsjActualCell', function () {
+            var that=this;
+            $(that).qtip({
+                show: true,
+                content: {
+                    text: function(e) {
+                        var lineCode=$(that).parents('li.line_schedule').data('id')
+                            ,id=$(that).parents('dl').data('id')
+                            ,sch=line2Schedule[lineCode][id];
+                        return temps['sfsj_sch-detail-temp'](sch);
+                    }
+                }
+                ,style: {
+                    classes: 'qtip-dark qtip-rounded qtip-shadow'
+                },
+                hide: {
+                    fixed: true,
+                    delay: 300
+                },
+                position: {
+                    target: that,
+                    my: 'center left',
+                    at: 'center right'
+                },
+                events: {
+                    hidden: function (event, api) {
+                        $(this).qtip('destroy', true);
+                    }
+                }
+            });
+        });
+/*        $('dd.fcsjActualCell').qtip({
             show: 'click',
             content: {
                 text: function(e) {
@@ -92,8 +123,13 @@ var gb_schedule_table = (function() {
             position: {
                 my: 'center left',
                 at: 'center right'
+            },
+            events: {
+                hidden: function (event, api) {
+                    $(this).qtip('destroy', true);
+                }
             }
-        });
+        });*/
     }
     //重置序号
@@ -59,6 +59,8 @@ var gb_main_ep = new EventProxy(),
             //嵌入地图页面
             $('li.map-panel','#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
+
+            showUpdateDescription();
         });
         function g_emit(id) {
@@ -189,3 +191,27 @@ var open_modal = function(pageUrl, data, opt) {
             $(id).trigger('init', data);
     });
 };
+
+
+function showUpdateDescription() {
+    //更新说明
+    var updateDescription={
+        date: '2016-12-11',
+        text: '<h5>1、电子路单单击“实发”时，tootip内的人员显示工号。</h5><h5>2、修复某些情况下，班次被操作后 点击“实发” 无法显示tootip的情况。</h5><h5>3、获取GPS数据失败时，页面会弹出提示，并等待7秒后尝试再次获取。</h5>'
+    };
+
+    var storage = window.localStorage
+        ,key = 'update_' + updateDescription.date;
+    var text = storage.getItem(key);
+    if(!text){
+        var modal = '<div class="uk-modal" id="update-description-modal">'+
+            '    <div class="uk-modal-dialog">'+
+            '    <a class="uk-modal-close uk-close"></a>'+
+            '     <div class="uk-modal-header">'+
+            '      <h2>'+updateDescription.date+' 更新说明</h2></div>'+updateDescription.text+
+            '    </div>';
+
+        show_modal('#update-description-modal', modal);
+        storage.setItem(key, updateDescription.text);
+    }
+}
 \ No newline at end of file
@@ -52,15 +52,17 @@ var gb_svg_tooltip = (function () {
     //multiple gps tooltip
     $(document).on('mouseenter', 'svg .merge-item rect', function () {
         var rect = $(this);
-        if (rect.attr('aria-describedby'))
-            return;
+        //console.log('111', rect,rect.attr('aria-describedby'));
+        /*if (rect.attr('aria-describedby'))
+            return;*/
         //  var gps = gb_data_gps.findOne($(this).attr('_id').split('_')[1]);
+
+        $('.qtip-multi-gps').qtip('destroy', true);
         //获取聚合的gps
         var lineCode = $(this).parents('svg').data('code')
             , stop = $(this).parent().attr('_id').substr(7)//merger_
             , gpsArray = searchByStop(gb_data_gps.gpsByLineCode(lineCode), stop);
-        // console.log('stop...',stop);
         $(this).qtip({
             show: {
                 ready: true,
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" />
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" />
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" />
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slider.gradient.min.css" />
+    <!--<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slider.gradient.min.css" />-->
     <!-- main style -->
     <link rel="stylesheet" href="/real_control_v2/css/main.css" />
@@ -87,7 +87,7 @@
     <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/pagination.min.js"></script>
     <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js"></script>
     <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js"></script>
-    <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/slider.min.js"></script>
+    <!--<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/slider.min.js"></script>-->
     <!-- jquery contextMenu -->
     <script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"></script>
     <script src="/real_control_v2/assets/js/jquery.ui.position.min.js"></script>
@@ -10,7 +10,7 @@ var mapmonitor_load_ep = EventProxy.create(&#39;load_iMap&#39;, &#39;load_baidu&#39;, &#39;load_gaod
         .changeMap(gb_map_config.getConfig().map_type);
     //init tree
-    /*gb_map_gps_tree.init(function () {
+ /*   gb_map_gps_tree.init(function () {
         gb_map_overlay_mge.init();
         gb_map_spatial_data.init();
     });*/