fan
|
fdf49e53ae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:55:40 +08:00 |
|
fan
|
91faa164ea
|
删除断点
|
2020-07-23 16:55:23 +08:00 |
|
joylink_cuiweidong
|
81bfb35e67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:43:01 +08:00 |
|
joylink_cuiweidong
|
6210df54de
|
代码调整
|
2020-07-23 16:42:39 +08:00 |
|
sunzhenyu
|
5282d6f029
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:37:26 +08:00 |
|
sunzhenyu
|
8f0a4ec631
|
三维单体设备屏蔽门到站提醒声音(windows语音合成)
|
2020-07-23 16:37:14 +08:00 |
|
fan
|
9d7c11dca6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:07:44 +08:00 |
|
fan
|
e561f77c12
|
代码调整&socket重连前进行初始化
|
2020-07-23 16:07:27 +08:00 |
|
joylink_cuiweidong
|
d8484da992
|
运行图选中计划线 线条加粗 调整
|
2020-07-23 14:46:26 +08:00 |
|
joylink_cuiweidong
|
72b137435c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 13:38:59 +08:00 |
|
joylink_cuiweidong
|
478a8f0ba4
|
宁波线的列车，RM模式的时候，前面的箭头设置为灰色
|
2020-07-23 13:38:31 +08:00 |
|
zyy
|
11c021feb8
|
调整屏蔽门绘图
|
2020-07-23 13:16:45 +08:00 |
|
zyy
|
d313348a41
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 10:33:12 +08:00 |
|
zyy
|
e9b8e6e1b9
|
调整哈尔滨线路屏蔽门样式
|
2020-07-23 10:32:58 +08:00 |
|
joylink_cuiweidong
|
ece0ac79a3
|
剧本预览代码调整
|
2020-07-23 10:29:53 +08:00 |
|
joylink_cuiweidong
|
a85a543a39
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 17:20:47 +08:00 |
|
joylink_cuiweidong
|
597822430e
|
剧本预览代码调整
|
2020-07-22 17:20:24 +08:00 |
|
fan
|
0a5999bcd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 14:59:11 +08:00 |
|
fan
|
7a783cf032
|
项目设备大屏调整
|
2020-07-22 14:59:00 +08:00 |
|
sunzhenyu
|
4dfc104d4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 14:35:10 +08:00 |
|
sunzhenyu
|
714b520c38
|
修改三维设备展示站台名适配
|
2020-07-22 14:35:01 +08:00 |
|
zyy
|
081f0e6178
|
调整大屏默认宽度
|
2020-07-22 14:26:51 +08:00 |
|
sunzhenyu
|
c32651904b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 14:20:50 +08:00 |
|
sunzhenyu
|
39290fef25
|
修改哈尔滨单体设备初始车站名称
|
2020-07-22 14:20:41 +08:00 |
|
fan
|
8c7a78a545
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-22 14:20:12 +08:00 |
|
fan
|
02774eeb1e
|
调整综合演练大屏跳出&限制新窗口预登出
|
2020-07-22 14:19:58 +08:00 |
|
joylink_cuiweidong
|
9ba8764130
|
代码调整
|
2020-07-22 14:03:40 +08:00 |
|
joylink_cuiweidong
|
fbe928749b
|
剧本预览代码调整
|
2020-07-22 13:55:12 +08:00 |
|
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 |
|
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 |
|
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 |
|
zyy
|
1d2bf7693f
|
调整哈尔滨操作禁用配置
|
2020-07-21 13:55:35 +08:00 |
|
fan
|
1ea1583874
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 13:51:29 +08:00 |
|
fan
|
9ffd832562
|
会话调整
|
2020-07-21 13:51:13 +08:00 |
|
zyy
|
7498e7c844
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 13:38:13 +08:00 |
|
zyy
|
4bb41700bc
|
列车提示信息调整，哈尔滨线路操作
|
2020-07-21 13:37:59 +08:00 |
|
fan
|
337a2c127d
|
会话调整
|
2020-07-21 13:36:03 +08:00 |
|
fan
|
39afe867a4
|
会话调整
|
2020-07-21 13:32:43 +08:00 |
|
fan
|
acd929239b
|
会话调整
|
2020-07-21 13:22:58 +08:00 |
|
fan
|
d55d6a851b
|
北京皮肤调整
|
2020-07-21 13:16:10 +08:00 |
|
fan
|
bd841bde35
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 11:20:16 +08:00 |
|
fan
|
c97291e225
|
北京皮肤调整
|
2020-07-21 11:20:05 +08:00 |
|
fan
|
bbadc59bf1
|
宁波皮肤调整
|
2020-07-21 11:19:06 +08:00 |
|
sunzhenyu
|
7e8aa6e72c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 11:01:16 +08:00 |
|
sunzhenyu
|
179cce5b26
|
修改三维websocket
|
2020-07-21 11:01:02 +08:00 |
|
joylink_cuiweidong
|
d270f3ba59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 10:49:30 +08:00 |
|
joylink_cuiweidong
|
57ffa85451
|
剧本预览代码调整
|
2020-07-21 10:49:01 +08:00 |
|
fan
|
48d44ea15e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-21 10:03:25 +08:00 |
|
fan
|
5a716b335f
|
ibp设备配置调整
|
2020-07-21 10:03:13 +08:00 |
|
fan
|
0c08e93ba1
|
websocket调整&ibp设备配置调整
|
2020-07-21 10:01:19 +08:00 |
|
sunzhenyu
|
a82d3e65e3
|
修改三维静态资源目录
|
2020-07-20 18:32:07 +08:00 |
|
sunzhenyu
|
bb1dd69def
|
增加哈尔滨项目静态三维资源
|
2020-07-20 18:29:48 +08:00 |
|
sunzhenyu
|
24794006f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 17:32:28 +08:00 |
|
sunzhenyu
|
ac0efbd97b
|
修改三维编辑器模型配置，修改三维的沙盘,驾驶,cctv,单体设备,通号维修模型加载，贴图加载的问题
|
2020-07-20 17:32:16 +08:00 |
|
fan
|
88253207d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 17:19:21 +08:00 |
|
fan
|
a1895d4e7f
|
参数名称修改
|
2020-07-20 17:19:05 +08:00 |
|
joylink_cuiweidong
|
aba0055974
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 17:14:15 +08:00 |
|