zyy
|
c8c8a33966
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 13:38:15 +08:00 |
|
zyy
|
b1b8324484
|
调整列车，道岔故障模式右键操作
|
2020-07-22 13:37:56 +08:00 |
|
fan
|
7bd43dd7d4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 13:31:10 +08:00 |
|
fan
|
507fdd2593
|
综合仿真页面调整&删除连接真实设备
|
2020-07-22 13:30:56 +08:00 |
|
zyy
|
31b6241bf7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 13:16:21 +08:00 |
|
zyy
|
b9a412943e
|
调整哈尔滨聊天窗口位置
|
2020-07-22 13:16:04 +08:00 |
|
joylink_cuiweidong
|
c6878dd7ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 11:26:16 +08:00 |
|
joylink_cuiweidong
|
517b41b586
|
控制权转换指令添加报错信息
|
2020-07-22 11:25:54 +08:00 |
|
zyy
|
b0d5f09baf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 11:23:15 +08:00 |
|
zyy
|
dd22ce9940
|
调整西安线路故障模式操作
|
2020-07-22 11:23:02 +08:00 |
|
joylink_cuiweidong
|
191816db09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 09:46:00 +08:00 |
|
fan
|
da120ce273
|
调整西安地铁项目登录参数
|
2020-07-22 09:45:00 +08:00 |
|
fan
|
63cecaef46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 09:05:45 +08:00 |
|
fan
|
c617cf27c6
|
heb项目取消综合仿真生成二维码按钮
|
2020-07-22 09:04:45 +08:00 |
|
joylink_cuiweidong
|
f3d2982bd2
|
剧本预览代码调整
|
2020-07-21 19:27:32 +08:00 |
|
program-walker
|
96a32e1e37
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/layout/components/Title.vue
# src/scripts/ProjectConfig.js
# src/views/lesson/lessoncategory/edit/chapter/list.vue
# src/views/lesson/trainingRule/list.vue
# src/views/login/index.vue
# src/views/publish/examRule/draft/examFrom.vue
# src/views/publish/examRule/draft/index.vue
# src/views/publish/examRule/index.vue
# src/views/studentManage/index.vue
|
2020-07-21 19:19:54 +08:00 |
|
sunzhenyu
|
a292a4a6d2
|
修改三维无用注释
|
2020-07-21 17:30:36 +08:00 |
|
fan
|
eb14634f2f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 17:09:46 +08:00 |
|
fan
|
66df3e244f
|
三维注释sockjs引入
|
2020-07-21 17:09:24 +08:00 |
|
zyy
|
f693941daa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 16:43:34 +08:00 |
|
zyy
|
aeb3e24c24
|
修改操作字段
|
2020-07-21 16:43:15 +08:00 |
|
sunzhenyu
|
5cf31a8c83
|
Merge brant ch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 16:33:23 +08:00 |
|
sunzhenyu
|
735a22b7da
|
修改驾驶行车转弯
|
2020-07-21 16:33:17 +08:00 |
|
sunzhenyu
|
786c5a3082
|
修改单体设备三维全屏
|
2020-07-21 16:32:47 +08:00 |
|
program-walker
|
9ab295ade1
|
Merge remote-tracking branch 'origin/test' into test
|
2020-07-21 16:19:14 +08:00 |
|
program-walker
|
102dad20f6
|
改文件夹名称model->MODEL
|
2020-07-21 16:18:27 +08:00 |
|
zyy
|
8715ce2f97
|
调整哈尔滨列车操作
|
2020-07-21 16:17:04 +08:00 |
|
zyy
|
37d539b715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 16:01:13 +08:00 |
|
zyy
|
85203bfbe1
|
增加哈尔滨线路故障操作
|
2020-07-21 16:00:41 +08:00 |
|
fan
|
4addc342f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:54:41 +08:00 |
|
fan
|
64466ff7d6
|
综合演练初始化清除activeTrainList
|
2020-07-21 15:54:35 +08:00 |
|
sunzhenyu
|
654351c4f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:50:34 +08:00 |
|
sunzhenyu
|
b8c60e8069
|
修改三维设备nvidia扩展屏幕下拉伸
|
2020-07-21 15:50:25 +08:00 |
|
fan
|
450eded4ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:39:09 +08:00 |
|
fan
|
d518ae9907
|
成员列表报错调整
|
2020-07-21 15:38:47 +08:00 |
|
sunzhenyu
|
23974b1c5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:33:28 +08:00 |
|
sunzhenyu
|
c07a57ed1c
|
修改哈尔滨路径
|
2020-07-21 15:32:51 +08:00 |
|
joylink_cuiweidong
|
1038063860
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:23:23 +08:00 |
|
joylink_cuiweidong
|
54b838a46b
|
剧本预览代码调整
聊天会话代码优化
|
2020-07-21 15:15:28 +08:00 |
|
sunzhenyu
|
62a9562f3e
|
修改三维cctv obj路径
|
2020-07-21 15:13:29 +08:00 |
|
zyy
|
d0697bd94a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:11:49 +08:00 |
|
zyy
|
ed9815393a
|
调整线路列车右键操作
|
2020-07-21 15:11:33 +08:00 |
|
sunzhenyu
|
5c18430ff2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 15:10:08 +08:00 |
|
fan
|
dcc36af6cc
|
成员列表报错调整
|
2020-07-21 15:09:43 +08:00 |
|
sunzhenyu
|
8ce7e33c5e
|
删除三维无用console，修改cctv寻路obj路径
|
2020-07-21 14:59:17 +08:00 |
|
fan
|
cf81f7521a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 14:57:05 +08:00 |
|
fan
|
b51b8680c2
|
会话调整
|
2020-07-21 14:56:46 +08:00 |
|
fan
|
ebeda7eb0d
|
会话调整
|
2020-07-21 13:57:45 +08:00 |
|
zyy
|
47513d1d50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 13:56:26 +08:00 |
|
zyy
|
b518b81cce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 13:55:51 +08:00 |
|