sunleking
|
ec9409b1df
|
修改三维模块获取站场图数据接口
|
2020-11-27 20:18:45 +08:00 |
|
fan
|
120f7bdc95
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/views/messageBoard/index.vue
|
2020-11-27 18:59:07 +08:00 |
|
fan
|
360973274c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 18:10:16 +08:00 |
|
fan
|
f824b15bc1
|
退出按钮展示条件判断
|
2020-11-27 18:09:58 +08:00 |
|
sunzhenyu
|
dda3cedf30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:50:39 +08:00 |
|
sunzhenyu
|
7491a63b42
|
三维客流退出样式
|
2020-11-27 17:50:33 +08:00 |
|
joylink_cuiweidong
|
34424f11a0
|
地图缓存代码调整
|
2020-11-27 17:49:21 +08:00 |
|
joylink_cuiweidong
|
6a9406054d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:37:30 +08:00 |
|
joylink_cuiweidong
|
c1507b01e1
|
地图数据加载到缓存store里（刷新之后数据会丢失）
删除暂时无用的代码
|
2020-11-27 17:37:13 +08:00 |
|
sunzhenyu
|
7068b73585
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:25:02 +08:00 |
|
sunzhenyu
|
c8cdf34397
|
修改三维客流退出页面取消订阅
|
2020-11-27 17:24:52 +08:00 |
|
zyy
|
ef45842dfc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 16:26:53 +08:00 |
|
zyy
|
900064a767
|
调整福州线路实训操作
|
2020-11-27 16:26:42 +08:00 |
|
joylink_cuiweidong
|
b3f538fa09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 15:04:15 +08:00 |
|
joylink_cuiweidong
|
93e936a766
|
北交大 客流项目代码调整
|
2020-11-27 15:03:55 +08:00 |
|
fan
|
056570c096
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:18:42 +08:00 |
|
fan
|
76f9db3eb6
|
留言板添加至新标签页
(cherry picked from commit a509af1e09)
|
2020-11-27 14:17:54 +08:00 |
|
zyy
|
eabb4b8782
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:15:32 +08:00 |
|
zyy
|
6b8bfffd21
|
调整限速实训流程
|
2020-11-27 14:15:19 +08:00 |
|
joylink_cuiweidong
|
90ec120603
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:05:28 +08:00 |
|
joylink_cuiweidong
|
c2cd9e73d5
|
考试系统代码调整
|
2020-11-27 14:05:10 +08:00 |
|
sunzhenyu
|
c3a8ab7929
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:00:05 +08:00 |
|
sunzhenyu
|
c2f2698092
|
修改三维客流窗口操作
|
2020-11-27 13:59:54 +08:00 |
|
fan
|
a509af1e09
|
留言板添加至新标签页
|
2020-11-27 09:55:33 +08:00 |
|
zyy
|
032c3036b8
|
调整国赛系统样式名称
|
2020-11-27 09:22:25 +08:00 |
|
joylink_cuiweidong
|
db6caa6591
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-11-26 18:55:16 +08:00 |
|
joylink_cuiweidong
|
1f7c3f3bf7
|
宁波一号线 人解进路更换指令（之前为信号机取消引导，换为人解进路）
|
2020-11-26 18:52:53 +08:00 |
|
fan
|
c1a7f08686
|
Merge remote-tracking branch 'origin/test'
|
2020-11-26 18:37:22 +08:00 |
|
joylink_cuiweidong
|
3132506382
|
宁波一号线 取消进路 指令 换成 总取消
|
2020-11-26 18:21:57 +08:00 |
|
joylink_cuiweidong
|
2dad05d63f
|
福州一号线 西安三号线 实训定义代码调整
|
2020-11-26 17:22:49 +08:00 |
|
joylink_cuiweidong
|
00e60e877c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 16:43:23 +08:00 |
|
joylink_cuiweidong
|
d1eec65783
|
西安三号线 福州一号线 实训定义代码调整
|
2020-11-26 16:43:00 +08:00 |
|
fan
|
43c0de245d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 14:54:58 +08:00 |
|
fan
|
5abdfc9883
|
哈尔滨操作调整
|
2020-11-26 14:54:37 +08:00 |
|
sunzhenyu
|
9794e37274
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 14:52:58 +08:00 |
|
sunzhenyu
|
3dba656827
|
修复三维客流列车初始画面更新人物显示
|
2020-11-26 14:47:40 +08:00 |
|
joylink_cuiweidong
|
17e5f13202
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 14:39:15 +08:00 |
|
joylink_cuiweidong
|
5d02a56646
|
福州线路新版 操作调整
|
2020-11-26 14:37:48 +08:00 |
|
fan
|
b98ab0ae4b
|
merge
|
2020-11-26 14:27:45 +08:00 |
|
fan
|
8b8b5bd028
|
哈尔滨操作调整
|
2020-11-26 14:26:35 +08:00 |
|
joylink_cuiweidong
|
c6ec7c9049
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 11:15:42 +08:00 |
|
joylink_cuiweidong
|
e1ab504ddb
|
屏蔽门绘图调整
|
2020-11-26 11:15:25 +08:00 |
|
sunzhenyu
|
e56cc5f146
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 10:24:36 +08:00 |
|
sunzhenyu
|
ec5d118b80
|
修改三维通号故障内容初始化
|
2020-11-26 10:24:26 +08:00 |
|
sunzhenyu
|
d82ec7e6c0
|
修改三维通号故障内容
|
2020-11-26 10:21:59 +08:00 |
|
fan
|
a84120c2e5
|
语音路径调整
|
2020-11-26 09:33:30 +08:00 |
|
fan
|
78c04585a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-11-26 09:09:45 +08:00 |
|
fan
|
dbc807d703
|
语音路径调整
|
2020-11-26 09:09:18 +08:00 |
|
fan
|
10d8b674b4
|
哈尔滨操作调整
|
2020-11-25 18:41:35 +08:00 |
|
joylink_cuiweidong
|
a5dad072ca
|
实训平台代码调整
|
2020-11-25 18:28:20 +08:00 |
|