joylink_cuiweidong
|
0f188a6dab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 15:23:39 +08:00 |
|
joylink_cuiweidong
|
69e935f559
|
宁波线进路 实训定义代码调整
|
2020-09-25 15:23:23 +08:00 |
|
zyy
|
bcdf1524cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 15:23:06 +08:00 |
|
zyy
|
55910a826b
|
调整会话
|
2020-09-25 15:22:54 +08:00 |
|
joylink_cuiweidong
|
dd9ffdeb52
|
删除不必要的文件
|
2020-09-25 14:48:09 +08:00 |
|
joylink_cuiweidong
|
4dfb904133
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 14:47:13 +08:00 |
|
joylink_cuiweidong
|
2386f424d4
|
竞赛 理论考试 代码调整
|
2020-09-25 14:46:57 +08:00 |
|
zyy
|
a0adc641b2
|
增加iconfont图标导入，调整逻辑
|
2020-09-25 13:58:41 +08:00 |
|
zyy
|
7fb7c0a819
|
调整代码
|
2020-09-24 19:04:33 +08:00 |
|
zyy
|
88ec572564
|
调整车站值班员按钮
|
2020-09-24 18:34:25 +08:00 |
|
zyy
|
8a28526fe1
|
调整样式
|
2020-09-24 17:55:06 +08:00 |
|
zyy
|
a5b954c017
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-24 17:26:12 +08:00 |
|
zyy
|
aa34210cae
|
调整会话框流程
|
2020-09-24 17:25:52 +08:00 |
|
joylink_cuiweidong
|
83793d75ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-24 13:42:16 +08:00 |
|
joylink_cuiweidong
|
fcf01baa53
|
竞赛 理论考试 练习模式代码调整
|
2020-09-24 13:42:01 +08:00 |
|
zyy
|
c71d4beb39
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-24 13:40:24 +08:00 |
|
zyy
|
be565e3711
|
调整道岔逻辑
|
2020-09-24 13:40:09 +08:00 |
|
joylink_cuiweidong
|
7753f831f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 18:44:24 +08:00 |
|
joylink_cuiweidong
|
d67aa6804f
|
竞赛 理论考试 代码调整
|
2020-09-23 18:44:00 +08:00 |
|
sunzhenyu
|
0202d20591
|
修改三维cctv速度
|
2020-09-23 16:39:16 +08:00 |
|
sunzhenyu
|
a3342d93ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 16:21:07 +08:00 |
|
sunzhenyu
|
5215064faa
|
增加三维vr列车抢修测试界面，修改三维哈尔滨本地文件列车
|
2020-09-23 16:20:50 +08:00 |
|
zyy
|
5109f7b558
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 10:38:35 +08:00 |
|
zyy
|
21f5208c21
|
调整综合监控
|
2020-09-23 10:38:22 +08:00 |
|
joylink_cuiweidong
|
dc8ae0bbfe
|
iscs 绘图调整
|
2020-09-23 10:22:52 +08:00 |
|
joylink_cuiweidong
|
1faf2cbf91
|
代码调整
|
2020-09-22 18:47:34 +08:00 |
|
joylink_cuiweidong
|
465391b20e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 18:46:12 +08:00 |
|
zyy
|
0ed3d83273
|
调整表格配置
|
2020-09-22 18:45:20 +08:00 |
|
joylink_cuiweidong
|
d56e713232
|
iscs 系统代码调整
|
2020-09-22 18:45:00 +08:00 |
|
zyy
|
d93cbc4beb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 18:03:58 +08:00 |
|
zyy
|
2ef9409527
|
增加图片
|
2020-09-22 18:03:46 +08:00 |
|
joylink_cuiweidong
|
5d0f5ad4fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 17:51:32 +08:00 |
|
joylink_cuiweidong
|
f26726055c
|
iscs 绘图代码调整
|
2020-09-22 17:51:15 +08:00 |
|
zyy
|
0a01ea04c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 17:12:39 +08:00 |
|
zyy
|
57de1331e2
|
调整福州一号线综合监控配置
|
2020-09-22 17:12:28 +08:00 |
|
fan
|
7b766e2a47
|
理论题库导入
|
2020-09-22 16:56:32 +08:00 |
|
fan
|
4a0509546f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 16:45:31 +08:00 |
|
fan
|
21d2a9953f
|
理论题库导入
|
2020-09-22 16:45:19 +08:00 |
|
fan
|
53d7586313
|
理论题库导入
|
2020-09-22 16:45:03 +08:00 |
|
joylink_cuiweidong
|
0c81fb8208
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 15:26:00 +08:00 |
|
joylink_cuiweidong
|
f2bbefc27e
|
iscs 三角形绘图元素添加
|
2020-09-22 15:25:33 +08:00 |
|
sunzhenyu
|
7d31d198f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 15:17:06 +08:00 |
|
sunzhenyu
|
89fd0ec052
|
修改三维cctv移动鼠标卡顿，改用主线程渲染人物动画
|
2020-09-22 15:16:53 +08:00 |
|
joylink_cuiweidong
|
1e8577cefd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 11:31:35 +08:00 |
|
joylink_cuiweidong
|
d346ec8f2e
|
iscs 系统代码调整
|
2020-09-22 11:31:18 +08:00 |
|
fan
|
8f3f722d4a
|
sics文字矩形组合元素添加
|
2020-09-22 11:28:28 +08:00 |
|
fan
|
6a68147700
|
去除创建会话提示
|
2020-09-22 09:52:48 +08:00 |
|
fan
|
e4be43ad37
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 09:51:22 +08:00 |
|
fan
|
87bee8bcb5
|
iscs调整&去除创建会话提示
|
2020-09-22 09:51:01 +08:00 |
|
joylink_cuiweidong
|
e56731421f
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-09-21 18:55:51 +08:00 |
|