joylink_cuiweidong
|
48cd28bd88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:03:48 +08:00 |
|
joylink_cuiweidong
|
ff912ff0f5
|
宁波一号线 运行图预览加点选
|
2020-07-31 16:03:32 +08:00 |
|
fan
|
06ed0a6f76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-07-31 15:53:36 +08:00 |
|
fan
|
deb60acd14
|
绘图调整兼容数据&综合仿真观众咱不关闭三维驾驶&设备配置规整
|
2020-07-31 15:53:25 +08:00 |
|
zyy
|
d15328de57
|
调整地图绘制流程
|
2020-07-31 15:24:44 +08:00 |
|
zyy
|
f1d72d0968
|
调整综合演练流程
|
2020-07-30 18:42:41 +08:00 |
|
zyy
|
a7144dd4da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 17:49:34 +08:00 |
|
zyy
|
e4c20b1bf8
|
调整老版地图绘制文件位置
|
2020-07-30 17:49:20 +08:00 |
|
fan
|
0a7d3d97bd
|
调整剧本会话@
|
2020-07-30 16:33:08 +08:00 |
|
fan
|
71d3ff5d87
|
调整驾驶终端进入跳转
|
2020-07-30 15:58:28 +08:00 |
|
zyy
|
48491044ce
|
调整列表样式
|
2020-07-30 15:32:39 +08:00 |
|
zyy
|
a6feabd406
|
调整地图绘制逻辑
|
2020-07-30 15:10:10 +08:00 |
|
zyy
|
841946ce29
|
调整按钮样式
|
2020-07-29 17:41:19 +08:00 |
|
zyy
|
0110502711
|
删除多余注释
|
2020-07-29 16:59:57 +08:00 |
|
fan
|
2648ed6a4a
|
仿真会话调整
|
2020-07-29 16:24:51 +08:00 |
|
zyy
|
e6551dd4a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 16:15:53 +08:00 |
|
zyy
|
480d98deb9
|
调整成员聊天样式
|
2020-07-29 16:15:39 +08:00 |
|
fan
|
33a8a17bc3
|
综合仿真按钮调整
|
2020-07-29 15:42:10 +08:00 |
|
zyy
|
d1362aa923
|
调整样式按钮位置
|
2020-07-29 13:52:34 +08:00 |
|
zyy
|
244e8975f3
|
调整样式
|
2020-07-29 13:41:29 +08:00 |
|
zyy
|
c2b17d3615
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 13:23:35 +08:00 |
|
zyy
|
c3e7f8227a
|
调整区段字段显示，调整功能按钮样式
|
2020-07-29 13:23:25 +08:00 |
|
fan
|
a18c84f684
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 11:14:57 +08:00 |
|
fan
|
24e3a606fa
|
调整会话按钮名称&宁波一剩余菜单回车快捷键
|
2020-07-29 11:14:45 +08:00 |
|
zyy
|
d91467db70
|
调整地图加载功能栏样式
|
2020-07-29 10:27:02 +08:00 |
|
zyy
|
ac7424785a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/menuDemon.vue
|
2020-07-29 09:32:16 +08:00 |
|
zyy
|
1ce9303bcb
|
调整哈尔滨显示左下角菜单栏
|
2020-07-29 09:31:08 +08:00 |
|
fan
|
32a8daff56
|
merge
|
2020-07-28 18:30:44 +08:00 |
|
fan
|
f13ba95407
|
宁波菜单回车快捷键（区段、信号机、车站）&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整
|
2020-07-28 18:28:31 +08:00 |
|
zyy
|
6ca803d06d
|
调整车站颜色，功能栏宽度判断
|
2020-07-28 17:55:07 +08:00 |
|
zyy
|
ac43981c7d
|
调整哈尔滨车站操作
|
2020-07-28 16:59:32 +08:00 |
|
zyy
|
73f3cb0d0d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 16:41:36 +08:00 |
|
zyy
|
eec51e7cfd
|
调整哈尔滨车站操作
|
2020-07-28 16:41:21 +08:00 |
|
fan
|
10918d1f06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 16:29:06 +08:00 |
|
fan
|
0ad13f9fe8
|
宁波菜单弹框回车快捷键
|
2020-07-28 16:28:55 +08:00 |
|
zyy
|
2fd8c44f85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 14:44:52 +08:00 |
|
zyy
|
9f53e6e5f0
|
调整综合演练按钮显示逻辑，调整聊天窗口逻辑
|
2020-07-28 14:44:37 +08:00 |
|
fan
|
594087489a
|
调整角色切换bug&通号界面添加成员管理&仿真按钮offset位置修复
|
2020-07-28 14:11:17 +08:00 |
|
zyy
|
9c3f178121
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 11:30:09 +08:00 |
|
zyy
|
027f15102e
|
调整地图加载流程
|
2020-07-28 11:29:39 +08:00 |
|
fan
|
3912a08612
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 11:14:16 +08:00 |
|
fan
|
893c8846bb
|
gzb、xty、heb登录样式调整&项目设备登录去大屏按钮
|
2020-07-28 11:14:06 +08:00 |
|
zyy
|
59a75280a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/lesson/lessoncategory/edit/chapter/list.vue
# src/views/lesson/trainingRule/list.vue
# src/views/newMap/displayNew/index.vue
|
2020-07-27 18:09:38 +08:00 |
|
zyy
|
42d9906550
|
调整地图加载多余配置，增加宁波右键列车新指令
|
2020-07-27 18:04:47 +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
|
2c39916217
|
调整运行图预览逻辑
|
2020-07-27 13:15:01 +08:00 |
|
zyy
|
fdd125e10f
|
修改运行图管理加载失败状态调整
|
2020-07-27 09:49:52 +08:00 |
|
zyy
|
789391e81a
|
调整地图加载顺序
|
2020-07-24 18:38:19 +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 |
|