其他公交公司用的公交电子站牌页面组件

1、修正gps数据显示bug，添加方向数据到moodel中并添加到d3的自定义数据key中，具体查看models/下的代码

其他公交公司用的公交电子站牌页面组件
1、修正gps数据显示bug，添加方向数据到moodel中并添加到d3的自定义数据key中，具体查看models/下的代码
徐烜
1 parent 61207941
Showing 3 changed files with 14 additions and 7 deletions
front-end/h5/src/components/core/plugins/bsth/othergj/linechart/chart/models/eBusStopGpsData.js
front-end/h5/src/components/core/plugins/bsth/othergj/linechart/list/models/othergj-eBusStop-line-chart-list-scrollPage-innerData.js
front-end/h5/src/components/core/plugins/bsth/othergj/linechart/list/othergj-eBusStop-line-chart-list-scrollPage.js
@@ -82,17 +82,19 @@ class EBusStopGpsData {
    * @param lineName 线路名称
    * @param lineCode 线路编码
    * @param endStopName 终点站站名
+   * @param direction 方向
    * @param startTime 首班车时间
    * @param endTime 末班车时间
    * @param arrivalInfo 到站信息（如：2站，等待发车，即将进站）
    * @param gpsDataList gps数据列表
    */
-  constructor (lineName, lineCode, endStopName,
+  constructor (lineName, lineCode, endStopName, direction = '0',
                startTime = '00:00', endTime = '23:59',
                arrivalInfo = '等待发车', gpsDataList = [] ) {
     this._lineName = lineName
     this._lineCode = lineCode
     this._endStopName = endStopName
+    this._direction = direction
     this._startTime = startTime
     this._endTime = endTime
     this._arrivalInfo = arrivalInfo
@@ -102,6 +104,7 @@ class EBusStopGpsData {
   get lineName () { return this._lineName }
   get lineCode () { return this._lineCode }
   get endStopName () { return this._endStopName }
+  get direction () {return this._direction}
   get startTime () { return this._startTime }
   get endTime () { return this._endTime }
   get arrivalInfo () { return this._arrivalInfo }
@@ -111,7 +114,7 @@ class EBusStopGpsData {
     let dataList = []
     if (this._lineName) {
       dataList.push({
-        d3DataKey: this._lineName + '_' + this._lineCode,
+        d3DataKey: this._lineName + '_' + this._lineCode + "_" + this._direction,
         lineName: this._lineName,
         stopName: this._endStopName,
         startTime: this._startTime,
@@ -197,7 +200,7 @@ class EBusStopGpsData {
     let gpsDataList = [gps1, gps2, gps3, gps4, gps5, gps6, gps7]
     // 2、发车信息
     return new EBusStopGpsData(
-      '线路1', '1', '站点6',
+      '线路1', '1', '站点6', '0',
       '6:00', '23:00',
       '2站', gpsDataList)
@@ -203,23 +203,26 @@ class ScrollPageInnerData {
    */
   refreshDataWithRemoteData (remoteDataList) {
     // 远程数据格式参考 http://36.134.151.106:19102/General_Interface/getArriveVO?deviceId=66MH0001
+    // console.log(remoteDataList)
     if (!remoteDataList || !remoteDataList.length) {
       return
     }
+    // console.log(this._innerDataItemList)
     // 1、按照线路名字_线路编码分组数据
     let dataGroupByLineNameCode = Utils.listGroupBy(remoteDataList, function (d) {
-      return d.lineName + '_' + d.lineCode
+      return d.lineName + '_' + d.lineCode + '_' + d.direction
     })
     // 2、处理数据，循环计算每条线路的数据 TODO：
     for (let internalData of this._innerDataItemList) {
-      let key = internalData._eBusStopData.lineName + '_' + internalData._eBusStopData.lineCode
+      let key = internalData._eBusStopGpsData.lineName + '_' +
+        internalData._eBusStopGpsData.lineCode + '_' + internalData._eBusStopGpsData.direction
       if (dataGroupByLineNameCode[key]) {
         let remoteInfo = dataGroupByLineNameCode[key][0]
         // 刷新gps数据
         internalData._eBusStopGpsData.setFromRemoteInfo(remoteInfo)
-        // console.log(`${key}刷新remoteGps数据`)
+        console.log(`${key}刷新remoteGps数据`)
       }
     }
@@ -302,7 +305,7 @@ class ScrollPageInnerData {
         })
       }
       let eBusStopGpsData = new EBusStopGpsData(
-        lineName, lineCode, routeData.lastStationName,
+        lineName, lineCode, routeData.lastStationName, lineDir,
         startTime, endTime, '等待发车', gpsDataList)
       // 添加scroll数据
@@ -115,6 +115,7 @@ export default {
       }, this.scroll_seconds * 1000)
     },
     'remoteDataTimer.count' () {
+      // console.log('remoteDataTimer.count')
       let timer = this.remoteDataTimer.timer
       if (timer) {
         try {