Sign in

潘钊 / bsth_control · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Network
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Commits 687
  • Compare
  • Branches 33
  • Tags 2
  • bsth_control
04 Apr, 2019
3 commits
  • Merge branch 'pudong' of http://222.66.0.204:8090//panzhaov5/bsth_control into pudong
      8e0251f9
    徐烜 authored
    2019-04-04 13:39:33 +0800  
    Browse Code »
  • 1、添加ModuleOperatorLog实体对象,并创建与之对应的logback的ModuleOperatorDbAppender扩展 ...
    d503df12
    2、添加Log相关枚举的Jpa convert,用于ModuleOperatorLog实体枚举类型属性
    3、添加PlanLogger,统一记录排班计划的创建修改的日志(TODO:之后还要修改)
    4、添加TimetableLogger,统一记录时刻表的创建,导入,修改的日志(TODO:之后还要修改)
    5、修改logback.xml配置,配置append扩展日志(TODO:之后还要修改)
    6、修改pom.xml配置,添加bsth-control_v2-plan_module-common依赖
    徐烜 authored
    2019-04-04 13:34:32 +0800  
    Browse Code »
  • 线调更新,路牌对调快速点击多次问题修复
      8d0c9706
    lizhuojun authored
    2019-04-04 10:00:46 +0800  
    Browse Code »

27 Mar, 2019
1 commit
  • 线调更新,修正历史路单维护的临加班次跨天起终点时间异常
      d42e5163
    lizhuojun authored
    2019-03-27 14:12:27 +0800  
    Browse Code »

21 Mar, 2019
5 commits
  • 用油跨分公司
      b03371b6
    廖磊 authored
    2019-03-21 17:42:38 +0800  
    Browse Code »
  • 跨分公司加油数据处理页面
      99484afe
    廖磊 authored
    2019-03-21 16:43:09 +0800  
    Browse Code »
  • 跨分公司加油数据处理
      c00b7ff4
    廖磊 authored
    2019-03-21 16:28:24 +0800  
    Browse Code »
  • Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control ...
      a575cb1b
    into pudong
    廖磊 authored
    2019-03-21 13:15:38 +0800  
    Browse Code »
  • 油量拆分添加跨分公司用车处理
    f4a911ad
    廖磊 authored
    2019-03-21 13:13:32 +0800  
    Browse Code »

20 Mar, 2019
1 commit
  • 烂班情况表 统计数据
      7b255c11
    娄高锋 authored
    2019-03-20 16:30:53 +0800  
    Browse Code »

18 Mar, 2019
4 commits
  • Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into ...
      69c03969
    pudong
    娄高锋 authored
    2019-03-18 15:24:46 +0800  
    Browse Code »
  • 以分公司编码分组
    5eb19a0c
    娄高锋 authored
    2019-03-18 15:23:35 +0800  
    Browse Code »
  • 线调更新,修复临加班次分公司名称字段未保存
      7888e606
    lizhuojun authored
    2019-03-18 15:19:02 +0800  
    Browse Code »
  • 时刻表预览更新 ...
      7dfd8bc8
    1、添加到达时间
    2、在头部添加上行下行的起站点和终点站说明
    3、点击任何一个班次,高亮显示并且下一个班次也高亮并移动到列表中间
    徐烜 authored
    2019-03-18 09:40:15 +0800  
    Browse Code »

15 Mar, 2019
3 commits
  • 线调更新
      44301ffb
    lizhuojun authored
    2019-03-15 18:30:48 +0800  
    Browse Code »
  • 线调更新
    5cb3584e
    lizhuojun authored
    2019-03-15 18:30:12 +0800  
    Browse Code »
  • 线调更新
    6303b954
    lizhuojun authored
    2019-03-15 17:56:03 +0800  
    Browse Code »

14 Mar, 2019
1 commit
  • 路单数据油量统计合计错误修正
      a65a6883
    娄高锋 authored
    2019-03-14 14:29:13 +0800  
    Browse Code »

13 Mar, 2019
3 commits
  • 页面和excel调整
      2fcf16f3
    娄高锋 authored
    2019-03-13 15:39:42 +0800  
    Browse Code »
  • Merge branch 'pudong' of http://222.66.0.204:8090//panzhaov5/bsth_control into pudong
      60cdd640
    徐烜 authored
    2019-03-13 13:57:20 +0800  
    Browse Code »
  • 添加时刻表预览视图功能
    f8d22eff
    徐烜 authored
    2019-03-13 13:53:48 +0800  
    Browse Code »

12 Mar, 2019
5 commits
  • Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control ...
      3a9befa5
    into pudong
    廖磊 authored
    2019-03-12 16:53:47 +0800  
    Browse Code »
  • 早高峰出车表统计
    c9ae8bb1
    廖磊 authored
    2019-03-12 16:49:25 +0800  
    Browse Code »
  • Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong
      0c0dbec2
    周勤 authored
    2019-03-12 14:58:54 +0800  
    Browse Code »
  • 增加运管处上传日志的保存功能(时刻表上传、线路上传、路单上传)
    ac5896da
    周勤 authored
    2019-03-12 14:58:48 +0800  
    Browse Code »
  • 增加运管处上传日志的保存功能(时刻表上传、线路上传、路单上传)
    3b121793
    周勤 authored
    2019-03-12 14:57:19 +0800  
    Browse Code »

11 Mar, 2019
3 commits
  • 线调更新
    98eb12d0
    lizhuojun authored
    2019-03-11 17:21:27 +0800  
    Browse Code »
  • Merge branch 'pudong' of http://192.168.168.201:8888/panzhaov5/bsth_control into pudong
      f638bd22
    lizhuojun authored
    2019-03-11 17:07:36 +0800  
    Browse Code »
  • 线调更新
    d79bca1d
    lizhuojun authored
    2019-03-11 09:15:56 +0800  
    Browse Code »

08 Mar, 2019
1 commit
  • 线调更新
    ee24fbe7
    lizhuojun authored
    2019-03-08 16:13:10 +0800  
    Browse Code »

07 Mar, 2019
1 commit
  • 线调更新
    a9c1e8a6
    lizhuojun authored
    2019-03-07 15:50:16 +0800  
    Browse Code »

06 Mar, 2019
3 commits
  • 增加运管处上传日志的保存和查看功能(时刻表上传、线路上传、路单上传)
    22ea06d9
    周勤 authored
    2019-03-06 16:06:15 +0800  
    Browse Code »
  • 增加运管处上传日志的保存和查看功能(时刻表上传、线路上传、路单上传)
    033b3d93
    周勤 authored
    2019-03-06 16:04:54 +0800  
    Browse Code »
  • Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong ...
      34d5e365
    # Conflicts:
    #	src/main/resources/static/pages/base/timesmodel/add.html
    #	src/main/resources/static/pages/base/timesmodel/fragments/addbc.html
    #	src/main/resources/static/pages/base/timesmodel/fragments/deletelp.html
    #	src/main/resources/static/pages/base/timesmodel/fragments/editbc.html
    #	src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js
    #	src/main/resources/static/pages/base/timesmodel/js/dateTimeTool.js
    #	src/main/resources/static/pages/base/timesmodel/js/echartsDrawGanTT.js
    #	src/main/resources/static/pages/base/timesmodel/js/gantt.js
    #	src/main/resources/static/pages/base/timesmodel/js/systemTools.js
    #	src/main/resources/static/pages/base/timesmodel/js/v1/AdjustTrip.js
    #	src/main/resources/static/pages/base/timesmodel/js/v1/bcFun.js
    #	src/main/resources/static/pages/base/timesmodel/js/v1/lpFun.js
    #	src/main/resources/static/pages/base/timesmodel/js/v1/scheduleInitialize.js
    游瑞烽 authored
    2019-03-06 10:12:09 +0800  
    Browse Code »

01 Mar, 2019
6 commits
  • 线调更新
      96097ffc
    lizhuojun authored
    2019-03-01 17:23:39 +0800  
    Browse Code »
  • 线调更新
    9150cb31
    lizhuojun authored
    2019-03-01 17:23:15 +0800  
    Browse Code »
  • 线调更新
      4f6a96fe
    lizhuojun authored
    2019-03-01 17:13:22 +0800  
    Browse Code »
  • 线调更新
      26d356d2
    lizhuojun authored
    2019-03-01 16:30:09 +0800  
    Browse Code »
  • 线调更新
    dd087e20
    lizhuojun authored
    2019-03-01 12:22:09 +0800  
    Browse Code »
  • 线调更新
    d5dca6f2
    lizhuojun authored
    2019-03-01 12:16:19 +0800  
    Browse Code »