sunzhenyu
|
65fb03834f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 09:14:40 +08:00 |
|
sunzhenyu
|
97a829598b
|
修改三维驾驶车组号显示
|
2020-04-01 09:14:33 +08:00 |
|
fan
|
7df417424e
|
调整本地项目快速入口
|
2020-04-01 09:07:42 +08:00 |
|
joylink_cuiweidong
|
046cfe8318
|
Merge branch 'dev' into test
|
2020-03-31 19:13:42 +08:00 |
|
joylink_cuiweidong
|
06a6087f0c
|
代码调整
|
2020-03-31 19:12:30 +08:00 |
|
joylink_cuiweidong
|
955ddacbe0
|
Merge branch 'dev' into test
|
2020-03-31 19:09:06 +08:00 |
|
joylink_cuiweidong
|
bc6940f80b
|
仿真界面添加列车详情(未完成)
|
2020-03-31 19:06:23 +08:00 |
|
sunzhenyu
|
51f1ef4b62
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-31 18:52:11 +08:00 |
|
sunzhenyu
|
6ae459b910
|
merge
|
2020-03-31 18:52:05 +08:00 |
|
fan
|
eddca622df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-31 18:51:02 +08:00 |
|
fan
|
bfd5b07145
|
调整本地项目综合演练
|
2020-03-31 18:50:16 +08:00 |
|
sunzhenyu
|
ec0f59682b
|
merge
|
2020-03-31 18:45:00 +08:00 |
|
sunzhenyu
|
3bbd28c17b
|
限制只有新数据有驾驶面板
|
2020-03-31 18:42:38 +08:00 |
|
sunzhenyu
|
d4f7da9c8b
|
添加驾驶操作面板，三维模型资源改本地
|
2020-03-31 18:30:15 +08:00 |
|
zyy
|
3ab182f3c4
|
调整逻辑区段显示，过滤框选逻辑区段
|
2020-03-31 17:52:53 +08:00 |
|
fan
|
335132c9b9
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-31 16:55:58 +08:00 |
|
fan
|
007c3658c6
|
调整本地项目
|
2020-03-31 16:54:04 +08:00 |
|
zyy
|
d0739816da
|
调整步骤发送数据
|
2020-03-31 16:03:34 +08:00 |
|
zyy
|
10afb6192b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 15:35:10 +08:00 |
|
zyy
|
4ef3c69f9f
|
调整显示内容 判断
|
2020-03-31 15:34:55 +08:00 |
|
fan
|
e35149248d
|
调整本地项目
|
2020-03-31 15:11:20 +08:00 |
|
joylink_cuiweidong
|
3472860fbd
|
新版 剧本编制 添加动作指令操作添加 以及 动作指令展示
|
2020-03-31 14:52:19 +08:00 |
|
zyy
|
900489638c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 14:41:30 +08:00 |
|
zyy
|
1873898adc
|
调整回车内容不修改
|
2020-03-31 14:41:17 +08:00 |
|
fan
|
2093dea56d
|
调整哈尔滨项目路由调整
|
2020-03-31 14:03:44 +08:00 |
|
fan
|
724e198f79
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-31 13:47:25 +08:00 |
|
fan
|
5563212ec0
|
调整哈尔滨项目
|
2020-03-31 13:45:45 +08:00 |
|
fan
|
28e8cf53af
|
调整icon图标
|
2020-03-31 13:33:09 +08:00 |
|
fan
|
437491c9e7
|
调整
|
2020-03-31 13:13:21 +08:00 |
|
fan
|
d7b8879c8d
|
调整
|
2020-03-31 11:25:04 +08:00 |
|
fan
|
63c73ab78c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/views/jlmap3d/simulation/jl3dsimulation.vue
|
2020-03-31 11:14:33 +08:00 |
|
fan
|
a7a0fa4b41
|
个人信息修改调整
|
2020-03-31 11:08:22 +08:00 |
|
fan
|
7dfd5967eb
|
哈尔滨调整
|
2020-03-31 11:02:11 +08:00 |
|
fan
|
9a57ab9aa3
|
哈尔滨调整
|
2020-03-31 10:45:04 +08:00 |
|
fan
|
c7bd705726
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 10:06:56 +08:00 |
|
fan
|
d6e883e167
|
考试调整
|
2020-03-31 10:06:41 +08:00 |
|
zyy
|
1ad7265f58
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 09:43:01 +08:00 |
|
zyy
|
aaefa200c4
|
调整实训定义，调整提示逻辑
|
2020-03-31 09:42:46 +08:00 |
|
fan
|
e43ad1fa99
|
调整哈尔滨显示
|
2020-03-31 09:27:02 +08:00 |
|
fan
|
a3b6c3b59c
|
创建线下用户
|
2020-03-30 20:28:20 +08:00 |
|
fan
|
38bed2b045
|
Merge branches 'dev' and 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 19:59:00 +08:00 |
|
fan
|
19d5f71596
|
调整哈尔滨打包设计平台
|
2020-03-30 19:58:37 +08:00 |
|
zyy
|
9412fd0740
|
计算区段实际长度保留小数点3位
|
2020-03-30 17:59:23 +08:00 |
|
zyy
|
38ada8ccb2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:54:01 +08:00 |
|
zyy
|
919639ad03
|
调整哈尔滨现地操作步骤流程完善
|
2020-03-30 17:53:44 +08:00 |
|
fan
|
8e4c1d05c8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:41:54 +08:00 |
|
fan
|
2db44747ee
|
生成线下用户
|
2020-03-30 17:41:27 +08:00 |
|
joylink_cuiweidong
|
d4f3a4afa2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:39:16 +08:00 |
|
joylink_cuiweidong
|
8c2f1cf729
|
新剧本 仿真类型切换代码调整
|
2020-03-30 17:39:00 +08:00 |
|
fan
|
2de6c8c787
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:16:16 +08:00 |
|