joylink_cuiweidong
|
c3e4c6ae14
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 16:11:46 +08:00 |
|
joylink_cuiweidong
|
3562b19d8a
|
地图绘图代码调整（表单使用公用组件）
|
2020-07-27 16:11:29 +08:00 |
|
fan
|
a5f6517ab8
|
设备管理IBP添加配置项
|
2020-07-27 15:33:54 +08:00 |
|
fan
|
7661d36ca4
|
宁波行调添加单锁&获取操作类型map调整
|
2020-07-27 15:22:26 +08:00 |
|
fan
|
8e6d424453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 14:12:02 +08:00 |
|
fan
|
a74993f217
|
添加地图配置项rmAtpSpeed，urmAtpSpeed&调整课程创建
|
2020-07-27 14:11:43 +08:00 |
|
zyy
|
a8d584ae89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 13:15:12 +08:00 |
|
zyy
|
2c39916217
|
调整运行图预览逻辑
|
2020-07-27 13:15:01 +08:00 |
|
fan
|
366375d9d0
|
merge
|
2020-07-27 10:01:07 +08:00 |
|
fan
|
a5a55af5ef
|
加载仿真计划失表取消loading状态&暂撤销宁波一计轴故障修改
|
2020-07-27 10:00:08 +08:00 |
|
zyy
|
fdd125e10f
|
修改运行图管理加载失败状态调整
|
2020-07-27 09:49:52 +08:00 |
|
joylink_zyy
|
c50adf149b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-25 15:07:59 +08:00 |
|
joylink_zyy
|
766d2b93a7
|
调整单人仿真获取人员列表
|
2020-07-25 15:07:45 +08:00 |
|
zyy
|
02abbd8192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 18:38:34 +08:00 |
|
zyy
|
789391e81a
|
调整地图加载顺序
|
2020-07-24 18:38:19 +08:00 |
|
joylink_cuiweidong
|
5ee257e9e2
|
地图绘图代码调整
|
2020-07-24 18:22:54 +08:00 |
|
joylink_cuiweidong
|
95d1f263da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 17:52:11 +08:00 |
|
joylink_cuiweidong
|
2affbbd5e4
|
地图绘制代码调整
|
2020-07-24 17:51:55 +08:00 |
|
zyy
|
8b5122a88f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 17:17:52 +08:00 |
|
zyy
|
cc5d68de39
|
调整综合演练流程，增加列车操作
|
2020-07-24 17:17:40 +08:00 |
|
joylink_cuiweidong
|
f8f921a543
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 16:03:29 +08:00 |
|
joylink_cuiweidong
|
d5ad3ab59d
|
地图绘制代码调整
|
2020-07-24 16:02:55 +08:00 |
|
fan
|
75164e9a5f
|
调整综合仿真现地行调切换显示
|
2020-07-24 15:28:45 +08:00 |
|
fan
|
fd4acc0a82
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 14:21:22 +08:00 |
|
fan
|
d4da17ae09
|
调整哈尔滨成都一故障样式&哈尔滨现地切换显示
|
2020-07-24 14:20:38 +08:00 |
|
zyy
|
b69cc2c4ab
|
调整哈尔滨线路设备管理，判断设备管理显示逻辑
|
2020-07-24 14:11:03 +08:00 |
|
zyy
|
584f65d285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 11:01:33 +08:00 |
|
zyy
|
fe08980f2f
|
调整判断
|
2020-07-24 11:01:22 +08:00 |
|
joylink_cuiweidong
|
ed8795a3a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 10:35:22 +08:00 |
|
joylink_cuiweidong
|
196a611d70
|
仿真聊天代码调整
|
2020-07-24 10:35:05 +08:00 |
|
fan
|
33a8eba1c7
|
调整实训行为记录
|
2020-07-24 10:14:59 +08:00 |
|
fan
|
5d413dba8c
|
调整订阅
|
2020-07-23 19:25:40 +08:00 |
|
zyy
|
e7ee0344b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/index.vue
|
2020-07-23 18:07:46 +08:00 |
|
zyy
|
fb0f961b17
|
删除多余线路逻辑
|
2020-07-23 18:04:13 +08:00 |
|
joylink_cuiweidong
|
5a35fa4f29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/index.vue
|
2020-07-23 17:57:36 +08:00 |
|
joylink_cuiweidong
|
986ce16d78
|
仿真系统聊天代码调整
|
2020-07-23 17:51:37 +08:00 |
|
zyy
|
2434de38bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:09:43 +08:00 |
|
zyy
|
9ec64f1eeb
|
调整加载方式及判断
|
2020-07-23 17:09:29 +08:00 |
|
fan
|
91faa164ea
|
删除断点
|
2020-07-23 16:55:23 +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 |
|
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 |
|
zyy
|
081f0e6178
|
调整大屏默认宽度
|
2020-07-22 14:26:51 +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 |
|
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
|
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
|
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
|
64466ff7d6
|
综合演练初始化清除activeTrainList
|
2020-07-21 15:54:35 +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 |
|
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
|
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
|
b51b8680c2
|
会话调整
|
2020-07-21 14:56:46 +08:00 |
|
fan
|
ebeda7eb0d
|
会话调整
|
2020-07-21 13:57:45 +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 |
|
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
|
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 |
|
joylink_cuiweidong
|
95a9d18ccd
|
地图绘图代码调整
|
2020-07-20 17:13:56 +08:00 |
|
fan
|
ceb0d0803d
|
参数名称修改
|
2020-07-20 17:04:36 +08:00 |
|
fan
|
7b92d4775a
|
设备配置调整
|
2020-07-20 17:00:59 +08:00 |
|
fan
|
3d357ba515
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 16:54:19 +08:00 |
|
fan
|
60ca3e7376
|
设备配置调整
|
2020-07-20 16:54:10 +08:00 |
|
joylink_cuiweidong
|
b1821d8274
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 16:46:55 +08:00 |
|
joylink_cuiweidong
|
f809d514a1
|
地图绘制代码调整
|
2020-07-20 16:46:38 +08:00 |
|
fan
|
a5961f5651
|
设备配置title调整
|
2020-07-20 16:04:43 +08:00 |
|
fan
|
0403b249a1
|
设备配置调整
|
2020-07-20 16:00:27 +08:00 |
|