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 |
|
fan
|
8fc521a780
|
操作调整
|
2020-06-12 16:15:20 +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 |
|
sunzhenyu
|
0f92d67596
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:05:05 +08:00 |
|
sunzhenyu
|
7c7b0a1f2f
|
修改三维设备读取站台贴图为空bug
|
2020-06-12 16:04:50 +08:00 |
|
zyy
|
5650ecc410
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 15:35:08 +08:00 |
|
zyy
|
64a7e0e1ab
|
调整综合监控元素点击事件， 调整右键菜单样式
|
2020-06-12 15:34:53 +08:00 |
|
fan
|
71a99f225c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 14:34:29 +08:00 |
|
fan
|
2e44c69429
|
老版本福州列车目的地码调整
|
2020-06-12 14:34:18 +08:00 |
|
zyy
|
207cd06cd9
|
删除佛山线路配置
|
2020-06-12 13:42:33 +08:00 |
|
zyy
|
656cbb3b7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 13:19:39 +08:00 |
|
zyy
|
e01277ba64
|
调整车站 控制模式配置
|
2020-06-12 13:19:26 +08:00 |
|
fan
|
e5bb63e3e1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 13:16:31 +08:00 |
|
joylink_cuiweidong
|
22756f15ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 13:16:23 +08:00 |
|
fan
|
2c8c8117b2
|
老版本福州列车目的地码调整
|
2020-06-12 13:16:21 +08:00 |
|
joylink_cuiweidong
|
0ead3ea016
|
列车的提示框停稳状态调整
|
2020-06-12 13:16:03 +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 |
|
fan
|
9466f7f399
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 10:51:16 +08:00 |
|
fan
|
429fe6d6a7
|
跳停上下行取值调整&列车识别号显示调整
|
2020-06-12 10:51:06 +08:00 |
|
zyy
|
f7c6f6ee64
|
调整区段配置
|
2020-06-12 09:55:53 +08:00 |
|
fan
|
9294c582f8
|
domId调整
|
2020-06-12 09:41:16 +08:00 |
|
fan
|
c8b2f4cfa7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 18:36:25 +08:00 |
|
fan
|
9de92f7106
|
宁波一号线列车设置计划车、人工车、头码车
|
2020-06-11 18:36:15 +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
|
979f116f3a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:28:25 +08:00 |
|
fan
|
434d7fdbbe
|
信号机批量设置灯位类型
|
2020-06-11 17:28:15 +08:00 |
|
zyy
|
e9713fc471
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:07:14 +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
|
3e9835ff15
|
调整字段显示
|
2020-06-11 17:06:29 +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 |
|
zyy
|
bee7b64e8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 11:12:02 +08:00 |
|
zyy
|
0a58b253e1
|
调整绘图元素皮肤，调整大屏高度
|
2020-06-11 11:11:47 +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
|
7f5d99b48f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 18:00:11 +08:00 |
|
zyy
|
e688625887
|
调整大屏高度计算
|
2020-06-10 17:59:51 +08:00 |
|
fan
|
3352b94149
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 17:58:35 +08:00 |
|
fan
|
1d2619cd28
|
menu-bar显示条件调整
|
2020-06-10 17:58:20 +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
|
763e0841c0
|
注释
|
2020-06-10 16:30:48 +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 |
|
zyy
|
e4ec3dfbde
|
调整佛山线路 站台操作
|
2020-06-10 11:18:50 +08:00 |
|
zyy
|
c8bf7c80ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 18:41:08 +08:00 |
|
zyy
|
62ede6fec7
|
增加佛山线路现地操作，调整状态字段
|
2020-06-09 18:40:48 +08:00 |
|
fan
|
5c65653ef7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 18:33:26 +08:00 |
|
fan
|
1d56ae8249
|
合并代码
|
2020-06-09 18:33:17 +08:00 |
|
fan
|
fa8c31b2d4
|
iscs 照明系统模式表&时间表
|
2020-06-09 18:31:21 +08:00 |
|
joylink_cuiweidong
|
174c15bafc
|
佛山线路添加 设置临时限速
|
2020-06-09 18:30:00 +08:00 |
|
joylink_cuiweidong
|
56eae6302a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 17:54:28 +08:00 |
|
joylink_cuiweidong
|
cc3fe9353f
|
佛山有轨电车 宁波一号线 全线扣车代码调整
|
2020-06-09 17:53:54 +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 |
|
sunzhenyu
|
1657859e08
|
修改三维cctv清客触发逻辑
|
2020-06-09 16:03:18 +08:00 |
|
sunzhenyu
|
40cfdca979
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 15:55:08 +08:00 |
|
sunzhenyu
|
e83553c39a
|
替换优化后三维cctv模型，修改切换站台未清空当前列车编号bug
|
2020-06-09 15:54:57 +08:00 |
|
joylink_cuiweidong
|
3628ad2d6e
|
排列进路代码调整
|
2020-06-09 15:11:21 +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
|
3c3a355fb6
|
道岔单解操作代码调整
|
2020-06-09 14:29:36 +08:00 |
|
joylink_cuiweidong
|
f3d37dd240
|
代码调整
|
2020-06-09 14:16:06 +08:00 |
|
joylink_cuiweidong
|
5bc3bfc8dd
|
操作指令代码调整
|
2020-06-09 14:09:15 +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 |
|
joylink_cuiweidong
|
dd758a1bfb
|
操作指令代码调整
|
2020-06-09 13:16:47 +08:00 |
|
joylink_cuiweidong
|
ff86c8d07f
|
指令字典调整
|
2020-06-09 11:33:42 +08:00 |
|
joylink_cuiweidong
|
be24daabd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 18:42:44 +08:00 |
|
joylink_cuiweidong
|
bbb9df842c
|
代码调整
|
2020-06-08 18:42:20 +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
|
9a36ce50eb
|
增加三维cctv多画面，修改cctv初始视角
|
2020-06-08 18:23:24 +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
|
63c3d785dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 10:46:23 +08:00 |
|
joylink_cuiweidong
|
eecc022ae5
|
佛山线路 菜单栏 增加显示功能
列车提示代码调整
|
2020-06-08 10:46:01 +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 |
|
joylink_cuiweidong
|
99346c4b02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:48:26 +08:00 |
|
joylink_cuiweidong
|
38b7580f79
|
佛山线路 道岔在单锁的状态时，使用道岔单解的功能，未起到双确认调整
停站时间没有具体停站多少时间调整
|
2020-06-05 18:48:07 +08:00 |
|
zyy
|
c86bb0bff3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:04:42 +08:00 |
|
zyy
|
768c62333c
|
调整站台操作，增加综合监控调节
|
2020-06-05 18:04:27 +08:00 |
|
joylink_cuiweidong
|
4d918cc6a7
|
裁判平台回放代码调整
|
2020-06-05 15:54:03 +08:00 |
|
joylink_cuiweidong
|
4aec9679aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:54:12 +08:00 |
|
zyy
|
dd16694b52
|
调整格式
|
2020-06-05 14:53:45 +08:00 |
|
joylink_cuiweidong
|
cf0a078635
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:53:43 +08:00 |
|
joylink_cuiweidong
|
7c76ba9021
|
裁判系统回放代码调整
|
2020-06-05 14:53:18 +08:00 |
|
zyy
|
465da976d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:52:20 +08:00 |
|
zyy
|
23119acc74
|
调整综合监控绘图元素
|
2020-06-05 14:51:54 +08:00 |
|
fan
|
e98dab8d56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:46:47 +08:00 |
|
fan
|
7d8a8f8fb6
|
实操竞赛计时调整&iscs调整
|
2020-06-05 14:46:37 +08:00 |
|
joylink_cuiweidong
|
377473ea4c
|
新版剧本增加角色调整
|
2020-06-05 14:22:46 +08:00 |
|
joylink_cuiweidong
|
6f0cc20a42
|
新版剧本修改对话代码调整
|
2020-06-05 14:12:22 +08:00 |
|
joylink_cuiweidong
|
767e5cc48a
|
裁判系统代码调整
|
2020-06-05 13:41:47 +08:00 |
|
zyy
|
fbf26cfafc
|
调整综合监控绘图元素，保存绘图数据
|
2020-06-05 13:24:38 +08:00 |
|
joylink_cuiweidong
|
ea6d74d3c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 13:06:40 +08:00 |
|
joylink_cuiweidong
|
7f72ed4048
|
裁判系统代码调整
|
2020-06-05 13:05:33 +08:00 |
|
fan
|
b47d5a0f57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:50:16 +08:00 |
|
fan
|
ec6ebe78e5
|
列车显示调整
|
2020-06-05 10:50:05 +08:00 |
|
zyy
|
8bd88fe20b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:32:56 +08:00 |
|