joylink_cuiweidong
|
6ac28534ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 17:03:24 +08:00 |
|
joylink_cuiweidong
|
c2989a1548
|
剧本代码调整
|
2020-08-27 17:03:10 +08:00 |
|
zyy
|
dde1f6e1a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 16:43:51 +08:00 |
|
zyy
|
ad29ed8890
|
调整考试系统加载流程
|
2020-08-27 16:43:37 +08:00 |
|
joylink_cuiweidong
|
1e844407c0
|
仿真目录结构调整
|
2020-08-27 14:02:27 +08:00 |
|
joylink_cuiweidong
|
d33b645c69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 13:12:54 +08:00 |
|
joylink_cuiweidong
|
92219adba0
|
剧本录制预览代码调整
|
2020-08-27 13:12:36 +08:00 |
|
fan
|
0a90249b37
|
调度大赛调整
|
2020-08-27 11:33:37 +08:00 |
|
zyy
|
c2f549523a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 09:56:15 +08:00 |
|
zyy
|
699053f46f
|
调整西安运行图流程
|
2020-08-27 09:56:00 +08:00 |
|
joylink_cuiweidong
|
7e80bb0ccb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 18:42:17 +08:00 |
|
joylink_cuiweidong
|
df2f5705c4
|
剧本提示代码调整
|
2020-08-26 18:42:00 +08:00 |
|
zyy
|
bbae7bfb1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 17:44:17 +08:00 |
|
zyy
|
fc14cc41a7
|
调整发布地图导出，调整大屏流程
|
2020-08-26 17:44:01 +08:00 |
|
fan
|
242840f244
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 17:43:45 +08:00 |
|
fan
|
e43d91cad1
|
调整ibp盘显示位置
|
2020-08-26 17:43:34 +08:00 |
|
joylink_cuiweidong
|
f2df9fb453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 17:25:43 +08:00 |
|
joylink_cuiweidong
|
43fe4d728a
|
剧本提示代码调整
|
2020-08-26 17:25:18 +08:00 |
|
fan
|
08a33ae6aa
|
项目登录虚拟ibp调整
|
2020-08-26 17:09:55 +08:00 |
|
joylink_cuiweidong
|
fe5dd8861a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 15:28:46 +08:00 |
|
joylink_cuiweidong
|
c2a868714d
|
剧本提示代码调整
|
2020-08-26 15:28:32 +08:00 |
|
fan
|
73c3bd7a78
|
调整菜单样式
|
2020-08-26 15:16:47 +08:00 |
|
fan
|
0bac7098d3
|
调度大赛项目退出时清理仿真
|
2020-08-26 14:41:24 +08:00 |
|
fan
|
7ebbadca81
|
merge
|
2020-08-26 14:10:11 +08:00 |
|
fan
|
8d35c1353f
|
调度实训平台问题调整
|
2020-08-26 14:08:50 +08:00 |
|
sunzhenyu
|
22fa381707
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:54:55 +08:00 |
|
sunzhenyu
|
1a76506f9b
|
增加列车驾驶其他车辆，增加综合演练第三人称观看视角，修改三维编辑器部分区段生成bug
|
2020-08-26 13:54:44 +08:00 |
|
joylink_cuiweidong
|
e1390a8670
|
代码调整
|
2020-08-26 13:26:21 +08:00 |
|
joylink_cuiweidong
|
cf50463b5e
|
代码调整
|
2020-08-26 13:23:25 +08:00 |
|
joylink_cuiweidong
|
2fad6e8306
|
调度实训竞赛代码调整
|
2020-08-26 13:21:47 +08:00 |
|
joylink_cuiweidong
|
367b947a94
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-25 16:54:31 +08:00 |
|
joylink_cuiweidong
|
a9fd33c413
|
哈尔滨线路实训操作调整
|
2020-08-25 16:54:16 +08:00 |
|
zyy
|
ccc57042a7
|
调整地图绘制弹窗加载
|
2020-08-25 16:52:52 +08:00 |
|
joylink_cuiweidong
|
2320ae42a9
|
剧本预览代码调整
|
2020-08-25 14:17:04 +08:00 |
|
joylink_cuiweidong
|
17d3be79cf
|
剧本编制代码调整
|
2020-08-25 13:44:18 +08:00 |
|
joylink_cuiweidong
|
65a10b26af
|
哈尔滨线路 实训操作调整
剧本录制页面聊天代码调整
|
2020-08-25 13:15:32 +08:00 |
|
joylink_cuiweidong
|
e4a13de455
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-24 16:11:50 +08:00 |
|
joylink_cuiweidong
|
e6193e3469
|
哈尔滨线路实训操作代码调整
|
2020-08-24 16:11:31 +08:00 |
|
zyy
|
b262288524
|
增加西安二号线折返策略配置，增加联锁配置
|
2020-08-24 11:30:57 +08:00 |
|
zyy
|
f8d3ffa91d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-21 16:38:35 +08:00 |
|
zyy
|
e86c0b9c45
|
调整发布地图导入流程
|
2020-08-21 16:38:22 +08:00 |
|
joylink_cuiweidong
|
c3675a0bd4
|
剧本仿真代码调整
|
2020-08-21 15:41:46 +08:00 |
|
joylink_cuiweidong
|
43207730bf
|
剧本仿真代码调整
|
2020-08-21 14:55:28 +08:00 |
|
joylink_cuiweidong
|
e699efc06f
|
剧本录制预览代码调整
|
2020-08-21 14:16:44 +08:00 |
|
joylink_cuiweidong
|
5dcf14c81f
|
代码调整
|
2020-08-20 20:39:38 +08:00 |
|
joylink_cuiweidong
|
66587a17fb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-20 20:28:12 +08:00 |
|
joylink_cuiweidong
|
171353a4d3
|
仿真 剧本代码调整
|
2020-08-20 20:27:19 +08:00 |
|
fan
|
a44132056c
|
地图绘制添加防淹门
|
2020-08-20 13:17:58 +08:00 |
|
fan
|
1afb1f3a09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 16:39:19 +08:00 |
|
zyy
|
2e6d45baab
|
调整宁波三号线配置
|
2020-08-19 15:50:33 +08:00 |
|
fan
|
d92a86f146
|
代码调整
|
2020-08-19 14:11:58 +08:00 |
|
joylink_cuiweidong
|
5e5f322c3b
|
剧本预览 剧本编制代码调整
|
2020-08-18 18:37:38 +08:00 |
|
joylink_cuiweidong
|
74d7b6695c
|
剧本预览代码优化
|
2020-08-18 16:29:23 +08:00 |
|
joylink_cuiweidong
|
cb916647c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-17 18:48:46 +08:00 |
|
joylink_cuiweidong
|
c7bd321446
|
剧本录制代码调整
|
2020-08-17 18:47:38 +08:00 |
|
fan
|
19b4b48c3f
|
merge
|
2020-08-17 18:16:31 +08:00 |
|
fan
|
6008dfc143
|
运行图调整
|
2020-08-17 18:12:51 +08:00 |
|
zyy
|
d4219d81f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-17 14:46:58 +08:00 |
|
zyy
|
9f22395605
|
删除多余右键操作组件，调整发布状态
|
2020-08-17 14:46:48 +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 |
|
fan
|
44e05a0875
|
哈尔滨设备编辑运行图
|
2020-08-14 18:30:04 +08:00 |
|
joylink_cuiweidong
|
c10588289a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 17:52:37 +08:00 |
|
joylink_cuiweidong
|
8692fdfd1b
|
综合演练仿真菜单层级调整
|
2020-08-14 17:52:14 +08:00 |
|
zyy
|
179ad8fa1d
|
调整信号机字段调整
|
2020-08-14 16:02:01 +08:00 |
|
zyy
|
3d4230e78d
|
调整佛山线路错误提示，增加联锁配置字段
|
2020-08-14 14:32: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 |
|
joylink_cuiweidong
|
3f11212183
|
剧本录制默认行调操作
|
2020-08-14 10:29:33 +08:00 |
|
joylink_cuiweidong
|
21401af2b3
|
代码调整
|
2020-08-13 18:31:23 +08:00 |
|
joylink_cuiweidong
|
ddabadba45
|
剧本仿真代码调整
|
2020-08-13 18:30:03 +08:00 |
|
joylink_cuiweidong
|
75a240d66b
|
剧本预览代码调整
|
2020-08-13 18:07:43 +08:00 |
|
joylink_cuiweidong
|
64a335cc05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 16:19:14 +08:00 |
|
joylink_cuiweidong
|
cd877b8800
|
剧本编制代码调整
|
2020-08-13 16:18:19 +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 |
|
fan
|
f4f1b8792d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 09:07:54 +08:00 |
|
fan
|
2c2d704ee7
|
运行图预览重复数据调整
|
2020-08-13 09:07:42 +08:00 |
|
joylink_cuiweidong
|
8fd00b3493
|
剧本录制控制权转移代码调整
|
2020-08-12 17:34:37 +08:00 |
|
zyy
|
09b151e830
|
调整地图绘制流程
|
2020-08-11 15:46:15 +08:00 |
|
joylink_cuiweidong
|
c82edc8516
|
地图绘图代码调整
|
2020-08-11 14:17:00 +08:00 |
|
joylink_cuiweidong
|
be112d3b96
|
代码调整
|
2020-08-11 13:34:55 +08:00 |
|
joylink_cuiweidong
|
b0f238c655
|
地图绘制代码调整
|
2020-08-11 13:13:38 +08:00 |
|
joylink_cuiweidong
|
740757896b
|
地图绘制代码调整
|
2020-08-11 10:57:20 +08:00 |
|
fan
|
870ee5130f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-10 17:40:33 +08:00 |
|
fan
|
a0bd7a309d
|
整合申请管理
|
2020-08-10 17:40:17 +08:00 |
|
joylink_cuiweidong
|
d03532ecea
|
剧本预览和加载剧本 添加指令提示
|
2020-08-10 16:29:32 +08:00 |
|
joylink_cuiweidong
|
76bf1706ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-10 15:55:01 +08:00 |
|
joylink_cuiweidong
|
11dc3abf42
|
剧本编制代码调整（剧本编制对应的会话逻辑调整）
|
2020-08-10 15:54:38 +08:00 |
|
zyy
|
a4beb31ee6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-10 13:02:11 +08:00 |
|
zyy
|
fda63a7ca6
|
调整多余注释
|
2020-08-10 13:01:59 +08:00 |
|
joylink_cuiweidong
|
4b11c2e28f
|
剧本编制代码调整
|
2020-08-10 09:47:01 +08:00 |
|
fan
|
a5ee8ebed2
|
问题调整
|
2020-08-07 18:28:40 +08:00 |
|
fan
|
115f5a539f
|
有扣车跳停显示状态时调整菜单位置
|
2020-08-07 14:09:00 +08:00 |
|
fan
|
dcfd07c267
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 13:59:29 +08:00 |
|
fan
|
76512af530
|
运行图预览数据调整
|
2020-08-07 13:59:19 +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
|
be5f817f03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 11:28:59 +08:00 |
|
fan
|
ea5cb27128
|
运行图预览调整
|
2020-08-07 11:28:50 +08:00 |
|
zyy
|
1f2f7bcf89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 11:10:04 +08:00 |
|
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 |
|
joylink_cuiweidong
|
98d55deb64
|
地图绘制代码调整
|
2020-07-16 17:49:36 +08:00 |
|
joylink_cuiweidong
|
7ff599d49f
|
地图绘制布局调整（去掉scrollBar）
|
2020-07-16 16:18:13 +08:00 |
|
joylink_cuiweidong
|
f6e4e3c324
|
地图绘图样式调整
|
2020-07-16 14:41:21 +08:00 |
|
fan
|
0451bf1ab2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 13:31:36 +08:00 |
|
fan
|
c761e07ba2
|
设备配置调整
|
2020-07-16 13:31:05 +08:00 |
|
joylink_cuiweidong
|
d2ae5169d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 10:51:16 +08:00 |
|
joylink_cuiweidong
|
ea429f36a9
|
地图绘图样式调整
|
2020-07-16 10:50:59 +08:00 |
|
zyy
|
7b400d83b5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 09:38:35 +08:00 |
|
zyy
|
f61ab58d0f
|
调整设备管理字段显示
|
2020-07-16 09:38:20 +08:00 |
|
joylink_cuiweidong
|
cce290e73c
|
剧本预览代码调整
|
2020-07-15 19:05:32 +08:00 |
|
joylink_cuiweidong
|
94d02dc0f8
|
剧本编制样式调整
|
2020-07-15 18:08:49 +08:00 |
|
joylink_cuiweidong
|
4fc77ee04b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 16:09:34 +08:00 |
|
joylink_cuiweidong
|
adde89a41d
|
剧本编制代码调整
|
2020-07-15 16:09:15 +08:00 |
|
zyy
|
a1cbcff9ea
|
调整道岔绘图，右键操作
|
2020-07-15 13:31:07 +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
|
75fdf24d84
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 17:21:47 +08:00 |
|
fan
|
286d38db5c
|
会话调整
|
2020-07-14 17:21:39 +08:00 |
|
zyy
|
fbf4cd7652
|
调整组件间传递事件
|
2020-07-14 17:16:49 +08:00 |
|
zyy
|
77b02b947e
|
调整设备连接流程
|
2020-07-14 16:07:43 +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 |
|
joylink_cuiweidong
|
66070d2157
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:48:41 +08:00 |
|
joylink_cuiweidong
|
a96ace44d1
|
剧本预览代码调整
|
2020-07-14 14:48:26 +08:00 |
|
zyy
|
b231f2b96f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:30:52 +08:00 |
|
zyy
|
dfc478b8d4
|
调整哈尔滨综合演练按钮位置，调整角色设置样式
|
2020-07-14 14:30:37 +08:00 |
|
joylink_cuiweidong
|
a752c1e636
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:28:14 +08:00 |
|
joylink_cuiweidong
|
99b622ef24
|
地图绘图代码调整
|
2020-07-14 14:27:35 +08:00 |
|
zyy
|
cb4e2bec19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 13:28:08 +08:00 |
|
zyy
|
8fb216dbae
|
增加项目中设备管理页面
|
2020-07-14 13:27:00 +08:00 |
|
joylink_cuiweidong
|
a462e540fb
|
socket 退出登陆 断开连接
绘图代码调整
|
2020-07-14 11:01:22 +08:00 |
|
zyy
|
1b61866b37
|
删除样式
|
2020-07-13 17:28:32 +08:00 |
|
zyy
|
06fecf9aad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 17:27:49 +08:00 |
|
zyy
|
1c15fdbdd9
|
增加所有线路列车故障模式
|
2020-07-13 17:27:33 +08:00 |
|
joylink_cuiweidong
|
3898f66e78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 17:02:11 +08:00 |
|
joylink_cuiweidong
|
d9ed44b218
|
剧本预览代码调整
新版地图绘制代码优化
|
2020-07-13 17:01:34 +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
|
ee9cf9f54d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:30:16 +08:00 |
|
zyy
|
6817323fe1
|
调整宁波列车故障右键
|
2020-07-13 14:30:01 +08:00 |
|
fan
|
938e789173
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 13:01:44 +08:00 |
|
fan
|
a5649cc6e8
|
哈尔滨操作调整
|
2020-07-13 13:01:28 +08:00 |
|
joylink_cuiweidong
|
1add21a740
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 10:16:07 +08:00 |
|
joylink_cuiweidong
|
57125367fc
|
剧本编制与剧本预览代码调整
|
2020-07-13 10:15:44 +08:00 |
|
zyy
|
fccbc9ecd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 18:42:05 +08:00 |
|
zyy
|
f205ddf0fc
|
删除多余配置
|
2020-07-10 18:41:29 +08:00 |
|
fan
|
32f4657f4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 18:30:46 +08:00 |
|
fan
|
b10f08df67
|
设备登录调整&成员管理调整
|
2020-07-10 18:30:37 +08:00 |
|
joylink_cuiweidong
|
9627e85bf0
|
剧本编制 会话消息代码调整
|
2020-07-10 18:06:55 +08:00 |
|
zyy
|
e6e0bb6d51
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 17:23:31 +08:00 |
|
zyy
|
1c98da6c11
|
调整路由配置
|
2020-07-10 17:23:17 +08:00 |
|
joylink_cuiweidong
|
2b5b21c1cf
|
剧本编制 角色列表代码调整
|
2020-07-10 16:40:42 +08:00 |
|
joylink_cuiweidong
|
c432c8ffcb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 14:46:38 +08:00 |
|
joylink_cuiweidong
|
54a5a29f26
|
剧本预览代码调整
|
2020-07-10 14:46:18 +08:00 |
|
fan
|
31c8e8828f
|
通号打开三维界面
|
2020-07-10 14:39:47 +08:00 |
|
zyy
|
9def448e4a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:56:16 +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 |
|
joylink_cuiweidong
|
4c307cc848
|
剧本编制代码调整
|
2020-07-10 10:53:44 +08:00 |
|
zyy
|
348b07afa4
|
调整大屏系统列车显示问题
|
2020-07-10 10:52:31 +08:00 |
|
joylink_cuiweidong
|
40fe41a8ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:36:35 +08:00 |
|
joylink_cuiweidong
|
e13fcb02e5
|
故障设置代码调整
|
2020-07-10 10:36:10 +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 |
|
joylink_cuiweidong
|
0c9cd52c9a
|
剧本编制代码调整
|
2020-07-09 17:39:43 +08:00 |
|
joylink_cuiweidong
|
3aa0d55ea3
|
剧本编制代码调整
|
2020-07-09 16:54:31 +08:00 |
|
joylink_cuiweidong
|
ffab9631ce
|
代码调整
|
2020-07-09 15:45:32 +08:00 |
|
joylink_cuiweidong
|
84485c6f1d
|
剧本编制代码调整
|
2020-07-09 15:44:12 +08:00 |
|
fan
|
8af4eb6187
|
设备登录调整
|
2020-07-09 15:06:15 +08:00 |
|
fan
|
404c56e874
|
过滤司机角色调整
|
2020-07-09 13:05:50 +08:00 |
|
joylink_cuiweidong
|
c315f9121a
|
剧本编制代码调整
|
2020-07-09 10:50:56 +08:00 |
|
joylink_cuiweidong
|
96ff4c49f6
|
剧本编制代码调整
|
2020-07-09 10:17:55 +08:00 |
|
joylink_cuiweidong
|
3cd9d9416b
|
剧本代码调整
|
2020-07-08 18:56:32 +08:00 |
|
joylink_cuiweidong
|
dac800a86f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 18:36:07 +08:00 |
|
joylink_cuiweidong
|
b1005fd2ac
|
剧本编制代码调整
|
2020-07-08 18:35:46 +08:00 |
|
zyy
|
3693994526
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 18:35:25 +08:00 |
|
zyy
|
c4ffc859ce
|
调整大屏配置逻辑，登陆权限流程
|
2020-07-08 18:35:12 +08:00 |
|
fan
|
37d88998ab
|
清除会话@成员
|
2020-07-08 18:22:14 +08:00 |
|
fan
|
050fc8141c
|
设备登录调整
|
2020-07-08 17:36:32 +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
|
4a5923f263
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:11:36 +08:00 |
|
fan
|
1076eb2215
|
设备登录调整
|
2020-07-08 13:11:22 +08:00 |
|
joylink_cuiweidong
|
fe3ee372e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:05:53 +08:00 |
|
joylink_cuiweidong
|
fc97643116
|
剧本编制代码调整
|
2020-07-08 13:05:09 +08:00 |
|
zyy
|
b58a4afdda
|
调整列车过滤
|
2020-07-08 10:56:14 +08:00 |
|
joylink_cuiweidong
|
eb6aca6114
|
剧本录制接口调整
|
2020-07-08 09:39:25 +08:00 |
|
joylink_cuiweidong
|
30b1163017
|
故障代码调整
设备代码调整
|
2020-07-08 09:21:54 +08:00 |
|
zyy
|
e710e5eb34
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 17:37:59 +08:00 |
|
zyy
|
6b0d31dbbc
|
调整配置项
|
2020-07-07 17:37:45 +08:00 |
|
joylink_cuiweidong
|
00a4a8c184
|
自动设置故障（zc故障）代码调整
|
2020-07-07 17:08:01 +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 |
|
zyy
|
67edc61d0e
|
调整大屏分屏预览页面
|
2020-07-06 18:16:49 +08:00 |
|
fan
|
87d8dd9ea7
|
聊天室调整
|
2020-07-06 18:14:03 +08:00 |
|
fan
|
9883d0ed3c
|
聊天室调整
|
2020-07-06 18:00:44 +08:00 |
|
zyy
|
6be93b39ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 17:02:31 +08:00 |
|
zyy
|
2c5c30216f
|
调整大屏预览流程，增加大屏分屏配置
|
2020-07-06 17:02:13 +08:00 |
|
fan
|
75e838b96f
|
聊天室调整
|
2020-07-03 18:42:29 +08:00 |
|
joylink_cuiweidong
|
ebf86de377
|
故障操作代码调整
|
2020-07-03 18:39:24 +08:00 |
|
joylink_cuiweidong
|
654b79fc27
|
故障操作代码调整
|
2020-07-03 17:13:24 +08:00 |
|
joylink_cuiweidong
|
3ae8582f05
|
剧本接口调整（预览与 删除剧本开始执行接口）
|
2020-07-03 16:29:40 +08:00 |
|
zyy
|
8a5845749e
|
调整绘图流程逻辑 删除多余配置
|
2020-07-03 15:18:58 +08:00 |
|
zyy
|
f91fc75528
|
调整西安线路进路状态
|
2020-07-03 11:11:57 +08:00 |
|
zyy
|
fa5097cd8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-02 18:47:57 +08:00 |
|
zyy
|
3b39a9a04b
|
调整区段字段，控制权操作
|
2020-07-02 18:47:39 +08:00 |
|
fan
|
872122e92b
|
综合演练仿真调整
|
2020-07-02 17:57:48 +08:00 |
|
joylink_cuiweidong
|
ac4c0baecf
|
西安三号线 仿真右侧列车列表代码调整
修改故障枚举
修改退出聊天会话接口
|
2020-07-02 17:44:20 +08:00 |
|
joylink_cuiweidong
|
146d6c2d0b
|
成都三号线站台操作代码调整
|
2020-07-02 13:28:36 +08:00 |
|
joylink_cuiweidong
|
50c7363791
|
故障操作代码调整
|
2020-07-02 10:10:16 +08:00 |
|
fan
|
13a4ee614c
|
综合演练仿真调整
|
2020-07-01 18:52:29 +08:00 |
|
zyy
|
64d415dbb3
|
调整地图绘图数据模型
|
2020-07-01 18:08:42 +08:00 |
|
zyy
|
3c6d5b903d
|
调整联锁配置，调整数据模型
|
2020-07-01 14:52:27 +08:00 |
|
joylink_cuiweidong
|
e5fff7388b
|
地图绘制 显示条件（showCondition）调整
|
2020-07-01 13:18:43 +08:00 |
|
sunzhenyu
|
9d855f5910
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-01 12:11:30 +08:00 |
|
joylink_cuiweidong
|
4f866bf257
|
故障操作代码调整
|
2020-07-01 11:27:09 +08:00 |
|
joylink_cuiweidong
|
ff1e707112
|
故障代码调整
|
2020-07-01 09:32:36 +08:00 |
|
joylink_cuiweidong
|
c0e3c99dc8
|
故障代码调整
|
2020-07-01 09:32:01 +08:00 |
|
joylink_cuiweidong
|
1c6eb510c9
|
故障代码调整
|
2020-06-30 19:17:29 +08:00 |
|
fan
|
ce180b1448
|
综合演练仿真调整
|
2020-06-30 18:35:57 +08:00 |
|
joylink_cuiweidong
|
619adde869
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 14:41:40 +08:00 |
|
joylink_cuiweidong
|
bb6c5319c7
|
故障管理页面代码调整
|
2020-06-30 14:41:22 +08:00 |
|
fan
|
8f4cecec0c
|
综合演练调整
|
2020-06-30 14:27:32 +08:00 |
|
zyy
|
9748ca2f63
|
调整成都三号线操作定义，位置提示
|
2020-06-30 13:32:50 +08:00 |
|
zyy
|
82415903f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 11:19:58 +08:00 |
|
zyy
|
7df86adff1
|
调整表单赋值拷贝
|
2020-06-30 11:19:33 +08:00 |
|
joylink_cuiweidong
|
f6982eb966
|
解决 实训平台邀请综合演练 设计平台弹出邀请弹窗的问题
仿真代码调整
|
2020-06-29 17:33:19 +08:00 |
|
joylink_cuiweidong
|
ccb976f078
|
仿真代码调整
|
2020-06-29 15:55:31 +08:00 |
|
fan
|
a689103abe
|
综合演练调整
|
2020-06-29 13:11:27 +08:00 |
|
fan
|
103ae24b64
|
仿真成员管理
|
2020-06-29 09:12:30 +08:00 |
|
joylink_cuiweidong
|
237aece890
|
代码调整
|
2020-06-28 18:34:32 +08:00 |
|
zyy
|
7873917d43
|
调整数据模型过滤空置，调整成都3号线实操
|
2020-06-28 16:03:59 +08:00 |
|
fan
|
4f248c3b19
|
综合演练界面调整&项目配置整理
|
2020-06-28 14:27:28 +08:00 |
|
zyy
|
e3ee44aae7
|
调整道岔失表状态，成都3号线实操定义
|
2020-06-28 13:27:10 +08:00 |
|
fan
|
d7a5b555a2
|
设备登录调整
|
2020-06-24 18:40:48 +08:00 |
|
zyy
|
c570e418e1
|
调整佛山操作定义，调整个人信息
|
2020-06-24 17:37:09 +08:00 |
|
zyy
|
45cac99681
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:06:45 +08:00 |
|
zyy
|
3b330a0932
|
调整佛山线路实训定义，删除区段定义
|
2020-06-24 14:06:17 +08:00 |
|
joylink_cuiweidong
|
0f7cdb2b8e
|
剧本编制代码调整
|
2020-06-24 09:24:08 +08:00 |
|
joylink_cuiweidong
|
b85362460e
|
剧本代码调整
|
2020-06-23 18:59:20 +08:00 |
|
fan
|
e67f98e9a0
|
合并代码
|
2020-06-23 15:26:26 +08:00 |
|
fan
|
a2664eb5dc
|
登录调整&综合演练调整&菜单调整
|
2020-06-23 15:18:44 +08:00 |
|
joylink_cuiweidong
|
677ebcaa7f
|
剧本编制修改会话代码调整
|
2020-06-23 10:57:35 +08:00 |
|
sunzhenyu
|
869ddc78b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 10:08:01 +08:00 |
|
sunzhenyu
|
01351fb34a
|
test
|
2020-06-23 10:07:52 +08:00 |
|
zyy
|
88211cee8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 09:27:10 +08:00 |
|
zyy
|
4e36c7b456
|
调整默认配置
|
2020-06-23 09:26:58 +08:00 |
|
joylink_cuiweidong
|
d789a30333
|
剧本编制代码调整
|
2020-06-22 18:37:09 +08:00 |
|
joylink_cuiweidong
|
d3d17f7bf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 14:30:14 +08:00 |
|
joylink_cuiweidong
|
5580a79344
|
仿真右侧列车列表调整
福州线操作代码调整
|
2020-06-22 14:29:55 +08:00 |
|
zyy
|
58ab773ec9
|
删除多余配置
|
2020-06-22 13:49:42 +08:00 |
|
joylink_cuiweidong
|
32f4ead036
|
剧本代码调整
|
2020-06-19 18:58:55 +08:00 |
|
sunzhenyu
|
2a50dd1be2
|
修改三维驾驶刷新重连列车bug
|
2020-06-19 09:56:40 +08:00 |
|
joylink_cuiweidong
|
426aed9ef1
|
剧本代码调整
|
2020-06-18 09:20:42 +08:00 |
|
joylink_cuiweidong
|
eefbf70002
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 18:36:45 +08:00 |
|
joylink_cuiweidong
|
0983307bc7
|
剧本代码调整
|
2020-06-17 18:36:22 +08:00 |
|
sunzhenyu
|
47d77d6925
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 18:17:00 +08:00 |
|
sunzhenyu
|
b70feae183
|
增加三维驾驶超速报警和牵引状态mmi显示，增加剧本设计中三维驾驶
|
2020-06-17 18:16:49 +08:00 |
|
joylink_cuiweidong
|
068fc65f3d
|
剧本代码调整
|
2020-06-17 15:33:04 +08:00 |
|
joylink_cuiweidong
|
556d7fa109
|
仿真右侧列车显示代码调整
|
2020-06-17 15:31:15 +08:00 |
|
joylink_cuiweidong
|
b78f90034a
|
剧本录制代码调整
|
2020-06-17 14:18:46 +08:00 |
|
joylink_cuiweidong
|
584654daec
|
剧本代码调整
|
2020-06-17 09:56:51 +08:00 |
|
fan
|
35b6d9093a
|
地图绘制信号机添加属性noOverlap是否无延续保护
|
2020-06-16 09:50:39 +08:00 |
|
zyy
|
28cc15fd10
|
调整综合监控数据，调整系统右键菜单样式
|
2020-06-15 17:16:26 +08:00 |
|
zyy
|
0f33f9d876
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 16:13:51 +08:00 |
|
zyy
|
428967e843
|
调整地图绘制右键菜单样式，调整道岔触发居中，绘制综合监控数据
|
2020-06-15 16:13:28 +08:00 |
|
fan
|
a381bfdcd8
|
退出计划调整为初始化，并不限制点击
|
2020-06-15 13:34:24 +08:00 |
|
joylink_cuiweidong
|
3248f3badf
|
剧本代码调整
|
2020-06-12 18:29:14 +08:00 |
|
joylink_cuiweidong
|
29b0937253
|
剧本代码调整
|
2020-06-12 16:28:52 +08:00 |
|
joylink_cuiweidong
|
6d5ba33e1f
|
剧本代码调整
|
2020-06-12 16:12:33 +08:00 |
|
zyy
|
f7c6f6ee64
|
调整区段配置
|
2020-06-12 09:55:53 +08:00 |
|
joylink_cuiweidong
|
9126397070
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 18:33:49 +08:00 |
|
joylink_cuiweidong
|
b341735a8c
|
剧本代码调整
|
2020-06-11 18:32:26 +08:00 |
|
zyy
|
6402e6312b
|
调整逻辑区段 名称偏移量
|
2020-06-11 17:53:35 +08:00 |
|
zyy
|
547c7efe5a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:39:46 +08:00 |
|
zyy
|
9c0d69e81e
|
删除逻辑对应车次窗
|
2020-06-11 17:39:33 +08:00 |
|
fan
|
434d7fdbbe
|
信号机批量设置灯位类型
|
2020-06-11 17:28:15 +08:00 |
|
joylink_cuiweidong
|
f03880e59e
|
仿真聊天代码调整
|
2020-06-11 13:43:58 +08:00 |
|
joylink_cuiweidong
|
dda8f39adf
|
新版地图右键操作 弹窗代码调整
|
2020-06-11 13:29:06 +08:00 |
|
joylink_cuiweidong
|
cb3663722f
|
代码调整
|
2020-06-11 09:43:02 +08:00 |
|
joylink_cuiweidong
|
7a7b442a89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 18:03:10 +08:00 |
|
joylink_cuiweidong
|
95715a9f12
|
代码调整
|
2020-06-10 18:02:46 +08:00 |
|
zyy
|
e688625887
|
调整大屏高度计算
|
2020-06-10 17:59:51 +08:00 |
|
fan
|
9b489d088b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 16:57:04 +08:00 |
|
fan
|
139066d66f
|
综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理
|
2020-06-10 16:56:52 +08:00 |
|
joylink_cuiweidong
|
b169bb1e20
|
佛山有轨电车指令代码调整
|
2020-06-10 13:24:12 +08:00 |
|
sunzhenyu
|
a18a7bccc6
|
merge jointtrainningnew/index.vue
|
2020-06-08 18:26:30 +08:00 |
|
sunzhenyu
|
b33f4c17b2
|
merge pull
|
2020-06-08 18:24:09 +08:00 |
|
sunzhenyu
|
6cae01f373
|
增加三维驾驶换端操作，修改三维cctv中前往站台找不到路径点bug，增加综合演练车站cctv
|
2020-06-08 18:22:12 +08:00 |
|
joylink_cuiweidong
|
404a23e35e
|
iscs 小系统代码调整
|
2020-06-08 17:59:28 +08:00 |
|
joylink_cuiweidong
|
98ed49715a
|
综合演练仿真会话自动播放调整
|
2020-06-08 13:55:26 +08:00 |
|
joylink_cuiweidong
|
6f59f03acd
|
裁判系统 获取参赛者的历史对话
|
2020-06-08 11:28:40 +08:00 |
|
joylink_cuiweidong
|
38b7580f79
|
佛山线路 道岔在单锁的状态时，使用道岔单解的功能，未起到双确认调整
停站时间没有具体停站多少时间调整
|
2020-06-05 18:48:07 +08:00 |
|
joylink_cuiweidong
|
4d918cc6a7
|
裁判平台回放代码调整
|
2020-06-05 15:54:03 +08:00 |
|
fan
|
7d8a8f8fb6
|
实操竞赛计时调整&iscs调整
|
2020-06-05 14:46:37 +08:00 |
|
zyy
|
3b137ffae9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:14:23 +08:00 |
|
zyy
|
30d76e763e
|
调整折返按钮 状态返回处理
|
2020-06-05 10:14:12 +08:00 |
|
fan
|
c7d07ebd9d
|
合并代码
|
2020-06-05 09:39:48 +08:00 |
|
fan
|
6dfbe18485
|
实操竞赛比赛计时&题目展示&结果展示
|
2020-06-05 09:38:14 +08:00 |
|
joylink_cuiweidong
|
74b6e66aff
|
裁判系统回放代码调整
|
2020-06-05 09:35:00 +08:00 |
|
zyy
|
a4df31fcc3
|
调整字段显示
|
2020-06-04 18:24:39 +08:00 |
|
zyy
|
24f089be32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 17:59:08 +08:00 |
|
zyy
|
4a03d8613b
|
调整车站折返策略
|
2020-06-04 17:58:42 +08:00 |
|
joylink_cuiweidong
|
78d8da26b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 17:52:12 +08:00 |
|
joylink_cuiweidong
|
d560d11ef5
|
裁判系统 回放页面调整
|
2020-06-04 17:51:30 +08:00 |
|
zyy
|
5a9a837e02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
# src/utils/baseUrl.js
# src/views/iscs/iscsDraw/iscsBasOperate/index.vue
|
2020-06-04 17:32:45 +08:00 |
|
zyy
|
9be9c9a313
|
增加西安 三号线设置折返策略元素
|
2020-06-04 17:29:18 +08:00 |
|
joylink_cuiweidong
|
8ea4e49e0a
|
代码调整
|
2020-06-04 16:38:28 +08:00 |
|
fan
|
7f08ae9e71
|
调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关
|
2020-06-04 14:21:19 +08:00 |
|
joylink_cuiweidong
|
0cf0caef1d
|
裁判系统代码调整
佛山左下角信息窗口调整
|
2020-06-04 11:12:55 +08:00 |
|
joylink_cuiweidong
|
aa5a00b401
|
竞赛裁判平台代码调整
|
2020-06-04 10:22:02 +08:00 |
|
joylink_cuiweidong
|
efc8d80899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 18:24:14 +08:00 |
|
joylink_cuiweidong
|
7946d9f6e7
|
仿真聊天代码调整
|
2020-06-03 18:23:48 +08:00 |
|
fan
|
44bb0f0f29
|
实操竞赛调整
|
2020-06-03 18:17:52 +08:00 |
|
joylink_cuiweidong
|
156a746a07
|
综合演练仿真聊天 请求会话成员代码调整 退出会话代码调整
|
2020-06-03 16:44:38 +08:00 |
|
joylink_cuiweidong
|
49c61f8c8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:20:13 +08:00 |
|
joylink_cuiweidong
|
d8d896fc5f
|
综合演练结束仿真，其他成员不退出仿真 调整
|
2020-06-03 16:19:49 +08:00 |
|
fan
|
046a09f8b5
|
调整实操竞赛&星期显示
|
2020-06-03 16:18:40 +08:00 |
|
zyy
|
31fab488c0
|
调整区段保存流程
|
2020-06-03 14:47:26 +08:00 |
|
zyy
|
a98495f43f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 13:19:11 +08:00 |
|
zyy
|
a57ae39ebf
|
调整区段修改逻辑
|
2020-06-03 13:18:52 +08:00 |
|
joylink_cuiweidong
|
00705cd006
|
综合演练仿真聊天 退出群聊代码调整
|
2020-06-03 11:20:46 +08:00 |
|
joylink_cuiweidong
|
c3736a02c8
|
北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理
|
2020-06-03 10:43:41 +08:00 |
|
joylink_cuiweidong
|
7549203f97
|
综合演练仿真会话代码调整
|
2020-06-02 19:26:36 +08:00 |
|
joylink_cuiweidong
|
34016219dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 18:30:38 +08:00 |
|
joylink_cuiweidong
|
4c38334d2c
|
西安三号线 按计划行车/添加列车 列车列表代码调整
|
2020-06-02 18:30:12 +08:00 |
|
sunzhenyu
|
620839876d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:00:26 +08:00 |
|
sunzhenyu
|
f4d41eb0de
|
修改通号模型信息显示功能
|
2020-06-02 16:57:38 +08:00 |
|
joylink_cuiweidong
|
979a9e78b2
|
仿真聊天代码调整
竞赛 实操代码调整
|
2020-06-02 15:00:48 +08:00 |
|
zyy
|
3e62782fc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 13:36:41 +08:00 |
|
zyy
|
16392a3b1f
|
调整仿真运行图加载高亮显示
|
2020-06-01 13:36:26 +08:00 |
|