fan
|
d4118c58a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 19:02:00 +08:00 |
|
fan
|
f87506dfd9
|
调度大赛调整
|
2020-08-27 19:01:50 +08:00 |
|
joylink_cuiweidong
|
ea1f4c4dee
|
剧本预览代码调整
|
2020-08-27 18:46:00 +08:00 |
|
zyy
|
4ba9bcdc82
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 18:41:49 +08:00 |
|
zyy
|
ae9f9a962b
|
调整加载代码
|
2020-08-27 18:41:33 +08:00 |
|
fan
|
3c016a5c4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 17:21:13 +08:00 |
|
fan
|
869981f606
|
调度大赛调整
|
2020-08-27 17:21:01 +08:00 |
|
zyy
|
a34d3eb9ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 17:04:47 +08:00 |
|
zyy
|
47a9d56d3b
|
删除配置
|
2020-08-27 17:04:21 +08:00 |
|
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 |
|
zyy
|
06699507e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 13:13:29 +08:00 |
|
zyy
|
8a3287ca22
|
删除多余代码注释
|
2020-08-27 13:13:15 +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 |
|
fan
|
154ec2767a
|
调整会话窗口按demoButton层级问题
|
2020-08-26 17:27:02 +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 |
|
fan
|
0c97289ff1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 16:00:22 +08:00 |
|
fan
|
1ac01f4900
|
项目登录虚拟ibp调整
|
2020-08-26 16:00:05 +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 |
|
fan
|
c1f139e9a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:34:08 +08:00 |
|
joylink_cuiweidong
|
e1390a8670
|
代码调整
|
2020-08-26 13:26:21 +08:00 |
|
fan
|
a702740f48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:25:45 +08:00 |
|
fan
|
8f0f93f75d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:25:33 +08:00 |
|
fan
|
731c532989
|
调度实训平台
|
2020-08-26 13:25:22 +08:00 |
|
joylink_cuiweidong
|
cf50463b5e
|
代码调整
|
2020-08-26 13:23:25 +08:00 |
|
joylink_cuiweidong
|
b652897678
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:22:02 +08:00 |
|
joylink_cuiweidong
|
2fad6e8306
|
调度实训竞赛代码调整
|
2020-08-26 13:21:47 +08:00 |
|
fan
|
9fcb1cd9bb
|
代码调整
|
2020-08-25 18:50:42 +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 |
|
fan
|
830a648be9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 09:03:43 +08:00 |
|
fan
|
96346ccf68
|
代码调整
|
2020-08-19 09:03:27 +08:00 |
|
joylink_cuiweidong
|
8ac2bcf0db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-18 18:37:54 +08:00 |
|
joylink_cuiweidong
|
5e5f322c3b
|
剧本预览 剧本编制代码调整
|
2020-08-18 18:37:38 +08:00 |
|
zyy
|
901af70400
|
调整线路右键操作
|
2020-08-18 16:41:19 +08:00 |
|
joylink_cuiweidong
|
33acf41a94
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-18 16:32:01 +08:00 |
|
joylink_cuiweidong
|
74d7b6695c
|
剧本预览代码优化
|
2020-08-18 16:29:23 +08:00 |
|
zyy
|
c448e2e1ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-18 16:02:35 +08:00 |
|
zyy
|
899facde01
|
调整发布地图导出名称，注释区段流程
|
2020-08-18 16:02:22 +08:00 |
|
joylink_cuiweidong
|
e2d19c2698
|
剧本录制代码调整
|
2020-08-18 15:40:01 +08:00 |
|
joylink_cuiweidong
|
c5a63cd1c1
|
代码调整
|
2020-08-17 19:11:59 +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
|
98e78b3532
|
调整发布地图 导入 导出逻辑及请求配置
|
2020-08-17 17:35:00 +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
|
a6aac4397d
|
运行图编辑=》修改名称后工具栏列表不刷新调整
|
2020-08-17 09:17:07 +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 |
|
sunzhenyu
|
83e442f170
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 18:05:38 +08:00 |
|
sunzhenyu
|
02faa078af
|
删除console
|
2020-08-14 18:05:28 +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 |
|
sunzhenyu
|
a992090e12
|
修改mmi界面
|
2020-08-14 17:39:04 +08:00 |
|
sunzhenyu
|
23adbbfd0d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 16:58:58 +08:00 |
|
sunzhenyu
|
9258d5ab3b
|
修改三维驾驶紧急停车
|
2020-08-14 16:58:50 +08:00 |
|
zyy
|
f2a2adc698
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 16:02:16 +08:00 |
|
zyy
|
179ad8fa1d
|
调整信号机字段调整
|
2020-08-14 16:02:01 +08:00 |
|
joylink_cuiweidong
|
06c5546a6f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 14:33:38 +08:00 |
|
joylink_cuiweidong
|
e5d2c71232
|
实训平台 左侧地图列表 点击展开代码调整
|
2020-08-14 14:33:19 +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
|
f6fed39c4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test——new
|
2020-08-14 10:56:36 +08:00 |
|
fan
|
b17c9c1c4c
|
添加线路配置guideNeedRouteSettingFirst
|
2020-08-14 10:56:11 +08:00 |
|
fan
|
150f047552
|
设备登录添加实训考试运行图编辑
|
2020-08-14 10:55:32 +08:00 |
|
fan
|
67cf89120f
|
添加线路配置guideNeedRouteSettingFirst
|
2020-08-14 10:54:28 +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
|
e3a76025e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 18:08:16 +08:00 |
|
joylink_cuiweidong
|
75a240d66b
|
剧本预览代码调整
|
2020-08-13 18:07:43 +08:00 |
|
sunzhenyu
|
debd9f54d0
|
修改三维沙盘哈尔滨静态文件，修改elmentui站台列表bug,修改影藏列车信息bug
|
2020-08-13 17:30:07 +08:00 |
|
sunzhenyu
|
41319d9543
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 16:51:01 +08:00 |
|
sunzhenyu
|
58366e737b
|
修改三维通号车站值班员钩锁
|
2020-08-13 16:50:54 +08:00 |
|
joylink_cuiweidong
|
0ed57e5488
|
剧本编制代码调整
|
2020-08-13 16:45:27 +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 |
|
joylink_cuiweidong
|
6a4cc3a2bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 13:05:34 +08:00 |
|
joylink_cuiweidong
|
af49d04f12
|
代码调整
|
2020-08-13 13:03:37 +08:00 |
|
fan
|
f22518f224
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 11:23:31 +08:00 |
|
fan
|
cc0803630c
|
设备跳转运行图等（未完）
|
2020-08-13 11:23:07 +08:00 |
|
joylink_cuiweidong
|
9c5a8238de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 10:47:19 +08:00 |
|
joylink_cuiweidong
|
60b07ef132
|
剧本编制控制权转移代码还原
|
2020-08-13 10:46:26 +08:00 |
|
fan
|
a97c1fcb74
|
iscs工作站仿真取消订阅问题调整
|
2020-08-13 09:40:40 +08:00 |
|
fan
|
066340930f
|
退出iscs工作站清理仿真
|
2020-08-13 09:22:31 +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 |
|
zyy
|
54bef31576
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-12 18:26:40 +08:00 |
|
zyy
|
36a0b1dd93
|
调整代码
|
2020-08-12 18:26:27 +08:00 |
|
joylink_cuiweidong
|
c3c65fba5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-12 17:34:55 +08:00 |
|
joylink_cuiweidong
|
8fd00b3493
|
剧本录制控制权转移代码调整
|
2020-08-12 17:34:37 +08:00 |
|
fan
|
fbda89c39e
|
iscs调整
|
2020-08-12 15:19:38 +08:00 |
|
fan
|
0348d143b5
|
合并代码
|
2020-08-12 11:04:04 +08:00 |
|
fan
|
30e30d5ef3
|
佛山线路问题调整&iscs样式调整
|
2020-08-12 11:02:47 +08:00 |
|
zyy
|
3731a56a78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-11 15:46:26 +08:00 |
|
zyy
|
09b151e830
|
调整地图绘制流程
|
2020-08-11 15:46:15 +08:00 |
|
fan
|
6f4b6f0c3a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-11 14:34:27 +08:00 |
|
fan
|
8687650e41
|
ibp系统调整&发布地图管理调整
|
2020-08-11 14:34:17 +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
|
15ecca61a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-11 10:57:41 +08:00 |
|
joylink_cuiweidong
|
740757896b
|
地图绘制代码调整
|
2020-08-11 10:57:20 +08:00 |
|
fan
|
e40032a24e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-11 09:21:43 +08:00 |
|
fan
|
775847029a
|
模板运行图添加仿真数据校验（接口未加）
|
2020-08-11 09:21:31 +08:00 |
|
zyy
|
05d650efa6
|
删除注释
|
2020-08-11 09:11:38 +08:00 |
|
zyy
|
0f4fa8feab
|
修改代码
|
2020-08-10 18:38:16 +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 |
|
joylink_cuiweidong
|
69e224be35
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 19:03:20 +08:00 |
|
joylink_cuiweidong
|
3c301b93ce
|
剧本编制 添加指令 代码
|
2020-08-07 19:02:59 +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 |
|
joylink_cuiweidong
|
946d212bb9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-04 18:48:14 +08:00 |
|
joylink_cuiweidong
|
2f6d444cf9
|
运行图代码调整
|
2020-08-04 18:47:57 +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
|
b5352ef82d
|
调整设备配置psdCode展示
|
2020-08-04 14:47:47 +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 |
|
fan
|
d95595ca0a
|
关联登录设备循环检测异常是循环获取二位码
|
2020-08-04 13:42:57 +08:00 |
|
fan
|
a385aa72c9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-04 13:30:52 +08:00 |
|
fan
|
8096076be3
|
电子沙盘界面添加退出和消息监听
|
2020-08-04 13:30:42 +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 |
|
sunzhenyu
|
4aa95a4bd6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-04 11:11:18 +08:00 |
|
sunzhenyu
|
36d19545f8
|
修改三维沙盘初始视角，修改车站按钮样式
|
2020-08-04 11:11:13 +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 |
|
fan
|
9a4591effd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-04 10:42:40 +08:00 |
|
fan
|
394fa0ec18
|
添加电子沙盘设备
|
2020-08-04 10:42:04 +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
|
c9fc984bc9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 15:23:00 +08:00 |
|
zyy
|
60986fbfeb
|
大屏修改
|
2020-08-03 15:22:46 +08:00 |
|
sunleking
|
9250606950
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 14:30:39 +08:00 |
|
sunleking
|
33ff32222d
|
修改三维通号和驾驶界面样式
|
2020-08-03 14:30:31 +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
|
1235126ac3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-03 10:30:36 +08:00 |
|
fan
|
278741e686
|
清除调用原有mutation-type
|
2020-08-03 10:30:28 +08:00 |
|
zyy
|
317ea995e7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 10:16:23 +08:00 |
|
zyy
|
7ff4872a33
|
调整大屏遮罩宽度
|
2020-08-03 10:16:10 +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
|
176de3219f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 18:49:51 +08:00 |
|
zyy
|
fb9e8f0325
|
调整地图样式及加载逻辑
|
2020-07-31 18:49:35 +08:00 |
|
joylink_cuiweidong
|
88b03d240b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 17:30:43 +08:00 |
|
joylink_cuiweidong
|
5bb59c855e
|
佛山控制权转移代码调整
|
2020-07-31 17:30:26 +08:00 |
|
sunzhenyu
|
988f38fbb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:42:34 +08:00 |
|
sunzhenyu
|
44710199b7
|
修改三维行车初始绑定列车
|
2020-07-31 16:42:25 +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 |
|
sunzhenyu
|
764a6139ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 15:58:38 +08:00 |
|
sunzhenyu
|
7b3ff46cff
|
修改三维驾驶关车门判断
|
2020-07-31 15:58:33 +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 |
|
sunzhenyu
|
3ca561a6cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 15:48:13 +08:00 |
|
sunzhenyu
|
d5c73e9331
|
修改三维驾驶hmi数据更新，修改驾驶面板绑定列车
|
2020-07-31 15:48:04 +08:00 |
|
zyy
|
e480de2dc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 15:24:58 +08:00 |
|
zyy
|
d15328de57
|
调整地图绘制流程
|
2020-07-31 15:24:44 +08:00 |
|
fan
|
65d25678db
|
plc网关配置调整&考试试卷问题调整
|
2020-07-31 10:37:50 +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 |
|
joylink_cuiweidong
|
50f4b1a0f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:38:47 +08:00 |
|
joylink_cuiweidong
|
0da1fc09e8
|
运行图加载根据车次号 运行图颜色代码调整
|
2020-07-30 15:37:49 +08:00 |
|
zyy
|
c85139fe48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:32:54 +08:00 |
|
zyy
|
48491044ce
|
调整列表样式
|
2020-07-30 15:32:39 +08:00 |
|
sunzhenyu
|
3990b41cf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:12:23 +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 |
|
sunzhenyu
|
b8b3292e37
|
merge
|
2020-07-30 15:10:17 +08:00 |
|
zyy
|
a6feabd406
|
调整地图绘制逻辑
|
2020-07-30 15:10:10 +08:00 |
|
sunzhenyu
|
ef09632c8b
|
新增三维通号VR测试场景
|
2020-07-30 15:08:17 +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 |
|
fan
|
7403c53baa
|
merge
|
2020-07-29 14:16:32 +08:00 |
|
fan
|
fff5acab5d
|
创建考试调整&路由replace调整
|
2020-07-29 14:14:34 +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 |
|
fan
|
e4a98283cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 18:02:20 +08:00 |
|
fan
|
c9efdaab54
|
西安工业集团登录页面样式调整
|
2020-07-27 18:02:10 +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
|
a5f6517ab8
|
设备管理IBP添加配置项
|
2020-07-27 15:33:54 +08:00 |
|
fan
|
7661d36ca4
|
宁波行调添加单锁&获取操作类型map调整
|
2020-07-27 15:22:26 +08:00 |
|
fan
|
8e6d424453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 14:12:02 +08:00 |
|
fan
|
a74993f217
|
添加地图配置项rmAtpSpeed，urmAtpSpeed&调整课程创建
|
2020-07-27 14:11:43 +08:00 |
|
zyy
|
a8d584ae89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 13:15:12 +08:00 |
|
zyy
|
2c39916217
|
调整运行图预览逻辑
|
2020-07-27 13:15:01 +08:00 |
|
fan
|
366375d9d0
|
merge
|
2020-07-27 10:01:07 +08:00 |
|
fan
|
a5a55af5ef
|
加载仿真计划失表取消loading状态&暂撤销宁波一计轴故障修改
|
2020-07-27 10:00:08 +08:00 |
|
zyy
|
fdd125e10f
|
修改运行图管理加载失败状态调整
|
2020-07-27 09:49:52 +08:00 |
|
joylink_zyy
|
c50adf149b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-25 15:07:59 +08:00 |
|
joylink_zyy
|
766d2b93a7
|
调整单人仿真获取人员列表
|
2020-07-25 15:07:45 +08:00 |
|
zyy
|
02abbd8192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 18:38:34 +08:00 |
|
zyy
|
789391e81a
|
调整地图加载顺序
|
2020-07-24 18:38:19 +08:00 |
|
joylink_cuiweidong
|
5ee257e9e2
|
地图绘图代码调整
|
2020-07-24 18:22:54 +08:00 |
|
joylink_cuiweidong
|
95d1f263da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 17:52:11 +08:00 |
|
joylink_cuiweidong
|
2affbbd5e4
|
地图绘制代码调整
|
2020-07-24 17:51:55 +08:00 |
|
zyy
|
8b5122a88f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 17:17:52 +08:00 |
|
zyy
|
cc5d68de39
|
调整综合演练流程，增加列车操作
|
2020-07-24 17:17:40 +08:00 |
|
joylink_cuiweidong
|
f8f921a543
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 16:03:29 +08:00 |
|
joylink_cuiweidong
|
d5ad3ab59d
|
地图绘制代码调整
|
2020-07-24 16:02:55 +08:00 |
|
fan
|
75164e9a5f
|
调整综合仿真现地行调切换显示
|
2020-07-24 15:28:45 +08:00 |
|
fan
|
fd4acc0a82
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 14:21:22 +08:00 |
|
fan
|
d4da17ae09
|
调整哈尔滨成都一故障样式&哈尔滨现地切换显示
|
2020-07-24 14:20:38 +08:00 |
|
zyy
|
b69cc2c4ab
|
调整哈尔滨线路设备管理，判断设备管理显示逻辑
|
2020-07-24 14:11:03 +08:00 |
|
zyy
|
584f65d285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 11:01:33 +08:00 |
|
zyy
|
fe08980f2f
|
调整判断
|
2020-07-24 11:01:22 +08:00 |
|
joylink_cuiweidong
|
ed8795a3a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 10:35:22 +08:00 |
|
joylink_cuiweidong
|
196a611d70
|
仿真聊天代码调整
|
2020-07-24 10:35:05 +08:00 |
|