joylink_cuiweidong
|
b78f90034a
|
剧本录制代码调整
|
2020-06-17 14:18:46 +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
|
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 |
|
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
|
a6ff101a6e
|
竞业达页面调整
|
2020-06-16 15:10:39 +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 |
|
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
|
271ef9dc11
|
添加通用配置项noParkingSM，parkingSM
|
2020-06-15 18:37:48 +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
|
a381bfdcd8
|
退出计划调整为初始化，并不限制点击
|
2020-06-15 13:34:24 +08:00 |
|
fan
|
3f978a2aa8
|
竞业达页面调整
|
2020-06-15 13:03:24 +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
|
3248f3badf
|
剧本代码调整
|
2020-06-12 18:29:14 +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
|
29b0937253
|
剧本代码调整
|
2020-06-12 16:28:52 +08:00 |
|
joylink_cuiweidong
|
a7ca270be0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:12:47 +08:00 |
|
joylink_cuiweidong
|
6d5ba33e1f
|
剧本代码调整
|
2020-06-12 16:12:33 +08:00 |
|
zyy
|
64a7e0e1ab
|
调整综合监控元素点击事件， 调整右键菜单样式
|
2020-06-12 15:34:53 +08:00 |
|
joylink_cuiweidong
|
c4b325c63d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 11:31:50 +08:00 |
|
joylink_cuiweidong
|
d942ae7916
|
剧本代码调整
|
2020-06-12 11:31:30 +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 |
|
fan
|
0f1ae1e8a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:06:49 +08:00 |
|
fan
|
fb570eb522
|
sics调整
|
2020-06-11 17:06:37 +08:00 |
|
zyy
|
ffd5fc79bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 14:48:54 +08:00 |
|
zyy
|
24acb1ba86
|
调整配置，增加综合监控数据
|
2020-06-11 14:48:40 +08:00 |
|
joylink_cuiweidong
|
f03880e59e
|
仿真聊天代码调整
|
2020-06-11 13:43:58 +08:00 |
|
joylink_cuiweidong
|
285749f3eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 13:29:31 +08:00 |
|
joylink_cuiweidong
|
dda8f39adf
|
新版地图右键操作 弹窗代码调整
|
2020-06-11 13:29:06 +08:00 |
|
fan
|
d16cd89fe4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 11:26:48 +08:00 |
|
fan
|
7d7583a7e2
|
时间表管理&添加通用配置项
|
2020-06-11 11:26:41 +08:00 |
|
sunzhenyu
|
4cdda87372
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 10:48:15 +08:00 |
|
sunzhenyu
|
52437f157f
|
修改三维驾驶换端车门动画变化bug
|
2020-06-11 10:48:04 +08:00 |
|
joylink_cuiweidong
|
3e6da59b3b
|
代码调整
|
2020-06-11 09:44:56 +08:00 |
|
joylink_cuiweidong
|
cb3663722f
|
代码调整
|
2020-06-11 09:43:02 +08:00 |
|
joylink_cuiweidong
|
8f2e7f974e
|
代码调整
|
2020-06-10 18:38:50 +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 |
|
zyy
|
ce87a96db3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/map.js
|
2020-06-10 17:04:12 +08:00 |
|
zyy
|
75e9db45fa
|
调整右键菜单
|
2020-06-10 17:02:39 +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 |
|
sunzhenyu
|
4cec1efc09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 16:30:58 +08:00 |
|
sunzhenyu
|
365cd7de44
|
增加列车开关门操作
|
2020-06-10 16:30:23 +08:00 |
|
joylink_cuiweidong
|
c953d98ffa
|
佛山线路 现地信号机 操作调整
|
2020-06-10 14:37:43 +08:00 |
|
joylink_cuiweidong
|
4118eb7a32
|
线路配置添加参数 列车控制模式/级别
|
2020-06-10 13:42:06 +08:00 |
|
joylink_cuiweidong
|
c73769f90d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 13:24:27 +08:00 |
|
joylink_cuiweidong
|
b169bb1e20
|
佛山有轨电车指令代码调整
|
2020-06-10 13:24:12 +08:00 |
|
fan
|
1d56ae8249
|
合并代码
|
2020-06-09 18:33:17 +08:00 |
|
fan
|
fa8c31b2d4
|
iscs 照明系统模式表&时间表
|
2020-06-09 18:31:21 +08:00 |
|
zyy
|
d360dc26b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 17:48:28 +08:00 |
|
zyy
|
015dd9e113
|
调整综合监控数据，调整绘图
|
2020-06-09 17:48:08 +08:00 |
|
fan
|
c119d5130f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 14:39:43 +08:00 |
|
fan
|
4b67f81cf0
|
iscs 小系统模式表
|
2020-06-09 14:39:32 +08:00 |
|
joylink_cuiweidong
|
6b551b04fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 13:34:48 +08:00 |
|
joylink_cuiweidong
|
83e8a6658a
|
线路配置添加字段（道岔正/反操是否联动，道岔单解/锁是否联动，是否强制取消进路/在接近区段占用时是否依旧强制执行取消进路）
|
2020-06-09 13:34:32 +08:00 |
|
zyy
|
f43d964d29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-06-09 13:26:01 +08:00 |
|
zyy
|
8c52fcc8ef
|
调整iscs 鼠标事件流程
|
2020-06-09 13:24:18 +08:00 |
|
fan
|
0902d10f4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 18:41:00 +08:00 |
|
fan
|
de2defc461
|
iscs 小系统模式表&交互
|
2020-06-08 18:40:48 +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 |
|
fan
|
1170ed5f0c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:59:42 +08:00 |
|
fan
|
fc0772a11c
|
iscs调整&站后折返显示调整
|
2020-06-05 18:59:35 +08:00 |
|
sunzhenyu
|
4f6e4ff2fc
|
修改三维驾驶列车排序，修改三维驾驶面板图标刷新，完善三维cctv的乘客上下车，优化ai逻辑，修改进出站闸机逻辑。修改三维编辑器站台内外侧属性赋值。修改通号三维设备初次加载面板bug
|
2020-06-05 18:56:42 +08:00 |
|