zyy
|
e86c0b9c45
|
调整发布地图导入流程
|
2020-08-21 16:38:22 +08:00 |
|
joylink_cuiweidong
|
e699efc06f
|
剧本录制预览代码调整
|
2020-08-21 14:16:44 +08:00 |
|
joylink_cuiweidong
|
171353a4d3
|
仿真 剧本代码调整
|
2020-08-20 20:27:19 +08:00 |
|
fan
|
19b4b48c3f
|
merge
|
2020-08-17 18:16:31 +08:00 |
|
fan
|
6008dfc143
|
运行图调整
|
2020-08-17 18:12:51 +08:00 |
|
joylink_cuiweidong
|
c8ecd5bcb5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/menuSchema.vue
|
2020-08-17 13:28:15 +08:00 |
|
joylink_cuiweidong
|
9080e14e2a
|
剧本预览编制代码调整
|
2020-08-17 13:21:27 +08:00 |
|
fan
|
fe0fcec173
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 18:30:15 +08:00 |
|
joylink_cuiweidong
|
8692fdfd1b
|
综合演练仿真菜单层级调整
|
2020-08-14 17:52:14 +08:00 |
|
fan
|
9405b19195
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 11:18:46 +08:00 |
|
fan
|
150f047552
|
设备登录添加实训考试运行图编辑
|
2020-08-14 10:55:32 +08:00 |
|
sunzhenyu
|
165a84da5a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 15:55:33 +08:00 |
|
sunzhenyu
|
5b4db675a8
|
修改三维通号进入的界面，修改三维vr维修Gui
|
2020-08-13 15:55:25 +08:00 |
|
fan
|
cc0803630c
|
设备跳转运行图等（未完）
|
2020-08-13 11:23:07 +08:00 |
|
zyy
|
09b151e830
|
调整地图绘制流程
|
2020-08-11 15:46:15 +08:00 |
|
fan
|
a0bd7a309d
|
整合申请管理
|
2020-08-10 17:40:17 +08:00 |
|
fan
|
a5ee8ebed2
|
问题调整
|
2020-08-07 18:28:40 +08:00 |
|
joylink_cuiweidong
|
e2a7f160cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2020-08-07 13:23:08 +08:00 |
|
joylink_cuiweidong
|
e08dcd9c8d
|
宁波一号线控制权转移代码调整
综合演练页面 后退退出房间
|
2020-08-07 13:17:09 +08:00 |
|
fan
|
8e73c01b3f
|
成都一列车样式调整
|
2020-08-07 10:15:39 +08:00 |
|
fan
|
2668456ffd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 09:44:12 +08:00 |
|
fan
|
276babf477
|
再次进入综合仿真点击操作无效
|
2020-08-07 09:44:03 +08:00 |
|
joylink_cuiweidong
|
abb0143988
|
控制权转移代码调整
|
2020-08-06 19:34:13 +08:00 |
|
fan
|
aea8dc7eca
|
清理多余状态
|
2020-08-05 15:12:40 +08:00 |
|
fan
|
49bf6943aa
|
调整运行图预览按钮&删除无用console
|
2020-08-05 09:36:13 +08:00 |
|
fan
|
f1622afc0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-05 09:05:41 +08:00 |
|
fan
|
9cc130e737
|
仿真状态处理暂存
|
2020-08-05 09:05:26 +08:00 |
|
joylink_cuiweidong
|
e8c3cbfe3c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-04 15:29:24 +08:00 |
|
joylink_cuiweidong
|
73fe03432b
|
派班计划代码调整（更改排班计划预览接口）
|
2020-08-04 15:29:10 +08:00 |
|
fan
|
fb64429ee8
|
调整综合仿真开始状态管理
|
2020-08-04 14:17:47 +08:00 |
|
fan
|
f645433696
|
调整运行图加载方式
|
2020-08-04 10:03:06 +08:00 |
|
fan
|
313a99260c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-04 09:40:39 +08:00 |
|
fan
|
6c02fe9b75
|
撤销调整运行图加载方式
|
2020-08-04 09:40:20 +08:00 |
|
joylink_cuiweidong
|
1413a6a636
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 19:22:12 +08:00 |
|
joylink_cuiweidong
|
da39b8a1b4
|
哈尔滨一号线 教研机 切换 通号 层级调整
|
2020-08-03 19:21:56 +08:00 |
|
fan
|
f89d29ad59
|
调整司机角色在添加仿真成员是未过滤
|
2020-08-03 19:00:42 +08:00 |
|
fan
|
fc64c99c8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-03 18:48:47 +08:00 |
|
fan
|
cb7b03adbe
|
加载运行图数据失败调整
|
2020-08-03 18:45:24 +08:00 |
|
joylink_cuiweidong
|
a554912c09
|
哈尔滨一号线教研机 行调切通号 按钮显示调整
|
2020-08-03 17:28:46 +08:00 |
|
joylink_cuiweidong
|
baf0fe4900
|
故障操作切换代码调整
|
2020-08-03 16:59:23 +08:00 |
|
fan
|
3c622b6fb5
|
调整仿真仿真状态
|
2020-08-03 16:55:05 +08:00 |
|
fan
|
82bfb02b97
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-03 16:20:23 +08:00 |
|
fan
|
f23a3a8112
|
同步按计划行车时间
|
2020-08-03 16:20:14 +08:00 |
|
fan
|
42d850de66
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-03 15:27:26 +08:00 |
|
joylink_cuiweidong
|
753f7db809
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 15:27:20 +08:00 |
|
fan
|
8b5e94755c
|
加载运行图数据失表问题修复&添加新角色同步公共会话成员
|
2020-08-03 15:27:14 +08:00 |
|
joylink_cuiweidong
|
5c8ca28b52
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 15:25:31 +08:00 |
|
joylink_cuiweidong
|
e7ba329194
|
哈尔滨一号线 菜单隐藏 代码调整
|
2020-08-03 15:25:12 +08:00 |
|
zyy
|
f0c623e743
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 14:13:09 +08:00 |
|
zyy
|
31be09323b
|
调整综合演练顶部菜单判断，增加哈尔滨项目 行调设备登陆显示指令模式
|
2020-08-03 14:12:56 +08:00 |
|
joylink_cuiweidong
|
ca987254c7
|
新版地图仿真时间问题调整
|
2020-08-03 13:27:17 +08:00 |
|
joylink_cuiweidong
|
56b6c422f9
|
新版地图课程考试计时代码调整
|
2020-08-03 10:53:44 +08:00 |
|
zyy
|
b1fb2a12dc
|
调整样式
|
2020-08-03 09:53:34 +08:00 |
|
zyy
|
fb9e8f0325
|
调整地图样式及加载逻辑
|
2020-07-31 18:49:35 +08:00 |
|
fan
|
b82f701e67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-07-31 16:15:33 +08:00 |
|
fan
|
7be510605f
|
取消综合仿真观众暂不关闭三维驾驶
|
2020-07-31 16:14:33 +08:00 |
|
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 |
|
zyy
|
cc5d68de39
|
调整综合演练流程，增加列车操作
|
2020-07-24 17:17:40 +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
|
fe08980f2f
|
调整判断
|
2020-07-24 11:01:22 +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 |
|
fan
|
91faa164ea
|
删除断点
|
2020-07-23 16:55:23 +08:00 |
|
fan
|
e561f77c12
|
代码调整&socket重连前进行初始化
|
2020-07-23 16:07:27 +08:00 |
|
zyy
|
e9b8e6e1b9
|
调整哈尔滨线路屏蔽门样式
|
2020-07-23 10:32:58 +08:00 |
|
fan
|
02774eeb1e
|
调整综合演练大屏跳出&限制新窗口预登出
|
2020-07-22 14:19:58 +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
|
b9a412943e
|
调整哈尔滨聊天窗口位置
|
2020-07-22 13:16:04 +08:00 |
|
fan
|
c617cf27c6
|
heb项目取消综合仿真生成二维码按钮
|
2020-07-22 09:04:45 +08:00 |
|
fan
|
64466ff7d6
|
综合演练初始化清除activeTrainList
|
2020-07-21 15:54:35 +08:00 |
|
fan
|
d518ae9907
|
成员列表报错调整
|
2020-07-21 15:38:47 +08:00 |
|
fan
|
dcc36af6cc
|
成员列表报错调整
|
2020-07-21 15:09:43 +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
|
57ffa85451
|
剧本预览代码调整
|
2020-07-21 10:49:01 +08:00 |
|
fan
|
00608f2cb2
|
heb取消无法登录提示&会话、设备代码调整
|
2020-07-20 15:19:11 +08:00 |
|
fan
|
23885760f3
|
会话调整
|
2020-07-20 13:38:54 +08:00 |
|
fan
|
00a98a5b14
|
merger
|
2020-07-20 13:29:32 +08:00 |
|
fan
|
6f20f4db18
|
会话调整
|
2020-07-20 13:18:38 +08:00 |
|
fan
|
826b4da854
|
公共会话切换
|
2020-07-20 10:48:53 +08:00 |
|
joylink_cuiweidong
|
39eace3b40
|
剧本预览代码调整
|
2020-07-20 10:28:31 +08:00 |
|
fan
|
3038d5571f
|
会话调整
|
2020-07-17 19:07:34 +08:00 |
|
fan
|
fefd4b53b6
|
会话调整&设备配置调整
|
2020-07-17 16:35:24 +08:00 |
|
fan
|
0a50c69b2c
|
设备配置调整
|
2020-07-16 19:11:20 +08:00 |
|
fan
|
c761e07ba2
|
设备配置调整
|
2020-07-16 13:31:05 +08:00 |
|
joylink_cuiweidong
|
1d6868ee54
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 18:22:31 +08:00 |
|
joylink_cuiweidong
|
f9f58a70c4
|
剧本预览代码调整
绘图高级页面代码调整
|
2020-07-14 18:21:40 +08:00 |
|
zyy
|
b2f9e388aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 18:14:53 +08:00 |
|
zyy
|
172623c0f1
|
调整宁波线路道岔失表显示
|
2020-07-14 18:14:39 +08:00 |
|
fan
|
9efc0d4bfb
|
成员管理高度调整
|
2020-07-14 17:30:35 +08:00 |
|
fan
|
286d38db5c
|
会话调整
|
2020-07-14 17:21:39 +08:00 |
|
zyy
|
c2d158da5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 15:35:19 +08:00 |
|
zyy
|
952de95f4c
|
调整列车列表样式
|
2020-07-14 15:35:03 +08:00 |
|
fan
|
135fe2d917
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 15:32:29 +08:00 |
|
fan
|
0db415d5ca
|
北信坤成页面调整&&综合演练会话调整
|
2020-07-14 15:32:18 +08:00 |
|
zyy
|
dfc478b8d4
|
调整哈尔滨综合演练按钮位置，调整角色设置样式
|
2020-07-14 14:30:37 +08:00 |
|
zyy
|
8fb216dbae
|
增加项目中设备管理页面
|
2020-07-14 13:27:00 +08:00 |
|
fan
|
1b3a491d52
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:35:07 +08:00 |
|
fan
|
0ca0153c60
|
旧地图综合演练调整
|
2020-07-13 14:34:56 +08:00 |
|
zyy
|
6817323fe1
|
调整宁波列车故障右键
|
2020-07-13 14:30:01 +08:00 |
|
fan
|
b10f08df67
|
设备登录调整&成员管理调整
|
2020-07-10 18:30:37 +08:00 |
|
fan
|
31c8e8828f
|
通号打开三维界面
|
2020-07-10 14:39:47 +08:00 |
|
zyy
|
6cc8b3beaa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/index.vue
|
2020-07-10 10:55:48 +08:00 |
|
zyy
|
348b07afa4
|
调整大屏系统列车显示问题
|
2020-07-10 10:52:31 +08:00 |
|
sunzhenyu
|
3a25657440
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:28:01 +08:00 |
|
sunzhenyu
|
3e84301b42
|
修改综合演练切换带三维界面的处理
|
2020-07-10 10:27:49 +08:00 |
|
fan
|
0d5be61a17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:00:51 +08:00 |
|
fan
|
ac3da3ef00
|
成员管理总数在线人数调整
|
2020-07-10 10:00:20 +08:00 |
|
sunleking
|
07d9f8603d
|
修改hideibp隐藏三维界面
|
2020-07-09 21:44:11 +08:00 |
|
fan
|
8af4eb6187
|
设备登录调整
|
2020-07-09 15:06:15 +08:00 |
|
fan
|
404c56e874
|
过滤司机角色调整
|
2020-07-09 13:05:50 +08:00 |
|
fan
|
37d88998ab
|
清除会话@成员
|
2020-07-08 18:22:14 +08:00 |
|
zyy
|
6ff8019898
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 15:49:41 +08:00 |
|
zyy
|
fd89fe974e
|
调整列车驾驶设备
|
2020-07-08 15:49:16 +08:00 |
|
fan
|
e8d54bc1d0
|
合并代码
|
2020-07-08 15:42:23 +08:00 |
|
fan
|
714113c819
|
设备登录调整
|
2020-07-08 15:40:55 +08:00 |
|
zyy
|
7c8d1319f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 14:40:18 +08:00 |
|
zyy
|
753172433c
|
调整实训流程
|
2020-07-08 14:40:04 +08:00 |
|
fan
|
db5c516813
|
成员参数调整
|
2020-07-08 13:49:14 +08:00 |
|
fan
|
1076eb2215
|
设备登录调整
|
2020-07-08 13:11:22 +08:00 |
|
zyy
|
b58a4afdda
|
调整列车过滤
|
2020-07-08 10:56:14 +08:00 |
|
joylink_cuiweidong
|
30b1163017
|
故障代码调整
设备代码调整
|
2020-07-08 09:21:54 +08:00 |
|
zyy
|
6b0d31dbbc
|
调整配置项
|
2020-07-07 17:37:45 +08:00 |
|
fan
|
f83a60bd88
|
聊天室调整
|
2020-07-07 14:58:10 +08:00 |
|
fan
|
aced111815
|
聊天室调整
|
2020-07-07 14:11:04 +08:00 |
|
joylink_fanyuhong
|
24daf6aea1
|
聊天室调整
|
2020-07-07 13:15:20 +08:00 |
|
fan
|
0fd852cc5a
|
聊天室调整
|
2020-07-07 10:54:57 +08:00 |
|
fan
|
421e591f52
|
Merge remote-tracking branch 'origin/test_device_login' into test
# Conflicts:
# src/layout/components/Title.vue
# src/views/demonstration/detail/index.vue
|
2020-07-07 09:47:21 +08:00 |
|
fan
|
a9b3f614c8
|
聊天室调整
|
2020-07-07 09:39:27 +08:00 |
|
fan
|
87d8dd9ea7
|
聊天室调整
|
2020-07-06 18:14:03 +08:00 |
|
fan
|
9883d0ed3c
|
聊天室调整
|
2020-07-06 18:00:44 +08:00 |
|
zyy
|
2c5c30216f
|
调整大屏预览流程，增加大屏分屏配置
|
2020-07-06 17:02:13 +08:00 |
|
fan
|
75e838b96f
|
聊天室调整
|
2020-07-03 18:42:29 +08:00 |
|
fan
|
872122e92b
|
综合演练仿真调整
|
2020-07-02 17:57:48 +08:00 |
|
joylink_cuiweidong
|
50c7363791
|
故障操作代码调整
|
2020-07-02 10:10:16 +08:00 |
|
fan
|
13a4ee614c
|
综合演练仿真调整
|
2020-07-01 18:52:29 +08:00 |
|
fan
|
ce180b1448
|
综合演练仿真调整
|
2020-06-30 18:35:57 +08:00 |
|
joylink_cuiweidong
|
bb6c5319c7
|
故障管理页面代码调整
|
2020-06-30 14:41:22 +08:00 |
|