joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
6,960 Commits 20 Branches 0 Tags 448 MiB
05b879f63d
Commit Graph

1663 Commits

Author SHA1 Message Date
zyy
4a1d3d3863 增加车站批量设置，调整车站绘图逻辑 2020-08-07 11:09:49 +08:00
fan
cf503299fd 保留stations数据不清除 2020-08-07 10:29:18 +08:00
fan
d449dece06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 10:15:53 +08:00
fan
8e73c01b3f 成都一列车样式调整 2020-08-07 10:15:39 +08:00
zyy
bf5aa5e1c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 09:59:29 +08:00
zyy
8c0612fb60 增加车站绘图字段 2020-08-07 09:59:16 +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
849770ab0e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 19:34:46 +08:00
joylink_cuiweidong
abb0143988 控制权转移代码调整 2020-08-06 19:34:13 +08:00
fan
a3f39b3c2f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 16:55:15 +08:00
fan
9615f33d88 伸展样式调整 2020-08-06 16:54:53 +08:00
zyy
0e9b731e93 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 15:08:07 +08:00
zyy
cde3b39753 调整地图绘制流程，调整信号机 2020-08-06 15:07:50 +08:00
fan
492c79ffb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 15:02:46 +08:00
fan
e3e62f85f9 佛山目的地码显示长度调整&联锁配置添加参数generateFls 2020-08-06 15:02:22 +08:00
zyy
aa63af422b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/signal/index.vue
 2020-08-06 11:18:48 +08:00
zyy
7ddbe10832 增加信号机批量操作 2020-08-06 11:15:46 +08:00
joylink_cuiweidong
1a844d20e7 地图绘制信号机添加字段（不生成进路的信号机终端） 2020-08-06 10:55:38 +08:00
fan
aea8dc7eca 清理多余状态 2020-08-05 15:12:40 +08:00
fan
d9e6258e1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 13:17:16 +08:00
fan
2f5421605e 运行图加载设置最大宽高 2020-08-05 13:16:58 +08:00
joylink_cuiweidong
4a8d6fabe3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 13:04:12 +08:00
joylink_cuiweidong
96f6d5030b 哈尔滨一号线 自动触发进路 绘图代码调整 2020-08-05 13:03:53 +08:00
fan
1314ae64b6 调整参数名=》 是否自动折返始端 2020-08-05 11:23:48 +08:00
fan
6214acf235 信号机添加参数routeEnd&融屏测试 2020-08-05 10:57:58 +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
zyy
ee7ca07731 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 17:31:20 +08:00
zyy
6dbac54d1f 调整地图绘制相关流程 2020-08-04 17:31:07 +08:00
joylink_cuiweidong
1f6fdb5341 派班计划代码调整 2020-08-04 16:27:23 +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
8ed963fddb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 14:18:05 +08:00
fan
fb64429ee8 调整综合仿真开始状态管理 2020-08-04 14:17:47 +08:00
joylink_cuiweidong
01701479fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 14:02:54 +08:00
joylink_cuiweidong
af0068c972 地图绘制代码调整 
剧本录制代码调整
 2020-08-04 14:02:10 +08:00
zyy
1392503b9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 13:00:55 +08:00
zyy
3f0123a472 调整地图绘制区段修改逻辑 2020-08-04 13:00:42 +08:00
joylink_cuiweidong
ba7a2b6e38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 11:09:18 +08:00
joylink_cuiweidong
a4f727be0d 派班计划代码调整（新增排班计划预览） 2020-08-04 11:09:00 +08:00
zyy
402a4f48b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 10:49:33 +08:00
zyy
a8cb84176e 调整大屏逻辑 2020-08-04 10:49:22 +08:00
joylink_cuiweidong
118e7a6bce 仿真聊天代码调整 2020-08-04 10:24:45 +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
zyy
4954e5e344 删除注释 2020-08-03 17:42:42 +08:00
zyy
584fbad941 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 17:30:17 +08:00
zyy
d98e933e79 调整地图绘制样式 2020-08-03 17:30:01 +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
zyy
057071769f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:32:20 +08:00
zyy
8422889940 调整大屏列表逻辑 2020-08-03 15:31:53 +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
60986fbfeb 大屏修改 2020-08-03 15:22:46 +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
c309859c2b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 13:27:56 +08:00
joylink_cuiweidong
ca987254c7 新版地图仿真时间问题调整 2020-08-03 13:27:17 +08:00
zyy
5b92e9125d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 10:55:59 +08:00
zyy
1ade7ba9b8 调整样式 2020-08-03 10:55:43 +08:00
joylink_cuiweidong
f0d0c96f44 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 10:54:01 +08:00
joylink_cuiweidong
56b6c422f9 新版地图课程考试计时代码调整 2020-08-03 10:53:44 +08:00
fan
278741e686 清除调用原有mutation-type 2020-08-03 10:30:28 +08:00
fan
94f70eea65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 10:02:24 +08:00
fan
d1a5669999 运行图预览初始化调整 2020-08-03 10:02:12 +08:00
zyy
b1fb2a12dc 调整样式 2020-08-03 09:53:34 +08:00
joylink_cuiweidong
f8c542354c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 09:19:01 +08:00
joylink_cuiweidong
d397f437fd 剧本录制文件位置调整 2020-08-03 09:18:27 +08:00
fan
517270b2f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 18:57:46 +08:00
fan
3215bec260 运行图调整 2020-07-31 18:57:27 +08:00
zyy
fb9e8f0325 调整地图样式及加载逻辑 2020-07-31 18:49:35 +08:00
zyy
e2c32f2e68 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:22:43 +08:00
zyy
70114a0014 调整宁波线路操作 2020-07-31 16:22:29 +08:00
joylink_cuiweidong
350bfab719 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:20:30 +08:00
joylink_cuiweidong
cb6d891d2b 代码调整 2020-07-31 16:20:07 +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
joylink_cuiweidong
8663a4fba0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 16:45:22 +08:00
joylink_cuiweidong
c2c3fc0b22 运行图加载根据车次号 运行图颜色代码调整 2020-07-30 16:44:41 +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
1ed90362c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 15:10:26 +08:00
zyy
a6feabd406 调整地图绘制逻辑 2020-07-30 15:10:10 +08:00
fan
955ad3a89d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 13:46:55 +08:00
fan
c15860b104 代码调整 2020-07-30 13:43:00 +08:00
joylink_cuiweidong
2408797a04 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 11:09:25 +08:00
joylink_cuiweidong
31a2854a15 运行图预览运行列车颜色代码调整 2020-07-30 11:08:59 +08:00
fan
c741783ea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 18:27:19 +08:00
fan
95e4479d04 考试设备定位调整 2020-07-29 18:26:58 +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
fan
add4a4dc8b 仿真右下侧按钮调整 2020-07-29 14:40:16 +08:00
joylink_cuiweidong
7ad5e06a07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
 2020-07-29 13:59:48 +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
joylink_cuiweidong
99f324adf7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 15:24:53 +08:00
joylink_cuiweidong
b1549145e0 宁波线路仿真隐藏车次窗 2020-07-28 15:24:32 +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
0405d3e61e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 14:11:32 +08:00
fan
594087489a 调整角色切换bug&通号界面添加成员管理&仿真按钮offset位置修复 2020-07-28 14:11:17 +08:00
joylink_cuiweidong
66b9d7f85a 剧本录制代码调整 2020-07-28 13:56:36 +08:00
joylink_cuiweidong
41aadd30cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 13:03:25 +08:00
joylink_cuiweidong
e5af672515 地图绘图代码调整 2020-07-28 13:03:03 +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
joylink_cuiweidong
f88f1093ad 地图绘制 键盘删除 代码调整 2020-07-28 10:46:00 +08:00
joylink_cuiweidong
fb099da4df 地图绘制代码调整 2020-07-28 10:34:02 +08:00
joylink_cuiweidong
07d9049744 地图绘图代码调整 2020-07-28 09:12:09 +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
joylink_cuiweidong
e04214085e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-27 17:37:17 +08:00
joylink_cuiweidong
a53df52c35 地图绘图代码调整 2020-07-27 17:36:27 +08:00
fan
37283b54eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-27 17:26:42 +08:00
fan
5462c7aa21 增加crsc西安工业集团登录页面 2020-07-27 17:26:32 +08:00
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
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
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
196a611d70 仿真聊天代码调整 2020-07-24 10:35:05 +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
e561f77c12 代码调整&socket重连前进行初始化 2020-07-23 16:07:27 +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
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
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
c617cf27c6 heb项目取消综合仿真生成二维码按钮 2020-07-22 09:04:45 +08:00
joylink_cuiweidong
f3d2982bd2 剧本预览代码调整 2020-07-21 19:27:32 +08:00
fan
64466ff7d6 综合演练初始化清除activeTrainList 2020-07-21 15:54:35 +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
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
joylink_cuiweidong
95a9d18ccd 地图绘图代码调整 2020-07-20 17:13:56 +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
025b1595c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 15:19:33 +08:00
fan
00608f2cb2 heb取消无法登录提示&会话、设备代码调整 2020-07-20 15:19:11 +08:00
joylink_cuiweidong
e2e66074af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 15:11:17 +08:00
joylink_cuiweidong
2dc14c9374 地图绘制代码调整 2020-07-20 15:10:57 +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
zyy
3673eb1015 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2020-07-20 09:24:02 +08:00
zyy
02157c45a0 修改生成联锁数据提示信息 2020-07-20 09:23:08 +08:00
fan
ba90420115 merger 2020-07-17 19:08:42 +08:00
fan
3038d5571f 会话调整 2020-07-17 19:07:34 +08:00
zyy
e0f7175923 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 18:28:56 +08:00
zyy
04f1205e56 调整上行是否向右地图字段 2020-07-17 18:28:38 +08:00
joylink_cuiweidong
f0d0b6db79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 17:19:26 +08:00
joylink_cuiweidong
451b5343e0 剧本编制代码调整 2020-07-17 17:18:48 +08:00
fan
3e1e36c921 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 16:35:34 +08:00
fan
fefd4b53b6 会话调整&设备配置调整 2020-07-17 16:35:24 +08:00
joylink_cuiweidong
a5ce9e4a88 地图绘制代码调整 2020-07-17 15:45:44 +08:00
joylink_cuiweidong
1e91cb616d 地图绘图代码调整 2020-07-17 14:08:14 +08:00
joylink_cuiweidong
56089e1a55 地图绘图代码优化 2020-07-17 11:14:50 +08:00
fan
fb4864496a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-16 19:11:35 +08:00
fan
0a50c69b2c 设备配置调整 2020-07-16 19:11:20 +08:00