电子站牌项目

1、修改package.json，添加jsonp的依赖 2、修改bsth-line-chart-scrollList，添加在preview模式下通过jsonp获取线路路由，线路gps数据 3、修改bsth-line-chart-scrollList，将滚动定时器触发放到bsth-line-chart-scrollList-page中

电子站牌项目
1、修改package.json，添加jsonp的依赖 2、修改bsth-line-chart-scrollList，添加在preview模式下通过jsonp获取线路路由，线路gps数据 3、修改bsth-line-chart-scrollList，将滚动定时器触发放到bsth-line-chart-scrollList-page中
徐烜
1 parent 2076bb86
Showing 10 changed files with 266 additions and 113 deletions
front-end/h5/package.json
front-end/h5/src/components/core/editor/modals/preview.vue
front-end/h5/src/components/core/plugins/bsth/bsth-line-chart-scrollList-page.js
front-end/h5/src/components/core/plugins/bsth/bsth-line-chart-scrollList.js
front-end/h5/src/components/core/plugins/bsth/bsth-line-chart.js
front-end/h5/src/components/core/plugins/bsth/models/lineGpsDataOfApi.js
front-end/h5/src/components/core/plugins/bsth/models/lineGpsDataOfLineChart.js
front-end/h5/src/components/core/plugins/bsth/models/lineRouteDataOfApi.js
front-end/h5/src/components/core/plugins/bsth/models/lineRouteDataOfLineChart.js
front-end/h5/src/components/core/plugins/bsth/models/scrollListInnerData.js
@@ -38,11 +38,12 @@
     "vant": "^2.2.12",
     "vue": "^2.6.10",
     "vue-i18n": "^8.14.1",
+    "vue-jsonp": "^2.0.0",
     "vue-matomo": "^3.13.0-2",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.0.3",
-    "vuex": "^3.0.1",
     "vue-video-player": "^5.0.2",
+    "vuex": "^3.0.1",
     "x-data-spreadsheet": "^1.1.4"
   },
   "devDependencies": {
@@ -49,10 +49,10 @@ export default {
        * 这个可能是个bug
        */
       // ----------------- 以下 ------------------ //
-      let _work_copy = this.work
-      _work_copy.title = this.$store.state.editor.work.title
-      _work_copy.description = this.$store.state.editor.work.description
-      this.$store.state.editor.work = _work_copy
+      let workCopy = this.work
+      workCopy.title = this.$store.state.editor.work.title
+      workCopy.description = this.$store.state.editor.work.description
+      this.$store.state.editor.work = workCopy
       // ----------------- 以上 ------------------ //
       this.confirmLoading = true
@@ -4,7 +4,9 @@
 import TestData from 'core/plugins/bsth/bsth-line-chart-list_testData'
 import LineRouteDataOfApi from 'core/plugins/bsth/models/lineRouteDataOfApi'
+import LineGpsDataOfApi from 'core/plugins/bsth/models/lineGpsDataOfApi'
 import ScrollListInnerData from 'core/plugins/bsth/models/scrollListInnerData'
+import { jsonp } from 'vue-jsonp'
 export default {
   props: {
@@ -28,37 +30,50 @@ export default {
       // --------------- 滚动翻页数据对象 --------------//
       scrollListInnerData: null,
+      initLoading: true,
+      initLoadingText: '',
       // ---------------- 内部的定时timer --------------- //
       scrollTimer: { // 滚动间隔timer
         timer: null,
-        count: 0,
-        millisecond: 2000
-      }
+        count: 0
+      },
+      gpsTimer: { // gps刷新间隔timer
+        timer: null,
+        count: 0
+      },
+      routeDataOfApiUrl: 'http://192.168.168.228:8910/General_Interface/getLineRouteVO?deviceId=66MH0001',
+      gpsDataOfApiUrl: 'http://192.168.168.228:8910/General_Interface/getLineGpsVO?deviceId=66MH0001'
     }
   },
   mounted () {
     // 1、创建滚动翻页对象
     this.scrollListInnerData = new ScrollListInnerData(this.page_size, this.list_width, this.list_height)
+
     // 2、初始化数据
-    // TODO：先使用测试数据，后面使用后台数据
-    const lineRouteDataOfApiArray = []
-    for (let obj of TestData.lineRouteList) {
-      lineRouteDataOfApiArray.push(new LineRouteDataOfApi(obj))
+    // 2.1、edit模式下，使用测试数据
+    if (this.editorMode === 'edit') {
+      this.initLoading = true
+      this.initLoadingText = '初始化线路路由...'
+      const lineRouteDataOfApiArray = []
+      for (let obj of TestData.lineRouteList) {
+        lineRouteDataOfApiArray.push(new LineRouteDataOfApi(obj))
+      }
+      this.scrollListInnerData.initRouteData(lineRouteDataOfApiArray)
+      this.initLoadingText = '初始化线路gps...'
+      this.scrollListInnerData.refreshGps(TestData.lineGpsList)
+      this.innerDataSet = this.scrollListInnerData.scrollDataItemList
+      // 发送bindData事件，父组件绑定该事件
+      this.$emit('bindData', this.innerDataSet)
+      this.initLoading = false
     }
-    this.scrollListInnerData.initRouteData(lineRouteDataOfApiArray)
-    this.scrollListInnerData.refreshGps(TestData.lineGpsList)
-    this.innerDataSet = this.scrollListInnerData.scrollDataItemList
-
-    // 3、发送refreshData事件
-    this.$emit('bindData', this.innerDataSet)
-
-    // 4、preview模式下启动滚动分页
+    // 2.2、preview模式下，使用远程数据
     if (this.editorMode === 'preview') {
-      this.scrollTimer.count++
+      this.initDataOfApi()
     }
   },
   destroyed () {
+    // 重置滚动间隔timer
     let scrollTimer = this.scrollTimer.timer
     if (scrollTimer) {
       try {
@@ -67,6 +82,16 @@ export default {
     }
     this.scrollTimer.timer = null
+    // 重置gps刷新间隔timer
+    let gpsTimer = this.gpsTimer.timer
+    if (gpsTimer) {
+      try {
+        clearTimeout(gpsTimer)
+      } catch (err) {}
+    }
+    this.gpsTimer.timer = null
+
+    // 重置滚动翻页数据对象
     if (this.scrollListInnerData) {
       this.scrollListInnerData.resetData()
     }
@@ -83,9 +108,22 @@ export default {
       let self = this
       this.scrollTimer.timer = setTimeout(function () {
         self.startScroll()
-        self.scrollTimer.count++
+        // self.scrollTimer.count++ // 滚动完成再触发，this.scrollListInnerData.scrollUp触发
       }, this.scroll_milliseconds)
     },
+    'gpsTimer.count' () {
+      let timer = this.gpsTimer.timer
+      if (timer) {
+        try {
+          clearTimeout(timer)
+        } catch (err) {}
+      }
+      let self = this
+      this.gpsTimer.timer = setTimeout(function () {
+        self.refreshGpsDataOfApi()
+        // self.gpsTimer.count++ // refreshGpsDataOfApi触发
+      }, this.gps_data_refresh_minute * 60 * 1000)
+    },
     // -------------------- 监控父组件传递的属性 --------------- //
     page_size (val) {
       // 只在edit模式下监控，preview模式下不监控
@@ -103,12 +141,65 @@ export default {
   render () {
     // TODO：暂时是没有内容显示的，只处理内部数据，后面再根据不同的错误显示内容
     return (
-      <div></div>
+      <a-spin tip={this.initLoadingText} spinning={this.initLoading} size="large">
+        {
+          this.$slots.default
+        }
+      </a-spin>
     )
   },
   methods: {
     startScroll () {
       this.scrollListInnerData.scrollUp(this)
+    },
+    initDataOfApi () { // 使用后台api初始化数据
+      this.initLoading = true
+      this.initLoadingText = '初始化线路路由...'
+      jsonp(this.routeDataOfApiUrl).then((routeArray) => {
+        const lineRouteDataOfApiArray = []
+        for (let obj of routeArray) {
+          lineRouteDataOfApiArray.push(new LineRouteDataOfApi(obj))
+        }
+        this.scrollListInnerData.initRouteData(lineRouteDataOfApiArray)
+        this.innerDataSet = this.scrollListInnerData.scrollDataItemList
+
+        this.initLoadingText = '初始化线路gps...'
+        jsonp(this.gpsDataOfApiUrl).then((gpsArray) => {
+          const lineGpsDataOfApiArray = []
+          for (let obj of gpsArray) {
+            lineGpsDataOfApiArray.push(new LineGpsDataOfApi(obj))
+          }
+          this.scrollListInnerData.refreshGps(lineGpsDataOfApiArray)
+        }).catch((err2) => {
+          console.log(err2)
+        })
+        // 发送bindData事件，父组件绑定该事件
+        this.$emit('bindData', this.innerDataSet)
+        this.initLoading = false
+        // 启动滚动分页，gps刷新
+        this.scrollTimer.count++
+        this.gpsTimer.count++
+      }).catch((err) => {
+        console.log(err)
+        this.initLoadingText = `初始化线路路由失败，等待${this.gps_data_refresh_minute}分钟后重新获取，请稍后...`
+        this.gpsTimer.count++
+      })
+    },
+    refreshGpsDataOfApi () { // 使用后台api刷新gps数据
+      if (this.innerDataSet.length === 0) { // length===0说明初始化失败，或者后台无数据，重新刷新
+        this.initDataOfApi()
+      } else {
+        jsonp(this.gpsDataOfApiUrl).then((gpsArray) => {
+          const lineGpsDataOfApiArray = []
+          for (let obj of gpsArray) {
+            lineGpsDataOfApiArray.push(new LineGpsDataOfApi(obj))
+          }
+          this.scrollListInnerData.refreshGps(lineGpsDataOfApiArray)
+        }).catch((err2) => {
+          console.log(err2)
+        })
+        this.gpsTimer.count++
+      }
     }
   }
 }
@@ -3,7 +3,7 @@
  */
 import PropTypes from '@luban-h5/plugin-common-props'
-import ScrollPage from 'core/plugins/bsth/bsth-line-chart-scrollList-page'
+import scrollPage from 'core/plugins/bsth/bsth-line-chart-scrollList-page'
 import './bsth-line-chart-scrollList.css'
@@ -93,42 +93,12 @@ export default {
     chart_gps_down_merge_text_f_color: PropTypes.color({ label: '下行合并gps车辆文本颜色', defaultValue: '#FFFFFF', layout: { prefixCls: 'bsth-line' } })
   },
   render () {
-    const innerDivStyle = {
-      'width': this.list_width + 'px',
-      'height': this.list_height + 'px',
-      'border': this.border_size + 'px solid black',
-      'margin-left': this.margin_left + 'px',
-      'margin-right': this.margin_right + 'px',
-      'margin-top': this.margin_top + 'px',
-      'margin-bottom': this.margin_bottom + 'px',
-      'background': this.background_color,
-      'position': 'relative',
-      'overflow': 'hidden' // 隐藏超出的模拟图
-    }
-
-    // 包含所有的线路模拟图，滚动时设置top值，总高度等于所有图高度和
-    const wrapperDivStyle = {
-      'top': this.scrollTop + 'px',
-      'position': 'absolute',
-      'width': this.list_width + 'px',
-      'height': this.line_chart_outer_div_height * this.internalDataSet.length + 'px'
-    }
-
     /* 最外层div对应编辑器的通用样式 */
     return (
       <div class="line-chart-scrollList-outer-div">
         {
           this.renderScrollDataComponent()
         }
-        <div style={innerDivStyle}>
-          <div style={wrapperDivStyle}>
-          {
-            this.internalDataSet.map(dataItem => (
-              this.renderBsthLinechartDataList(dataItem)
-            ))
-          }
-          </div>
-        </div>
       </div>
     )
   },
@@ -234,8 +204,28 @@ export default {
       this.internalDataSet = dataSet
     },
     renderScrollDataComponent () {
+      const innerDivStyle = {
+        'width': this.list_width + 'px',
+        'height': this.list_height + 'px',
+        'border': this.border_size + 'px solid black',
+        'margin-left': this.margin_left + 'px',
+        'margin-right': this.margin_right + 'px',
+        'margin-top': this.margin_top + 'px',
+        'margin-bottom': this.margin_bottom + 'px',
+        'background': this.background_color,
+        'position': 'relative',
+        'overflow': 'hidden' // 隐藏超出的模拟图
+      }
+
+      // 包含所有的线路模拟图，滚动时设置top值，总高度等于所有图高度和
+      const wrapperDivStyle = {
+        'top': this.scrollTop + 'px',
+        'position': 'absolute',
+        'width': this.list_width + 'px',
+        'height': this.line_chart_outer_div_height * this.internalDataSet.length + 'px'
+      }
       return (
-        <ScrollPage
+        <scrollPage
           editorMode={this.editorMode}
           page_size={this.page_size}
           list_width={this.list_width}
@@ -243,8 +233,17 @@ export default {
           scroll_milliseconds={this.scroll_milliseconds}
           gps_data_refresh_minute={this.gps_data_refresh_minute}
           onBindData={this.onBindData}
-          onScrollTop={this.onScrollTop}
-        ></ScrollPage>
+          onScrollTop={this.onScrollTop}>
+          <div style={innerDivStyle}>
+            <div style={wrapperDivStyle}>
+              {
+                this.internalDataSet.map(dataItem => (
+                  this.renderBsthLinechartDataList(dataItem)
+                ))
+              }
+            </div>
+          </div>
+        </scrollPage>
       )
     },
     renderBsthLinechartDataList (dataItem) {
@@ -6,6 +6,8 @@ import PropTypes from &#39;@luban-h5/plugin-common-props&#39;
 import TestData from 'core/plugins/bsth/bsth-line-chart_testData'
 import Utils from 'core/plugins/bsth/bsth-utils'
+import LineGpsDataOfLineChart from 'core/plugins/bsth/models/lineGpsDataOfLineChart'
+
 import './bsth-line-chart.css'
 import './bsth-line-prop-panel.css'
@@ -263,10 +265,14 @@ export default {
     },
     line_gps_data: function (currentVal, oldVal) {
       let self = this
-      if (!Utils.objectEquals(currentVal, oldVal)) {
-        // refreshLineSvg();
-        self.refreshGpsSvg()
-      }
+      // console.log("oldVal=" + oldVal)
+      // console.log("currentVal=" + currentVal)
+      self.refreshGpsSvg()
+      // if (!Utils.objectEquals(currentVal, oldVal)) {
+      //   // refreshLineSvg();
+      //   console.log(123456)
+      //   self.refreshGpsSvg()
+      // }
     },
     // ------------ 本身宽高 ----------- //
     line_width () {
@@ -670,38 +676,41 @@ export default {
        * 按照站点编码和上下行分组
        * 数据示例：
        * gps_group_by_stopNo_upDown = {
-       *     'BCODE_0': ['559L1014', '559L1013'],
-       *     'CCODE_0': ['559L1015'],
-       *     'E1CODE_1': ['559L1025'],
-       *     'ACODE_1': ['559L1035', '559L1045', '559L1055']
+       *     'BCODE_0': ['559L1014_内部编码', '559L1013_内部编码'],
+       *     'CCODE_0': ['559L1015_内部编码'],
+       *     'E1CODE_1': ['559L1025_内部编码'],
+       *     'ACODE_1': ['559L1035_内部编码', '559L1045_内部编码', '559L1055_内部编码']
        * };
        */
       let gpsGroupByStopNoUpDown = {}
       $jQuery.each(gpsData, function (i, d) {
+        if (d && !(d instanceof LineGpsDataOfLineChart)) {
+          throw new Error('d不等于null，up参数不是LineGpsDataOfLineChart类型')
+        }
         let stopNo = d.stopNo // 站点编码
         let upDown = d.upDown // 上下行（0 上行 ， 1 下行 ， -1 无效）
         let groupKey = stopNo + '_' + upDown
         if (!gpsGroupByStopNoUpDown[groupKey]) {
           gpsGroupByStopNoUpDown[groupKey] = []
         }
-        let deviceId = d.deviceId // 设备编码
-        gpsGroupByStopNoUpDown[groupKey].push(deviceId)
+        // 设备id + "_" + 内部编码，具体看getkey方法
+        gpsGroupByStopNoUpDown[groupKey].push(d.getKey())
       })
       /*
        * 将分组后的设备编码array转换成map
        * 数据示例：
        * test_gps_index_mapp = {
        *     'BCODE_0': {
-       *         '559L1014': 0, '559L1013' : 1
+       *         '559L1014_内部编码': 0, '559L1013_内部编码' : 1
        *     },
        *     'CCODE_0': {
-       *         '559L1015': 0
+       *         '559L1015_内部编码': 0
        *     },
        *     'E1CODE_1': {
-       *         '559L1025': 0
+       *         '559L1025_内部编码': 0
        *     },
        *     'ACODE_1': {
-       *         '559L1035': 0, '559L1045': 1, '559L1055': 2
+       *         '559L1035_内部编码': 0, '559L1045_内部编码': 1, '559L1055_内部编码': 2
        *     }
        * };
        */
@@ -710,8 +719,8 @@ export default {
         if (!gpsIndexMap[key]) {
           gpsIndexMap[key] = {}
         }
-        $jQuery.each(value, function (index, deviceId) {
-          gpsIndexMap[key][deviceId] = index
+        $jQuery.each(value, function (index, value2) {
+          gpsIndexMap[key][value2] = index
         })
       })
@@ -720,7 +729,7 @@ export default {
       // 绘制rect
       let gpsRectUpdate = gpsWrapSvg.selectAll('rect')
         .data(gpsData, function (d) {
-          return d.deviceId // 指定主键，默认使用数组下标
+          return d.getKey() // 指定主键，默认使用数组下标
         })
       let gpsRectEnter = gpsRectUpdate
       let gpsRectExit = gpsRectUpdate.exit()
@@ -769,7 +778,7 @@ export default {
           return y
         }
         y = parseInt(svgCircle.attr('cy'))
-        let index = gpsIndexMap[d.stopNo + '_' + d.upDown][d.deviceId]
+        let index = gpsIndexMap[d.stopNo + '_' + d.upDown][d.getKey()]
         if (d.upDown === 0) {
           y = y - 22 - (index * 17)
         } else {
@@ -799,7 +808,7 @@ export default {
           }
         })
         .attr('_id', function (d) {
-          return 'rct_' + d.deviceId
+          return 'rct_' + d.getKey()
         })
         .transition()
         .attr('x', gpsRectX)
@@ -809,7 +818,7 @@ export default {
         })
       gpsRectUpdate
         .attr('_id', function (d) {
-          return 'rct_' + d.deviceId
+          return 'rct_' + d.getKey()
         })
         .transition()
         .attr('x', gpsRectX)
@@ -821,7 +830,7 @@ export default {
       // --------------- 3、添加/更新车辆text元素 -------------- //
       let gpsTextUpdate = gpsWrapSvg.selectAll('text')
         .data(gpsData, function (d) {
-          return d.deviceId // 指定主键，默认使用数组下标
+          return d.getKey() // 指定主键，默认使用数组下标
         })
       let gpsTextEnter = gpsTextUpdate
       let gpsTextExit = gpsTextUpdate.exit()
@@ -870,7 +879,7 @@ export default {
           return y
         }
         y = parseInt(svgCircle.attr('cy'))
-        let index = gpsIndexMap[d.stopNo + '_' + d.upDown][d.deviceId]
+        let index = gpsIndexMap[d.stopNo + '_' + d.upDown][d.getKey()]
         if (d.upDown === 0) {
           y = y - 22 - (index * 17)
         } else {
@@ -881,21 +890,7 @@ export default {
       }
       let gpsTextText = function (d) {
-        if (d.nbbm) {
-          let nbbmLength = d.nbbm.length
-          if (nbbmLength > 3) {
-            let nbbmText = d.nbbm.substr(nbbmLength - 3)
-            if (d.nbbm.indexOf('-') > 0) {
-              return d.nbbm.substr(d.nbbm.indexOf('-') - 1, 1) + nbbmText
-            } else {
-              return nbbmText
-            }
-          } else {
-            return d.nbbm
-          }
-        } else {
-          return d.nbbm
-        }
+        return d.getText()
       }
       gpsTextEnter.enter().append('text')
@@ -909,7 +904,7 @@ export default {
           }
         })
         .attr('_id', function (d) {
-          return 'tx_' + d.deviceId
+          return 'tx_' + d.getKey()
         })
         .transition()
         .attr('x', gpsTextX)
@@ -921,7 +916,7 @@ export default {
       gpsTextUpdate
         .attr('_id', function (d) {
-          return 'tx_' + d.deviceId
+          return 'tx_' + d.getKey()
         })
         .transition()
         .attr('x', gpsTextX)
@@ -934,16 +929,17 @@ export default {
       // --------------- 4、绘制/更新车辆合并显示元素（g rect text） --------------//
       // 绘制聚合点的数据集对象列表
       let mergerData = []
+      // console.log(gpsIndexMap)
       $jQuery.each(gpsIndexMap, function (key, value) {
         let stopNo = key.split('_')[0]
         let upDown = key.split('_')[1]
-        let deviceIds = []
-        $jQuery.each(value, function (deviceId) {
-          deviceIds.push(deviceId)
+        let deviceIdNbbms = []
+        $jQuery.each(value, function (deviceIdNbbm) {
+          deviceIdNbbms.push(deviceIdNbbm)
         })
         // 删除旧的合并点
         $jQuery(self.$el).find('g[_id=' + 'merger_' + key + ']').remove()
-        if (deviceIds.length <= 2) { // 小于等于2个gps，不合并
+        if (deviceIdNbbms.length <= 2) { // 小于等于2个gps，不合并
           return true
         }
@@ -957,7 +953,7 @@ export default {
         let y = parseInt(svgCircle.attr('cy'))
         // 隐藏车辆rect
-        $jQuery.each(deviceIds, function (i, d) {
+        $jQuery.each(deviceIdNbbms, function (i, d) {
           $jQuery(self.$el).find('rect[_id=rct_' + d + '],text[_id=tx_' + d + ']').attr('class', 'merge_hide')
         })
@@ -966,7 +962,7 @@ export default {
           y: y,
           key: key,
           upDown: parseInt(upDown),
-          length: deviceIds.length
+          length: deviceIdNbbms.length
         })
       })
@@ -17,9 +17,9 @@ class LineGpsDataOfApi {
     this.lineName = value.lineName // 线路名字
     this.lineCode = value.lineCode // 线路编码
     this.stopNo = value.stopNo // 站定编码
-    this.upDown = value.upDown // 上下行（0 上行 ， 1 下行 ， -1 无效）
+    this.upDown = parseInt(value.upDown) // 上下行（0 上行 ， 1 下行 ， -1 无效）
     this.deviceId = value.deviceId // 设备编码
-    this.instation = value.instation // 0： 站外 1：站内 2：场内
+    this.instation = parseInt(value.instation) // 0： 站外 1：站内 2：场内
     this.nbbm = value.nbbm // 车辆内部编码（自编号）
   }
 }
@@ -16,7 +16,58 @@ class LineGpsDataOfLineChart {
     this.upDown = value.upDown // 上下行（0 上行 ， 1 下行 ， -1 无效）
     this.deviceId = value.deviceId // 设备编码
     this.instation = value.instation // 0： 站外 1：站内 2：场内
-    this.nbbm = value.nbbm // 车辆内部编码（自编号）
+    this.nbbm = value.nbbm // 车辆内部编码（自编号/车牌号）
+  }
+
+  getKey () {
+    return this.deviceId + '_' + this.nbbm
+  }
+
+  getText () {
+    if (this.nbbm.indexOf('沪') >= 0) {
+      return getCphShortText.call(this)
+    } else {
+      return getZbhShortText.call(this)
+    }
+  }
+}
+
+function getZbhShortText() { // 获取自编号短文本
+  let d = this
+  if (d.nbbm) {
+    let nbbmLength = d.nbbm.length
+    if (nbbmLength > 3) {
+      let nbbmText = d.nbbm.substr(nbbmLength - 3)
+      if (d.nbbm.indexOf('-') > 0) {
+        return d.nbbm.substr(d.nbbm.indexOf('-') - 1, 1) + nbbmText
+      } else {
+        return nbbmText
+      }
+    } else {
+      return d.nbbm
+    }
+  } else {
+    return d.nbbm
+  }
+}
+
+function getCphShortText() { // 获取车牌号短文本
+  let nbbm = this.nbbm
+  if (nbbm.indexOf('沪') !== -1) {
+    let startIndex = nbbm.indexOf('沪')
+    if (startIndex + 5 > nbbm.length) { // 沪后面至少还有5个字符
+      return nbbm.substr(0, 3)
+    } else {
+      let code1 = nbbm.substr(startIndex + 1, 1)
+      let code2 = nbbm.substr(startIndex + 2, 1)
+      if (code2 === '-') {
+        return code1 + nbbm.substr(startIndex + 3, 3)
+      } else {
+        return code1 + nbbm.substr(startIndex + 2, 3)
+      }
+    }
+  } else {
+    return nbbm.substr(0, 3)
   }
 }
@@ -16,8 +16,8 @@ class LineRouteDataOfApi {
   constructor (value = {}) {
     this.lineName = value.lineName // 线路名字
     this.lineCode = value.lineCode // 线路编码
-    this.directions = value.directions // 方向 0:上行，1:下行
-    this.stationRouteCode = value.stationRouteCode // 站点路由代码（用于站点排序）
+    this.directions = parseInt(value.directions) // 方向 0:上行，1:下行
+    this.stationRouteCode = parseInt(value.stationRouteCode) // 站点路由代码（用于站点排序）
     this.stationCode = value.stationCode // 站点编码
     this.stationName = value.stationName // 站点名字
     this.stationMark = value.stationMark // 站定标识 B:起点站，E:终点站，Z:中途站
@@ -25,24 +25,24 @@ class LineRouteDataOfLineChart {
    * @param down 下行站点数据（LineRouteDataOfApi类型）
    */
   static fromLineRouteDataOfApi (up, down) {
-    if (up === null && down === null) {
+    if (!up && !down) {
       return null
     }
-    if (up !== null && !(up instanceof LineRouteDataOfApi)) {
+    if (up && !(up instanceof LineRouteDataOfApi)) {
       throw new Error('up不等于null，up参数不是LineRouteDataOfApi类型')
     }
-    if (down !== null && !(down instanceof LineRouteDataOfApi)) {
+    if (down && !(down instanceof LineRouteDataOfApi)) {
       throw new Error('down不等于null，down参数不是LineRouteDataOfApi类型')
     }
     let [names, type, ids, stationMark] = [null, 2, null, null]
-    if (up === null) {
+    if (!up) {
       type = 1
       names = [down.stationName]
       ids = [down.stationCode + '_' + down.directions]
       stationMark = down.stationMark
-    } else if (down === null) {
+    } else if (!down) {
       type = 0
       names = [up.stationName]
       ids = [up.stationCode + '_' + up.directions]
@@ -27,6 +27,7 @@ class ScrollListInnerData {
       millisecond: 1
     }
   }
+
   set pageSize (val) { // 设置每页大小
     this._pageSize = val
     this._pageCount = Math.ceil(this._innerDataItemList.length / this._pageSize)
@@ -62,7 +63,7 @@ class ScrollListInnerData {
     let topFrom = this._scrollDataItemList[this._currentScrollIndex].top
     let topTo = this._scrollDataItemList[this._nextScrollIndex].top
-    let step = (topTo - topFrom) / 100
+    let step = (topTo - topFrom) / 200
     let self = this
     self._scrollAnimateTimer.timer = setInterval(function () {
       self._scrollAnimateTimer.count++
@@ -90,6 +91,8 @@ class ScrollListInnerData {
           } catch (err) {}
           self._scrollAnimateTimer.timer = null
         }
+
+        scrollListComponent.scrollTimer.count++
       }
     }, 1)
   }
@@ -244,6 +247,8 @@ function initInnerDataSetWithRoute (routeDataArray) {
     return []
   }
+  // console.log(routeGroupByLineNameCode)
+
   let innerDataSet = []
   for (let key of lineNameCodeList) {
@@ -271,6 +276,15 @@ function initInnerDataSetWithRoute (routeDataArray) {
     let lineRouteGroupByDir = Utils.listGroupBy(lineRoute, function (d) {
       return d.directions
     })
+    // console.log(lineRouteGroupByDir)
+
+    if (!lineRouteGroupByDir[0]) {
+      lineRouteGroupByDir[0] = []
+    }
+    if (!lineRouteGroupByDir[1]) {
+      lineRouteGroupByDir[1] = []
+    }
+
     // 3.2.3 排序分组，上行升序，下行降序（下行降序为了后面进行站点名合并）
     try {
       lineRouteGroupByDir[0].sort(function (a, b) {
@@ -314,6 +328,7 @@ function initInnerDataSetWithRoute (routeDataArray) {
       if (dirUpData == null && dirDownData == null) {
         break
       }
+
       mergeRouteData.splice(i, 1, LineRouteDataOfLineChart.fromLineRouteDataOfApi(dirUpData, dirDownData))
     }
     internalData.route = mergeRouteData