fan
|
df983b2cb9
|
项目设备管理调整
|
2020-06-19 18:02:50 +08:00 |
|
joylink_cuiweidong
|
8c7a5e7796
|
右键操作代码整理
|
2020-06-19 17:03:39 +08:00 |
|
joylink_cuiweidong
|
ee12c33025
|
西安一号线右键操作代码调整
|
2020-06-19 16:13:21 +08:00 |
|
joylink_cuiweidong
|
5b5949b23d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 15:34:35 +08:00 |
|
joylink_cuiweidong
|
dd9959b2f4
|
右键菜单代码调整
|
2020-06-19 15:34:20 +08:00 |
|
fan
|
a1c3935ba7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 15:19:40 +08:00 |
|
fan
|
75116c32da
|
控制模式实操调整&sock降至1.0.0
|
2020-06-19 15:19:28 +08:00 |
|
joylink_cuiweidong
|
b4394a7092
|
右键菜单代码整理
|
2020-06-19 14:20:57 +08:00 |
|
zyy
|
bcc5fdf92c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 14:16:35 +08:00 |
|
zyy
|
5334049fcc
|
提取公共函数组件 删除线路多余配置
|
2020-06-19 14:16:21 +08:00 |
|
joylink_cuiweidong
|
f5ee525b20
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 14:09:08 +08:00 |
|
joylink_cuiweidong
|
b34a9fdf25
|
右键菜单代码整理
|
2020-06-19 14:08:52 +08:00 |
|
zyy
|
06ff692181
|
删除老板本成都4、3 北京1 线路配置
|
2020-06-19 13:56:46 +08:00 |
|
zyy
|
3a66119f81
|
删除多余配置
|
2020-06-19 13:40:56 +08:00 |
|
zyy
|
996a0d1a89
|
删除多余文件
|
2020-06-19 13:33:55 +08:00 |
|
zyy
|
5934c61b8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/beijing_01/menus/dialog/cancelAllLimit.vue
|
2020-06-19 13:32:40 +08:00 |
|
zyy
|
8e409078d9
|
调整公共文件
|
2020-06-19 13:31:31 +08:00 |
|
joylink_cuiweidong
|
f53e5044b7
|
代码调整
|
2020-06-19 13:30:19 +08:00 |
|
joylink_cuiweidong
|
645e425e2c
|
宁波北京一号线操作代码调整
|
2020-06-19 13:28:53 +08:00 |
|
joylink_cuiweidong
|
9138fab486
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 13:01:35 +08:00 |
|
joylink_cuiweidong
|
100c651068
|
剧本代码调整
|
2020-06-19 11:30:12 +08:00 |
|
zyy
|
96456b2280
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 11:29:30 +08:00 |
|
zyy
|
6236e70494
|
调整限速配置
|
2020-06-19 11:29:12 +08:00 |
|
sunzhenyu
|
4a831d4aa7
|
merge baseurl
|
2020-06-19 11:26:40 +08:00 |
|
sunzhenyu
|
45c96bd76f
|
修改三维驾驶录制界面中托管按钮
|
2020-06-19 11:23:47 +08:00 |
|
fan
|
3a4641f06f
|
合并代码
|
2020-06-19 10:24:11 +08:00 |
|
fan
|
f0ae68d94a
|
登录接口调整
|
2020-06-19 10:23:13 +08:00 |
|
joylink_cuiweidong
|
090d2bdfc1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 10:07:54 +08:00 |
|
joylink_cuiweidong
|
ad756eee10
|
剧本编制代码调整
|
2020-06-19 10:06:58 +08:00 |
|
sunzhenyu
|
3e21c2827c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 09:56:53 +08:00 |
|
sunzhenyu
|
2a50dd1be2
|
修改三维驾驶刷新重连列车bug
|
2020-06-19 09:56:40 +08:00 |
|
joylink_cuiweidong
|
411c1cc13e
|
宁波线路操作代码整理
|
2020-06-19 09:44:03 +08:00 |
|
fan
|
5bf46c151c
|
合并代码
|
2020-06-19 09:18:50 +08:00 |
|
fan
|
915f1fb959
|
故障操作和新建计划车迁移&信号机处理添加canSetCi属性(是否可设置联锁触发)
|
2020-06-19 09:17:03 +08:00 |
|
joylink_cuiweidong
|
f2a3867ed8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:50:34 +08:00 |
|
joylink_cuiweidong
|
d9f6d515fd
|
剧本添加司机的指令操作
|
2020-06-18 18:49:19 +08:00 |
|
sunzhenyu
|
03716c5ed3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:40:56 +08:00 |
|
sunzhenyu
|
8b2c0cc00a
|
修改三维驾驶通信接口改post
|
2020-06-18 18:40:47 +08:00 |
|
joylink_cuiweidong
|
30cd335845
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:32:37 +08:00 |
|
joylink_cuiweidong
|
aedf2b85fd
|
宁波一号线操作代码整理（部分）
|
2020-06-18 18:32:02 +08:00 |
|
zyy
|
914eb55b03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:13:41 +08:00 |
|
zyy
|
0da6a64af7
|
调整临时限速配置
|
2020-06-18 18:13:28 +08:00 |
|
joylink_cuiweidong
|
aa632c457d
|
西安一号线 操作代码整理
|
2020-06-18 18:00:17 +08:00 |
|
joylink_cuiweidong
|
81f418afe5
|
西安二号线操作调整
|
2020-06-18 17:50:26 +08:00 |
|
zyy
|
003bf13395
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 17:31:29 +08:00 |
|
zyy
|
47e44c0a76
|
调整全局组件配置
|
2020-06-18 17:31:14 +08:00 |
|
fan
|
cf961927db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 17:30:00 +08:00 |
|
fan
|
b8dfa50306
|
调整西安三号箱操作定义
|
2020-06-18 17:29:46 +08:00 |
|
joylink_cuiweidong
|
4b7c7f3f84
|
绘图代码调整
|
2020-06-18 16:58:21 +08:00 |
|
zyy
|
a039778083
|
调整路径设置
|
2020-06-18 16:03:32 +08:00 |
|
zyy
|
67ec40549c
|
调整顺序
|
2020-06-18 15:54:59 +08:00 |
|
zyy
|
5bb54b07cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
# src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
# src/jmapNew/theme/xian_01/menus/menuSignal.vue
|
2020-06-18 14:59:43 +08:00 |
|
zyy
|
97b0a3f9eb
|
调整公共提示路径，删除多余文件
|
2020-06-18 14:57:32 +08:00 |
|
fan
|
08a3bbaa7c
|
合并代码
|
2020-06-18 14:49:14 +08:00 |
|
fan
|
76eed898a5
|
福州操作定义调整
|
2020-06-18 14:47:00 +08:00 |
|
joylink_cuiweidong
|
04b9f6062a
|
去掉断点
|
2020-06-18 14:38:33 +08:00 |
|
joylink_cuiweidong
|
7b9fe40dbd
|
剧本代码调整
|
2020-06-18 14:36:23 +08:00 |
|
joylink_cuiweidong
|
4c99069752
|
剧本代码调整
|
2020-06-18 14:19:13 +08:00 |
|
joylink_cuiweidong
|
350043c3d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 11:25:01 +08:00 |
|
joylink_cuiweidong
|
acd3b0f87e
|
信号机进路代码整理
|
2020-06-18 11:24:42 +08:00 |
|
zyy
|
e439eb6048
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 11:01:49 +08:00 |
|
zyy
|
cfa6445b02
|
调整区段组件
|
2020-06-18 11:01:33 +08:00 |
|
joylink_cuiweidong
|
f3022a6bf7
|
信号机操作代码整理
|
2020-06-18 10:22:07 +08:00 |
|
fan
|
39bc38701e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 10:05:20 +08:00 |
|
fan
|
f892440294
|
调整操作定义
|
2020-06-18 10:05:12 +08:00 |
|
joylink_cuiweidong
|
b0e5d7a6b6
|
信号机操作代码整理
|
2020-06-18 09:46:29 +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 |
|
zyy
|
ceb3602ab2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 18:29:47 +08:00 |
|
zyy
|
6c272d3a6c
|
调整组件
|
2020-06-17 18:29:35 +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 |
|
zyy
|
b39f278a5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 17:48:33 +08:00 |
|
zyy
|
c35ceb948c
|
道岔公共组件提取
|
2020-06-17 17:48:19 +08:00 |
|
joylink_cuiweidong
|
1886663445
|
宁波一号线，北京一号线，佛山有轨电车操作代码调整
|
2020-06-17 17:08:34 +08:00 |
|
joylink_cuiweidong
|
068fc65f3d
|
剧本代码调整
|
2020-06-17 15:33:04 +08:00 |
|
joylink_cuiweidong
|
da2e975094
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 15:31:39 +08:00 |
|
joylink_cuiweidong
|
556d7fa109
|
仿真右侧列车显示代码调整
|
2020-06-17 15:31:15 +08:00 |
|
zyy
|
a047c9996e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 15:24:28 +08:00 |
|
zyy
|
ba8f138de3
|
提取信号机通用组件
|
2020-06-17 15:24:16 +08:00 |
|
fan
|
bc4ad0658e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 14:57:32 +08:00 |
|
fan
|
7ae4206448
|
福州一号线操作定义配置
|
2020-06-17 14:57:20 +08:00 |
|
joylink_cuiweidong
|
283206e55d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 14:19:07 +08:00 |
|
joylink_cuiweidong
|
b78f90034a
|
剧本录制代码调整
|
2020-06-17 14:18:46 +08:00 |
|
fan
|
ca539976a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 13:35:34 +08:00 |
|
fan
|
89ae6e8c0f
|
列车整理
|
2020-06-17 13:35:21 +08:00 |
|
sunzhenyu
|
3ec20a75c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 13:32:29 +08:00 |
|
sunzhenyu
|
71a0faa648
|
三维cctv站台名站台标方向添加
|
2020-06-17 13:32:14 +08:00 |
|
zyy
|
52bee79e22
|
删除多余组件
|
2020-06-17 11:16:56 +08:00 |
|
zyy
|
18c4d36606
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 10:30:11 +08:00 |
|
zyy
|
b530818a7e
|
调整综合检控 cctv 流程
|
2020-06-17 10:29:56 +08:00 |
|
joylink_cuiweidong
|
9da1e3bbac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 09:57:13 +08:00 |
|
joylink_cuiweidong
|
584654daec
|
剧本代码调整
|
2020-06-17 09:56:51 +08:00 |
|
zyy
|
88ac5afa45
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 09:16:16 +08:00 |
|
zyy
|
17158401de
|
调整综合监控导航栏
|
2020-06-17 09:16:03 +08:00 |
|
joylink_cuiweidong
|
4fb17151df
|
佛山有轨电车操作代码调整
|
2020-06-17 09:01:18 +08:00 |
|
fan
|
6cc44b5528
|
合并代码
|
2020-06-16 18:38:21 +08:00 |
|
fan
|
3b171130f9
|
福州列车显示调整&表单组件button增加loading
|
2020-06-16 18:36:18 +08:00 |
|
sunzhenyu
|
e7a9b8f737
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 18:18:56 +08:00 |
|
sunzhenyu
|
e415dc28c0
|
修改三维驾驶mmi车门显示和控制面板关门灯
|
2020-06-16 18:18:47 +08:00 |
|
zyy
|
73338a7eaa
|
增加宁波线路车站折返逻辑
|
2020-06-16 17:49:55 +08:00 |
|
zyy
|
6d7c75e5f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 16:39:20 +08:00 |
|
zyy
|
7f242ba443
|
调整综合监控绘图元素， 调整按图折返配置
|
2020-06-16 16:39:07 +08:00 |
|
fan
|
d0e862823a
|
控制模式转换调整
|
2020-06-16 15:33:38 +08:00 |
|
fan
|
5462b24c6a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 15:10:47 +08:00 |
|
fan
|
a6ff101a6e
|
竞业达页面调整
|
2020-06-16 15:10:39 +08:00 |
|
zyy
|
53823aea04
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 15:02:00 +08:00 |
|
zyy
|
f62de1971f
|
增加宁波线路 站后折返皮肤配置
|
2020-06-16 15:01:29 +08:00 |
|
fan
|
5ecb65a577
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 14:53:08 +08:00 |
|
fan
|
db98a53907
|
福州道岔&列车操作
|
2020-06-16 14:52:57 +08:00 |
|
zyy
|
10502988a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 14:45:50 +08:00 |
|
zyy
|
dfdbddad2b
|
调整综合监控数据，调整地图绘制功能按钮显示状态逻辑判断
|
2020-06-16 14:45:34 +08:00 |
|
fan
|
2e5b07d7e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 13:56:47 +08:00 |
|
fan
|
5292afe4dd
|
宁波一号线人工车头码车显示&哈尔滨title+V1.0&福州道岔操作调整（未完）
|
2020-06-16 13:56:33 +08:00 |
|
sunzhenyu
|
3d95103199
|
修改三维西安隧道模型
|
2020-06-16 13:36:38 +08:00 |
|
sunzhenyu
|
33343f6447
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 13:17:30 +08:00 |
|
sunzhenyu
|
a2c2a963a4
|
增加三维驾驶关车门亮灯，修改三维道岔转辙机动画速度，修改三维仿真驾驶中车站模型增加图片资源
|
2020-06-16 13:17:11 +08:00 |
|
fan
|
35b6d9093a
|
地图绘制信号机添加属性noOverlap是否无延续保护
|
2020-06-16 09:50:39 +08:00 |
|
fan
|
ae0a6d6dcd
|
福州一号线：站台详情
|
2020-06-16 09:32:19 +08:00 |
|
fan
|
2f81b142f3
|
宁波一号线设置头码车放开服务号输入框
|
2020-06-16 09:03:06 +08:00 |
|
fan
|
271ef9dc11
|
添加通用配置项noParkingSM，parkingSM
|
2020-06-15 18:37:48 +08:00 |
|
fan
|
38a5aeec67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 18:00:39 +08:00 |
|
fan
|
f60e69f8ff
|
福州车站站台操作&西安车站站台操作调整
|
2020-06-15 18:00:24 +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
|
c4ce6ae0f9
|
线路管理添加配置项-ctcOverlapOnlyTurnBackStationLock
|
2020-06-15 14:33:38 +08:00 |
|
fan
|
3c9dd88e31
|
福州线路信号机调整
|
2020-06-15 14:26:31 +08:00 |
|
fan
|
a381bfdcd8
|
退出计划调整为初始化，并不限制点击
|
2020-06-15 13:34:24 +08:00 |
|
fan
|
3f978a2aa8
|
竞业达页面调整
|
2020-06-15 13:03:24 +08:00 |
|
fan
|
2f51f2362b
|
调整西安列车车头三角宽度
|
2020-06-15 10:41:27 +08:00 |
|
fan
|
42d9e058a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 10:05:38 +08:00 |
|
fan
|
a732b9c19b
|
添加竞业达登录页面
|
2020-06-15 10:05:27 +08:00 |
|
zyy
|
1132043e13
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 18:31:11 +08:00 |
|
zyy
|
5622cc5216
|
调整公共地图右键菜单样式
|
2020-06-12 18:30:50 +08:00 |
|
joylink_cuiweidong
|
d237d45117
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 18:29:33 +08:00 |
|
joylink_cuiweidong
|
3248f3badf
|
剧本代码调整
|
2020-06-12 18:29:14 +08:00 |
|
fan
|
e4008afff1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 18:28:48 +08:00 |
|
fan
|
98bdbc43ab
|
福州信号机操作调整
|
2020-06-12 18:28:32 +08:00 |
|
joylink_cuiweidong
|
3944f743c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 17:44:43 +08:00 |
|
joylink_cuiweidong
|
de8bbcf2bb
|
剧本代码调整
|
2020-06-12 17:44:18 +08:00 |
|
zyy
|
a166d492f1
|
调整字段名称，删除注释
|
2020-06-12 17:16:08 +08:00 |
|
zyy
|
66260cf3ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 17:12:28 +08:00 |
|
zyy
|
5a01bbfbcf
|
调整综合监控加载数据流程
|
2020-06-12 17:12:13 +08:00 |
|
joylink_cuiweidong
|
609bdaa5f2
|
剧本代码调整
|
2020-06-12 16:37:09 +08:00 |
|
fan
|
b058651e2c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:34:20 +08:00 |
|
fan
|
be0208c943
|
福州操作暂存
|
2020-06-12 16:34:11 +08:00 |
|
joylink_cuiweidong
|
29b0937253
|
剧本代码调整
|
2020-06-12 16:28:52 +08:00 |
|
fan
|
2e82a362af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:15:30 +08:00 |
|