fan
|
d7c5a1303d
|
新建列车调整
|
2020-05-22 11:09:00 +08:00 |
|
fan
|
1c9301a3d5
|
调整列车指令
|
2020-05-21 18:27:26 +08:00 |
|
fan
|
98f60b6d94
|
调整虚拟信号机侧向开放显示
|
2020-05-21 17:15:17 +08:00 |
|
fan
|
4d9edad82b
|
调整加入创建列车菜单问题
|
2020-05-21 17:03:30 +08:00 |
|
fan
|
a861e4908f
|
哈尔滨虚拟信号机调整
|
2020-05-21 16:53:39 +08:00 |
|
fan
|
e4bdd9c829
|
调整西安一ats人工控显示调整
|
2020-05-21 16:34:05 +08:00 |
|
fan
|
503c51af10
|
西安一三宁波一福州一佛山延续保护区段闪烁
|
2020-05-21 15:58:23 +08:00 |
|
fan
|
fa4c481d40
|
删除新建列车参数
|
2020-05-21 14:40:21 +08:00 |
|
fan
|
82adf8e241
|
西安三号线列车识别号修改
|
2020-05-21 14:21:04 +08:00 |
|
fan
|
96f5c31b18
|
新建列车调整
|
2020-05-21 13:16:20 +08:00 |
|
fan
|
19bd41b214
|
调整hydIcon路径
|
2020-05-21 10:02:13 +08:00 |
|
fan
|
650b0c00ee
|
调整列车早晚点显示
|
2020-05-21 09:31:16 +08:00 |
|
fan
|
9e8f4a48f4
|
调整站台扣车显示
|
2020-05-20 18:11:39 +08:00 |
|
fan
|
ddee6156f7
|
竞赛管理显示地址
|
2020-05-20 17:44:47 +08:00 |
|
fan
|
f93f432d7e
|
ARB故障状态&哈尔滨列车早晚点时间
|
2020-05-20 17:08:21 +08:00 |
|
fan
|
e3034f630e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 14:46:39 +08:00 |
|
fan
|
b137adbd69
|
哈尔滨地图问题调整&竞赛管理
|
2020-05-20 14:46:26 +08:00 |
|
joylink_cuiweidong
|
74665d7b25
|
剧本编制代码调整
|
2020-05-20 11:13:32 +08:00 |
|
joylink_cuiweidong
|
ca7e92f6a1
|
剧本编制代码调整
|
2020-05-20 10:28:16 +08:00 |
|
joylink_cuiweidong
|
582543dd22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:56:49 +08:00 |
|
joylink_cuiweidong
|
a51ae0aa30
|
西安二号线 列车正占用的区段，计轴标示也会显示为红色 代码调整
|
2020-05-19 18:54:51 +08:00 |
|
fan
|
597af25b40
|
iscs&站台故障
|
2020-05-19 18:38:58 +08:00 |
|
fan
|
45422c8cd2
|
信号机批量设置引导信号&虚拟信号机旋转
|
2020-05-19 15:44:01 +08:00 |
|
joylink_cuiweidong
|
a1097088ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 09:45:31 +08:00 |
|
joylink_cuiweidong
|
08991c8694
|
剧本代码调整
|
2020-05-19 09:45:15 +08:00 |
|
fan
|
46092a9b8e
|
西安三右键菜单
|
2020-05-19 09:09:38 +08:00 |
|
zyy
|
3069cf2112
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 17:08:32 +08:00 |
|
zyy
|
b8bf51fc82
|
优化地图绘制
|
2020-05-18 17:08:21 +08:00 |
|
fan
|
5f9806cdb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 14:49:29 +08:00 |
|
fan
|
135b328dd1
|
故障操作调整
|
2020-05-18 14:49:16 +08:00 |
|
joylink_cuiweidong
|
3e64c6da02
|
西安三号线 仿真系统车次与实际车次显示不符 修改
|
2020-05-18 11:32:46 +08:00 |
|
joylink_cuiweidong
|
9bad1d2eb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 20:47:11 +08:00 |
|
joylink_cuiweidong
|
8059353f06
|
剧本代码调整
|
2020-05-15 20:45:59 +08:00 |
|
fan
|
cc6227f6f4
|
故障调整
|
2020-05-15 19:24:58 +08:00 |
|
fan
|
c0d75502fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 18:48:38 +08:00 |
|
fan
|
d47a986fcc
|
故障操作&贵州状态班级展示
|
2020-05-15 18:48:10 +08:00 |
|
joylink_cuiweidong
|
f775f76aa8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:54:59 +08:00 |
|
joylink_cuiweidong
|
901ab1a8bd
|
剧本添加提示
|
2020-05-15 16:54:31 +08:00 |
|
fan
|
dff3a090a5
|
调整右键跳转车站
|
2020-05-15 15:58:08 +08:00 |
|
fan
|
c27204aeb7
|
信号机添加非空校验
|
2020-05-15 14:18:17 +08:00 |
|
fan
|
b7e8409b1a
|
西安二号线信号机内三角进路排列后显示样式调整
|
2020-05-15 13:56:19 +08:00 |
|
zyy
|
cb47cd612d
|
调整加载线路字段
|
2020-05-15 10:34:15 +08:00 |
|
fan
|
396dd0d899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 18:55:12 +08:00 |
|
fan
|
71682d00a5
|
区段计轴调整
|
2020-05-14 18:54:53 +08:00 |
|
zyy
|
e3d773dfbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:48:17 +08:00 |
|
zyy
|
b975c1746b
|
调整西安三号线与一号线列车移入提示信息
|
2020-05-14 17:48:01 +08:00 |
|
fan
|
8ffd499c51
|
信号机调整
|
2020-05-14 17:37:46 +08:00 |
|
fan
|
027fe43467
|
删除日志，信号机调整
|
2020-05-14 17:24:35 +08:00 |
|
zyy
|
42402f6223
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:44:11 +08:00 |
|
zyy
|
b735cd5b06
|
调整区段回车问题
|
2020-05-14 16:43:55 +08:00 |
|
fan
|
b3743326bc
|
西安二号线信号机调整逻辑点灯
|
2020-05-14 16:04:23 +08:00 |
|
fan
|
6eb6cd5340
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:37:37 +08:00 |
|
fan
|
f8a6908d8c
|
西安二号线调整
|
2020-05-14 15:37:18 +08:00 |
|
joylink_cuiweidong
|
77a8fd7c41
|
西安二号线 列车在站台停车时，站台框也显示为绿色
|
2020-05-14 15:32:51 +08:00 |
|
fan
|
f95d5e46d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 11:03:33 +08:00 |
|
fan
|
8335ee1259
|
调整列车详情显示和路由课程创建角色处理
|
2020-05-14 11:03:24 +08:00 |
|
zyy
|
ba1365b951
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 11:00:27 +08:00 |
|
zyy
|
2de0a0fc5b
|
调整区段鼠标移入元素绘制
|
2020-05-14 11:00:09 +08:00 |
|
joylink_cuiweidong
|
352becd47b
|
西安二号线 列车占用的光带显示为红光带
|
2020-05-14 10:55:20 +08:00 |
|
joylink_cuiweidong
|
8fd1014203
|
西安二号线 车次窗显示车次号颜色为黑色
列车车次号线显示为五位
实际列车到站开门的过程中列车方向图标不消失 调整
|
2020-05-14 10:22:13 +08:00 |
|
zyy
|
ecf563e8de
|
调整大屏系统保存
|
2020-05-13 16:29:10 +08:00 |
|
zyy
|
cd229f7f81
|
调整地图大屏编辑，宁波线路道岔操作
|
2020-05-13 15:31:12 +08:00 |
|
zyy
|
781f96f89c
|
调整大屏预览，区段字段调整
|
2020-05-13 10:07:07 +08:00 |
|
zyy
|
52cbb7fd1e
|
调整大屏系统列车缩放
|
2020-05-12 18:23:56 +08:00 |
|
zyy
|
dd6030d346
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 16:45:59 +08:00 |
|
zyy
|
ecec0ec1e0
|
调整西安一号鼠标移入样式
|
2020-05-12 16:45:45 +08:00 |
|
fan
|
a707d142be
|
逻辑区段生成调整
|
2020-05-12 13:57:33 +08:00 |
|
zyy
|
68e63ee5ef
|
调整地图绘制报错
|
2020-05-11 17:36:21 +08:00 |
|
zyy
|
72dd750cd8
|
调整大屏显示
|
2020-05-11 16:01:21 +08:00 |
|
zyy
|
a65390f7d6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 15:29:37 +08:00 |
|
zyy
|
811ec26af1
|
调整大屏显示
|
2020-05-11 15:29:25 +08:00 |
|
fan
|
56ed2a4f8c
|
调整更新坐标&联锁配置项
|
2020-05-11 14:45:07 +08:00 |
|
fan
|
115f1da928
|
批量生成区段逻辑始终端偏移量
|
2020-05-11 13:25:09 +08:00 |
|
joylink_zyy
|
942510398a
|
调整西安三号线导入
|
2020-05-10 22:36:31 +08:00 |
|
joylink_zyy
|
da08f98218
|
增加西安三号线皮肤
|
2020-05-10 22:27:35 +08:00 |
|
joylink_zyy
|
76eeb29014
|
增加西安三号线文件
|
2020-05-10 22:20:24 +08:00 |
|
joylink_zyy
|
5e142ae5b3
|
调整路径
|
2020-05-10 21:42:27 +08:00 |
|
joylink_zyy
|
9c2a65dda6
|
调整区段创建判断
|
2020-05-10 21:17:17 +08:00 |
|
joylink_zyy
|
15b7996cb6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-10 20:43:43 +08:00 |
|
joylink_zyy
|
c65edfc06d
|
调整区段绘图逻辑
|
2020-05-10 20:43:37 +08:00 |
|
joylink_fanyuhong
|
14fa56f768
|
列车调整
|
2020-05-10 17:04:49 +08:00 |
|
joylink_fanyuhong
|
292d6d1327
|
列车调整
|
2020-05-10 16:51:28 +08:00 |
|
joylink_fanyuhong
|
b732a00eb0
|
列车删除日志
|
2020-05-10 16:03:45 +08:00 |
|
joylink_fanyuhong
|
bf3af7cd65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-10 16:01:05 +08:00 |
|
joylink_fanyuhong
|
a64373e9b7
|
列车调整
|
2020-05-10 16:00:55 +08:00 |
|
joylink_zyy
|
fa70eb85ca
|
注释iscs事件
|
2020-05-10 15:58:08 +08:00 |
|
zyy
|
d90996da48
|
调整大屏系统行数放到配置
|
2020-05-09 18:48:08 +08:00 |
|
zyy
|
8e81a00847
|
调整区段绘图方式
|
2020-05-09 17:27:28 +08:00 |
|
zyy
|
bb7556a876
|
调整宁波线路操作失败提示
|
2020-05-09 14:16:09 +08:00 |
|
fan
|
84e212c48b
|
站台站台轨位置校验&站台属性是否显示不生效修改&站台中站台轨属性不可修改&tab页懒加载导致的数据未展示问题调整
|
2020-05-08 18:52:46 +08:00 |
|
zyy
|
1e7e17c709
|
调整西安一号线行调右键操作
|
2020-05-08 16:12:03 +08:00 |
|
zyy
|
85324dee05
|
调整西安一号线信号机操作
|
2020-05-07 16:14:39 +08:00 |
|
zyy
|
1c12b88d6d
|
调整大屏预览显示过滤
|
2020-05-07 13:35:25 +08:00 |
|
zyy
|
4b53a2a1c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 09:04:41 +08:00 |
|
zyy
|
ca4a4689fc
|
调整大屏偏移
|
2020-05-07 09:04:28 +08:00 |
|
joylink_cuiweidong
|
bc9cd67681
|
代码调整
|
2020-05-06 18:29:08 +08:00 |
|
fan
|
997b962851
|
大屏禁用拖拽
|
2020-05-06 17:18:06 +08:00 |
|
fan
|
15d88d2f7f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 16:57:18 +08:00 |
|
fan
|
22fffd340f
|
大屏测试
|
2020-05-06 16:57:07 +08:00 |
|
zyy
|
515880d1c9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 13:11:52 +08:00 |
|
zyy
|
adf2627fec
|
调整西安二号线鼠标移入
|
2020-05-06 13:11:37 +08:00 |
|
fan
|
6eb648199e
|
西安二信号机操作问题修改
|
2020-04-30 18:25:21 +08:00 |
|
fan
|
276620a25e
|
西安二信号机调整
|
2020-04-30 17:40:25 +08:00 |
|
fan
|
15104970bc
|
西安二信号机调整&线路配置添加参数
|
2020-04-30 16:19:33 +08:00 |
|
fan
|
4797aa046f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 13:19:46 +08:00 |
|
fan
|
e348262118
|
西安二号线信号机操作调整
|
2020-04-30 13:19:33 +08:00 |
|
zyy
|
eb6cd7ce2d
|
调整道岔使能发送流程，及绘图
|
2020-04-30 11:28:56 +08:00 |
|
zyy
|
a3213c49f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 10:32:27 +08:00 |
|
zyy
|
18334b2f43
|
调整弹窗名称，右键菜单操作
|
2020-04-30 10:32:14 +08:00 |
|
fan
|
f3ab2337e8
|
西安二号线信号封锁调整（未完）
|
2020-04-30 08:54:17 +08:00 |
|
fan
|
35d13ae529
|
区段绘图数据调整roadType不为''
|
2020-04-29 17:53:35 +08:00 |
|
fan
|
1c8929cb08
|
绘图区段添加firstTurnBack&线路配置添加generateCycle&西安二操作调整
|
2020-04-29 17:25:30 +08:00 |
|
fan
|
ec7be523ba
|
西安二信号机操作调整
|
2020-04-29 15:24:17 +08:00 |
|
fan
|
7e790a3bdb
|
鼠标样式调整
|
2020-04-29 14:05:50 +08:00 |
|
fan
|
d65c5c2922
|
合并代码
|
2020-04-29 13:00:41 +08:00 |
|
fan
|
7d3a6ddafa
|
西安二号线信号机操作调整
|
2020-04-29 11:36:16 +08:00 |
|
zyy
|
c9e3920461
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-29 11:23:08 +08:00 |
|
zyy
|
be9b8f8432
|
调整右键操作
|
2020-04-29 11:22:54 +08:00 |
|
joylink_cuiweidong
|
70c26426b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 18:16:24 +08:00 |
|
joylink_cuiweidong
|
66cdf061c6
|
新版地图 绘图代码调整
|
2020-04-28 18:16:04 +08:00 |
|
fan
|
ce8d6244f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 16:17:55 +08:00 |
|
fan
|
1457492257
|
西安二操作调整
|
2020-04-28 16:17:42 +08:00 |
|
joylink_cuiweidong
|
493529d9bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 15:59:58 +08:00 |
|
joylink_cuiweidong
|
fe9251120c
|
西安二号线 列车右键菜单 代码调整
|
2020-04-28 15:59:44 +08:00 |
|
zyy
|
4a1c36bfd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_02/menus/menuSignal.vue
|
2020-04-28 15:44:35 +08:00 |
|
zyy
|
96bf9c7f7d
|
调整右键菜单
|
2020-04-28 15:43:19 +08:00 |
|
joylink_cuiweidong
|
5c8d9cce44
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 14:56:16 +08:00 |
|
joylink_cuiweidong
|
1ee3ea61c7
|
西安二号线 操作 背景样式调整
|
2020-04-28 14:55:57 +08:00 |
|
zyy
|
7fa5a12e8c
|
调整设置app/height 执行顺序问题
|
2020-04-28 14:49:42 +08:00 |
|
fan
|
af5567d598
|
西安二操作问题调整
|
2020-04-28 10:27:07 +08:00 |
|
fan
|
5d2fff66a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-27 19:02:20 +08:00 |
|
fan
|
e39a7eadb9
|
西安二号线操作调整&&绘图数据调整
|
2020-04-27 19:02:07 +08:00 |
|
zyy
|
9ea5cefdc0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_02/menus/index.vue
|
2020-04-27 18:35:44 +08:00 |
|
zyy
|
9427cc5759
|
调整西安二号线右键菜单显示
|
2020-04-27 18:33:29 +08:00 |
|
fan
|
fa60706b66
|
西安二号线操作调整
|
2020-04-27 14:01:23 +08:00 |
|
fan
|
e748a8113c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 18:49:30 +08:00 |
|
fan
|
4378cc56cb
|
西安二号线站台操作调整
|
2020-04-26 18:49:20 +08:00 |
|
zyy
|
479df7c2b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 18:38:47 +08:00 |
|
zyy
|
cc6c7f92ec
|
调整西安二号线右键样式
|
2020-04-26 18:38:27 +08:00 |
|
fan
|
a1d0c3e7d0
|
西安二号线绘图调整
|
2020-04-26 17:16:20 +08:00 |
|
fan
|
f1fac79770
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 16:24:49 +08:00 |
|
fan
|
695ea67e27
|
西安二号线绘图调整&西安二号线站台操作调整&派班计划冲突显示调整
|
2020-04-26 16:24:34 +08:00 |
|
zyy
|
745f867cb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue
|
2020-04-26 14:48:48 +08:00 |
|
zyy
|
ecd361ddbe
|
调整西安二号线车站操作
|
2020-04-26 14:47:43 +08:00 |
|
joylink_cuiweidong
|
7d5605d170
|
西安二号线 绘图 站台添加模式筛选标识
|
2020-04-24 18:23:17 +08:00 |
|
fan
|
b40c497361
|
发布地图管理调整&西安二号线站台操作调整
|
2020-04-24 10:39:26 +08:00 |
|
fan
|
26f59a4e4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 18:36:47 +08:00 |
|
fan
|
9c07e3968d
|
代码调整
|
2020-04-23 18:35:27 +08:00 |
|
zyy
|
98ce2d5890
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 17:12:06 +08:00 |
|
zyy
|
4d288556b0
|
调整绘图界面，调整实训平台鼠标隐藏bug
|
2020-04-23 17:11:51 +08:00 |
|
fan
|
747c56cac1
|
西安二运行图显示name不包含方向
|
2020-04-23 15:43:47 +08:00 |
|
fan
|
9dcb650a48
|
西安二运行图导入
|
2020-04-23 14:17:43 +08:00 |
|
fan
|
880e837285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 13:37:59 +08:00 |
|
fan
|
5f526a4497
|
西安二号线运行图导入调整
|
2020-04-23 13:36:34 +08:00 |
|
zyy
|
56f713a02b
|
调整报错提示信息
|
2020-04-23 10:29:41 +08:00 |
|
zyy
|
0e166416ba
|
调整catch 监听
|
2020-04-23 10:06:46 +08:00 |
|
zyy
|
e5206c8589
|
调整西安一号线运行图导入
|
2020-04-23 09:37:46 +08:00 |
|
zyy
|
d2eee7fca8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 18:37:23 +08:00 |
|
zyy
|
8882f716e4
|
调整运行图导入
|
2020-04-22 18:37:09 +08:00 |
|
fan
|
06b9fda264
|
西安一三按计划折返
|
2020-04-22 18:24:28 +08:00 |
|
fan
|
b898042b96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 17:13:37 +08:00 |
|
fan
|
8c122f93d4
|
运行图加载调整&绘图设备道岔故障&佛山区段颜色
|
2020-04-22 17:12:29 +08:00 |
|
zyy
|
967e77042b
|
调整西安一号线导入时间格式化
|
2020-04-22 17:08:11 +08:00 |
|
joylink_cuiweidong
|
9523f6e4cc
|
新版地图 绘图 公里标显示 代码调整
|
2020-04-22 16:17:35 +08:00 |
|
fan
|
e51824dc80
|
紧急停车位置调整&绘图站间分隔&车站批量调整
|
2020-04-22 14:30:37 +08:00 |
|
fan
|
05c857aeb6
|
西安二号线运行图导入过滤TBKE&TWQN
|
2020-04-22 09:07:58 +08:00 |
|
fan
|
5f4a211bf2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 18:45:05 +08:00 |
|
fan
|
0e1d3dc811
|
运行图加载调整
|
2020-04-21 18:43:54 +08:00 |
|
zyy
|
75c1cffa11
|
调整佛山线路行调下道岔操作
|
2020-04-21 17:53:46 +08:00 |
|
fan
|
f229bc9231
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 17:10:15 +08:00 |
|
fan
|
46113e89a7
|
运行图加载
|
2020-04-21 17:08:43 +08:00 |
|
fan
|
c8c7f8bded
|
佛山调整
|
2020-04-21 17:05:18 +08:00 |
|
zyy
|
4610882f5f
|
调整列车方向显示
|
2020-04-21 17:00:19 +08:00 |
|
fan
|
d60c2881d0
|
添加列车配置
|
2020-04-21 16:00:10 +08:00 |
|
fan
|
dcf7b951ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 15:15:03 +08:00 |
|
fan
|
2f4b765d97
|
运行图加载调整&交路数据调整
|
2020-04-21 15:08:27 +08:00 |
|
zyy
|
b31ef6bc2d
|
调整西安一 三号线运行图导入
|
2020-04-21 14:14:33 +08:00 |
|
fan
|
7c55c19933
|
交路区段区别显示&故障状态组调整
|
2020-04-20 17:10:50 +08:00 |
|
zyy
|
85189c240f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 15:12:14 +08:00 |
|
zyy
|
a49a3bfaaf
|
调整西安二号线数据及皮肤配置
|
2020-04-20 15:12:01 +08:00 |
|
joylink_cuiweidong
|
074f6d647a
|
西安二号线站台 紧急停车状态 绘图调整
|
2020-04-20 10:12:17 +08:00 |
|
joylink_cuiweidong
|
3a0fd87a79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 18:43:16 +08:00 |
|
joylink_cuiweidong
|
de0b7ae931
|
西安二号线 绘图紧急停车状态代码调整
|
2020-04-17 18:42:58 +08:00 |
|
zyy
|
4fe805e02f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:42:12 +08:00 |
|
zyy
|
f0610f8a0a
|
调整代码，处理线路皮肤默认配置
|
2020-04-17 16:41:59 +08:00 |
|
joylink_cuiweidong
|
70a8ec07f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:39:55 +08:00 |
|
joylink_cuiweidong
|
211db36aca
|
西安二号线绘图 站台 扣车 代码调整
|
2020-04-17 16:39:42 +08:00 |
|
fan
|
c13624b60a
|
西安二号线调整
|
2020-04-17 15:59:50 +08:00 |
|
fan
|
2100144656
|
西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整
|
2020-04-17 15:02:35 +08:00 |
|
fan
|
07711a5bda
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:32:18 +08:00 |
|
fan
|
a4097e1f32
|
西安二号线调整
|
2020-04-17 13:30:59 +08:00 |
|
joylink_cuiweidong
|
467e8671fd
|
西安二号线屏蔽门绘图调整
|
2020-04-17 13:30:18 +08:00 |
|
fan
|
c268ee7d3c
|
项目获取房间列表添加项目code参数
|
2020-04-17 09:56:41 +08:00 |
|
fan
|
46d95bf715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:30:07 +08:00 |
|
joylink_cuiweidong
|
5fe37ec4e2
|
北京一号线 区段实训操作代码调整
|
2020-04-16 17:26:07 +08:00 |
|
fan
|
de84df1cf2
|
菜单操作切换
|
2020-04-16 17:26:01 +08:00 |
|
joylink_cuiweidong
|
1c7a0461fe
|
北京一号线 站台实训操作代码调整
|
2020-04-16 15:50:04 +08:00 |
|
joylink_cuiweidong
|
e88bdf8e0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 14:51:52 +08:00 |
|
joylink_cuiweidong
|
fc2d9c1ff7
|
草稿地图的导入和导出代码调整
北京一号线站台实训操作代码调整
|
2020-04-16 14:50:40 +08:00 |
|
fan
|
1bfe76c291
|
添加西安地铁页面&&项目配置规整（未完）
|
2020-04-16 13:47:40 +08:00 |
|
fan
|
aae2a734ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 09:03:22 +08:00 |
|
fan
|
8e5a79626a
|
西安二号线调整
|
2020-04-16 09:01:52 +08:00 |
|
joylink_cuiweidong
|
fec4e33719
|
实训平台和设计平台 地图列表代码调整
|
2020-04-15 15:06:51 +08:00 |
|
zyy
|
6826089595
|
调整新版地图字段显示
|
2020-04-15 14:27:39 +08:00 |
|
zyy
|
83f63b5c70
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 14:19:37 +08:00 |
|
zyy
|
0091a593e5
|
调整福州线路顶部栏显示名称字段
|
2020-04-15 14:19:22 +08:00 |
|
fan
|
8cd740402f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 14:14:32 +08:00 |
|
fan
|
a1869a531f
|
集中站分隔调整&线路管理配置调整
|
2020-04-15 14:13:08 +08:00 |
|
joylink_cuiweidong
|
9ddafdedf5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 13:07:34 +08:00 |
|
joylink_cuiweidong
|
47e2ca8d76
|
北京一号线 地图配置文件调整
|
2020-04-15 13:06:58 +08:00 |
|
zyy
|
c2f8eeb250
|
调整佛山线路站台方向显示
|
2020-04-15 13:06:32 +08:00 |
|
zyy
|
25272e4fdd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 11:17:33 +08:00 |
|
zyy
|
6cb2939631
|
调整西安二号线道岔状态显示
|
2020-04-15 11:17:19 +08:00 |
|
joylink_cuiweidong
|
2a50ce7287
|
设计平台 加载计划运行图管理 创建通用运行图 地图过滤
|
2020-04-15 10:34:33 +08:00 |
|
zyy
|
87ca3e5556
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/deviceStyle.js
# src/jmapNew/theme/factory.js
|
2020-04-15 10:08:47 +08:00 |
|
zyy
|
7ea8fd7add
|
调整佛山线路全线取消扣车操作， 增加西安二号线皮肤
|
2020-04-15 10:06:26 +08:00 |
|
fan
|
8a7de3c22c
|
佛山皮肤调整
|
2020-04-15 09:44:44 +08:00 |
|
fan
|
e9ee5112d4
|
佛山皮肤调整
|
2020-04-15 09:33:21 +08:00 |
|
fan
|
b833ac1acd
|
佛山皮肤调整
|
2020-04-15 09:19:47 +08:00 |
|
fan
|
09f3c4b969
|
调整西安二号线配置
|
2020-04-15 09:07:23 +08:00 |
|
fan
|
2613b68413
|
佛山列车显示调整&西安二号线集中站分割符
|
2020-04-14 18:51:09 +08:00 |
|
fan
|
61c2260d93
|
西安二号线调整
|
2020-04-14 15:45:13 +08:00 |
|
fan
|
c8a500c5dd
|
佛山运行图添加目的地码
|
2020-04-14 11:34:13 +08:00 |
|
zyy
|
cc984c8eb0
|
调整佛山线路，成都一号线运行图 方向信息
|
2020-04-14 10:27:33 +08:00 |
|
zyy
|
feca56f94b
|
调整字段名称显示，调整佛山线路标注字段
|
2020-04-14 09:48:54 +08:00 |
|
joylink_cuiweidong
|
7f7318814c
|
北京一号线 现地 取消进路 信号重开步骤代码调整
|
2020-04-13 18:43:50 +08:00 |
|
fan
|
319d458ca0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 18:31:38 +08:00 |
|
fan
|
b7e6b9a8c1
|
佛山运行图导入上行时间调整&西安二号线车站调整
|
2020-04-13 18:30:21 +08:00 |
|
joylink_cuiweidong
|
be187cf1b3
|
北京一号线 操作定义 代码调整
|
2020-04-13 17:57:10 +08:00 |
|
fan
|
20491dac81
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:13:52 +08:00 |
|
fan
|
f91c8e37d2
|
佛山运行图导入参数调整&西安二号线车站调整
|
2020-04-13 17:12:33 +08:00 |
|
zyy
|
2dc975ef7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:04:01 +08:00 |
|
zyy
|
df92090509
|
增加配置中侧防数据，调整接口
|
2020-04-13 17:03:48 +08:00 |
|
joylink_cuiweidong
|
db93886f7e
|
哈尔滨线路 实训操作代码调整
|
2020-04-13 16:29:39 +08:00 |
|
joylink_cuiweidong
|
8475870cf8
|
哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整
|
2020-04-13 14:54:35 +08:00 |
|
joylink_cuiweidong
|
ccf028e5bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 13:08:30 +08:00 |
|
joylink_cuiweidong
|
e083015580
|
西安二号线 屏蔽门和站台的状态代码调整
|
2020-04-13 13:08:17 +08:00 |
|
fan
|
472dd1b62a
|
佛山运行图导入校验调整&西安二号线车站调整
|
2020-04-13 10:43:02 +08:00 |
|
joylink_cuiweidong
|
98c6736c17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 19:14:36 +08:00 |
|
joylink_cuiweidong
|
43c7f2c094
|
哈尔滨一号线 现地 自排开关 信号重开 信号关灯操作处理
|
2020-04-10 18:59:50 +08:00 |
|
fan
|
08d02e9563
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 17:51:36 +08:00 |
|
fan
|
b0797644f9
|
实训课程编辑调整&线二号线调整
|
2020-04-10 17:50:26 +08:00 |
|
zyy
|
2d70c294f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 17:24:12 +08:00 |
|
zyy
|
3bfb74d55b
|
调整绘图隐藏元素
|
2020-04-10 17:23:53 +08:00 |
|
fan
|
26e9c33736
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:47:20 +08:00 |
|
fan
|
11586aef30
|
哈尔滨现地显示BUG调整&西安二号线皮肤调整
|
2020-04-10 16:45:41 +08:00 |
|
joylink_cuiweidong
|
22d587a7a8
|
哈尔滨 行调 道岔操作 实训操作定义修改
|
2020-04-10 16:44:07 +08:00 |
|
joylink_cuiweidong
|
4be8b2dd87
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 15:22:08 +08:00 |
|
joylink_cuiweidong
|
0133b3b5d9
|
代码调整
|
2020-04-10 15:21:46 +08:00 |
|
fan
|
165bde34ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 14:08:26 +08:00 |
|
fan
|
bb69f81e99
|
哈尔滨指令调整
|
2020-04-10 14:07:05 +08:00 |
|
joylink_cuiweidong
|
f0a4491cb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 14:05:37 +08:00 |
|
joylink_cuiweidong
|
e05057bf3f
|
宁波一号线 自动折返代码调整
|
2020-04-10 14:05:20 +08:00 |
|
fan
|
c294e00d46
|
实训定义调整
|
2020-04-10 13:26:37 +08:00 |
|
joylink_cuiweidong
|
9e45a0d342
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 10:42:19 +08:00 |
|
joylink_cuiweidong
|
888ae6e936
|
宁波一号线 自动折返按钮实训操作代码调整
|
2020-04-10 10:41:41 +08:00 |
|
fan
|
162bd4c9f2
|
宁波一号线:实训问题调整
|
2020-04-10 10:16:58 +08:00 |
|
fan
|
e6ad580824
|
宁波一号线： 查看站台信息=》站台详细信息，道岔单解/解封
|
2020-04-10 09:24:21 +08:00 |
|
joylink_cuiweidong
|
4e9ccad9e5
|
代码调整
|
2020-04-09 18:51:51 +08:00 |
|
fan
|
991fa86ede
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 18:23:35 +08:00 |
|
fan
|
7e0834b13a
|
代码哈尔滨实训数据&本地导入导出
|
2020-04-09 18:22:10 +08:00 |
|
zyy
|
ced7cb91b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 17:37:41 +08:00 |
|
zyy
|
289f1dbff0
|
调整现地列车显示
|
2020-04-09 17:37:27 +08:00 |
|
joylink_cuiweidong
|
1897a79a72
|
西安二号线 屏蔽门绘图代码调整
|
2020-04-09 17:27:10 +08:00 |
|
zyy
|
da62178c72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 17:03:35 +08:00 |
|
zyy
|
8026e14da8
|
调整道岔重置，调整宁波定义
|
2020-04-09 17:03:22 +08:00 |
|
joylink_cuiweidong
|
45e6a12825
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 16:32:15 +08:00 |
|
joylink_cuiweidong
|
5a8f4e0fe6
|
西安二号线 屏蔽门绘图代码调整
|
2020-04-09 16:31:53 +08:00 |
|
zyy
|
184ff9d1e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 15:21:57 +08:00 |
|
zyy
|
ee10377b04
|
调整区段字段显示逻辑，道岔计轴区段显示道岔菜单
|
2020-04-09 15:21:44 +08:00 |
|
fan
|
bcb9251f9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 14:51:25 +08:00 |
|
fan
|
f2ba430cc5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 14:49:06 +08:00 |
|
joylink_cuiweidong
|
52e26e4d30
|
宁波一号线 查询进路状态步骤操作调整
|
2020-04-09 14:48:25 +08:00 |
|
fan
|
50579656eb
|
进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理（未完）
|
2020-04-09 14:47:44 +08:00 |
|
joylink_cuiweidong
|
4f416e355d
|
宁波一号线现地 请求站控代码调整
|
2020-04-09 14:37:37 +08:00 |
|
joylink_cuiweidong
|
1f4d8ae061
|
西安二号线 站台绘图调整
|
2020-04-09 13:01:48 +08:00 |
|
zyy
|
78995be06f
|
调整右键点击道岔区段获取道岔菜单列表
|
2020-04-09 09:39:14 +08:00 |
|
fan
|
9ea9d56309
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 18:39:31 +08:00 |
|
fan
|
630ccfd016
|
信号机调整
|
2020-04-08 18:38:08 +08:00 |
|
joylink_cuiweidong
|
c736edf9cc
|
代码调整
|
2020-04-08 16:45:51 +08:00 |
|
joylink_cuiweidong
|
132f7bad3c
|
代码调整
|
2020-04-08 16:27:55 +08:00 |
|
joylink_cuiweidong
|
78a8581152
|
宁波一号线 实训请求站控 操作调整
|
2020-04-08 16:24:44 +08:00 |
|
fan
|
2e1b356da9
|
调整区段限速判断
|
2020-04-08 16:21:08 +08:00 |
|
joylink_cuiweidong
|
dd2d572409
|
道岔的 确认计轴有效的指令参数修改
|
2020-04-08 15:43:09 +08:00 |
|
joylink_cuiweidong
|
9c4c447dee
|
宁波一号线操作代码调整
|
2020-04-08 15:37:05 +08:00 |
|
joylink_cuiweidong
|
053648e0a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 15:29:16 +08:00 |
|
joylink_cuiweidong
|
4c2ef28572
|
西安二号线 线路配置文件调整
|
2020-04-08 15:29:03 +08:00 |
|
joylink_cuiweidong
|
1554803dd4
|
代码调整
|
2020-04-08 15:27:55 +08:00 |
|
zyy
|
85eef4b8f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 14:14:04 +08:00 |
|
zyy
|
425b7d3869
|
Merge branch 'master' into test
|
2020-04-08 14:12:58 +08:00 |
|
fan
|
f495a2d560
|
实训占位符调整&皮肤调整
|
2020-04-08 14:06:45 +08:00 |
|
fan
|
013360534b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 13:29:30 +08:00 |
|
fan
|
507e28adde
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 13:25:45 +08:00 |
|
joylink_cuiweidong
|
23aa213778
|
指令字典参数调整
|
2020-04-08 13:25:10 +08:00 |
|
fan
|
b089aa6651
|
实训占位符调整&皮肤调整
|
2020-04-08 13:23:19 +08:00 |
|
joylink_cuiweidong
|
08a3480dad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/scripts/OperationConfig.js
|
2020-04-08 13:10:31 +08:00 |
|
joylink_cuiweidong
|
613a88ca90
|
实训操作步骤文件拆分
|
2020-04-08 11:26:55 +08:00 |
|
fan
|
d82b89b57e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 18:32:00 +08:00 |
|
fan
|
a1c4a901af
|
实训步骤生成
|
2020-04-07 18:30:46 +08:00 |
|
zyy
|
635b593b56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 18:23:48 +08:00 |
|
zyy
|
f12f84f97b
|
调整实训一键生成，调整宁波线路实训定义
|
2020-04-07 18:22:26 +08:00 |
|
joylink_cuiweidong
|
778d74ecd5
|
北京一号线现地 道岔 站台实训操作步骤代码调整
|
2020-04-07 17:19:28 +08:00 |
|
zyy
|
f26eea8f4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 16:19:34 +08:00 |
|
zyy
|
402a383bf6
|
删除多余打印，调整名称
|
2020-04-07 16:19:24 +08:00 |
|
joylink_cuiweidong
|
2853eb04fd
|
宁波线路实训操作代码调整
|
2020-04-07 15:25:33 +08:00 |
|
fan
|
87ddad535b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 14:41:38 +08:00 |
|
fan
|
6667adca07
|
实训调整
|
2020-04-07 14:40:24 +08:00 |
|
zyy
|
1f6b627768
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 13:38:28 +08:00 |
|
zyy
|
aa06844b18
|
地图绘制信号机增加偏移量字段
|
2020-04-07 13:37:17 +08:00 |
|
fan
|
6498f68295
|
宁波实训调整
|
2020-04-07 13:09:34 +08:00 |
|
zyy
|
d3f28ff338
|
Merge branch 'test'
|
2020-04-03 18:34:04 +08:00 |
|
fan
|
75bb1f315e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 18:32:49 +08:00 |
|
fan
|
64401f7085
|
宁波设置通过模式时为止偏移
|
2020-04-03 18:31:38 +08:00 |
|
zyy
|
0a6f32d6b2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 18:09:23 +08:00 |
|
zyy
|
da896de45b
|
调整进路流程，定义
|
2020-04-03 18:09:07 +08:00 |
|
fan
|
1e19840405
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 17:45:44 +08:00 |
|
fan
|
5f7804f090
|
佛山运行图导入
|
2020-04-03 17:44:17 +08:00 |
|
fan
|
255ab83233
|
佛山运行图导入
|
2020-04-03 17:40:18 +08:00 |
|
joylink_cuiweidong
|
bab89c4bae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 14:44:08 +08:00 |
|
joylink_cuiweidong
|
f323651087
|
北京一号线现地行调操作步骤调整
|
2020-04-03 14:43:54 +08:00 |
|
fan
|
19900d9816
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-03 13:36:59 +08:00 |
|
zyy
|
6fd9276fe8
|
调整实训步骤，及地图加载状态
|
2020-04-03 13:30:04 +08:00 |
|
fan
|
62131c2166
|
成都三实训调整
|
2020-04-03 13:08:06 +08:00 |
|
joylink_cuiweidong
|
e5067edcce
|
北京一号线区段操作步骤代码调整
|
2020-04-02 18:57:04 +08:00 |
|
fan
|
97eca75407
|
哈尔滨实训
|
2020-04-02 17:51:59 +08:00 |
|
joylink_cuiweidong
|
e273b1be18
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 16:16:56 +08:00 |
|
joylink_cuiweidong
|
5874d8f665
|
北京一号线操作步骤调整
|
2020-04-02 16:16:45 +08:00 |
|
zyy
|
8fdd0d27bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/scripts/cmdPlugin/ValidateHandler.js
|
2020-04-02 15:01:18 +08:00 |
|
zyy
|
dd26f5fd96
|
调整宁波一号线实训步骤定义
|
2020-04-02 15:00:28 +08:00 |
|
fan
|
75df1f7d2d
|
宁波考试&教学添加切换集中站
|
2020-04-02 14:46:21 +08:00 |
|
zyy
|
747595e8e8
|
Merge branch 'test'
|
2020-04-02 11:25:57 +08:00 |
|
fan
|
4bce310d4f
|
福州皮肤调整
|
2020-04-02 11:10:27 +08:00 |
|
zyy
|
1599b82719
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 10:52:17 +08:00 |
|
zyy
|
8117a31c80
|
调整代码
|
2020-04-02 10:51:47 +08:00 |
|
fan
|
ef08c5085e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 09:50:30 +08:00 |
|
fan
|
1017058855
|
站台状态显示位置调整
|
2020-04-02 09:48:55 +08:00 |
|
zyy
|
a17a02519d
|
调整宁波线路实训生成
|
2020-04-02 09:07:50 +08:00 |
|
fan
|
9d02306fda
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section/index.vue
|
2020-04-01 18:00:58 +08:00 |
|
zyy
|
c7f7f0bc6f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 15:45:31 +08:00 |
|
zyy
|
02583b96e4
|
调整代码
|
2020-04-01 15:44:54 +08:00 |
|
fan
|
ebd90d2485
|
本地项目调整&elementUI升版本至2.12.0
|
2020-04-01 15:32:06 +08:00 |
|
fan
|
848875bd57
|
关闭gzip
|
2020-04-01 14:39:29 +08:00 |
|
fan
|
b1a80173b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 14:30:39 +08:00 |
|
fan
|
e344e63469
|
宁波停站时间调整
|
2020-04-01 14:30:11 +08:00 |
|
joylink_cuiweidong
|
5d10d40ea3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 14:15:09 +08:00 |
|
joylink_cuiweidong
|
f64c7d5317
|
代码调整
|
2020-04-01 14:14:55 +08:00 |
|
fan
|
fe8caec435
|
列车方向箭头调整
|
2020-04-01 14:01:31 +08:00 |
|
fan
|
2a59c51b00
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 13:49:18 +08:00 |
|
fan
|
225a739f60
|
打包本地项目不进行cdn加载
|
2020-04-01 13:47:29 +08:00 |
|
joylink_cuiweidong
|
995460afdf
|
仿真界面添加列车详情
|
2020-04-01 12:53:58 +08:00 |
|
joylink_cuiweidong
|
955ddacbe0
|
Merge branch 'dev' into test
|
2020-03-31 19:09:06 +08:00 |
|
joylink_cuiweidong
|
bc6940f80b
|
仿真界面添加列车详情(未完成)
|
2020-03-31 19:06:23 +08:00 |
|
zyy
|
4ef3c69f9f
|
调整显示内容 判断
|
2020-03-31 15:34:55 +08:00 |
|
zyy
|
900489638c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 14:41:30 +08:00 |
|
zyy
|
1873898adc
|
调整回车内容不修改
|
2020-03-31 14:41:17 +08:00 |
|
fan
|
9a57ab9aa3
|
哈尔滨调整
|
2020-03-31 10:45:04 +08:00 |
|
zyy
|
38ada8ccb2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:54:01 +08:00 |
|
zyy
|
919639ad03
|
调整哈尔滨现地操作步骤流程完善
|
2020-03-30 17:53:44 +08:00 |
|
joylink_cuiweidong
|
8c2f1cf729
|
新剧本 仿真类型切换代码调整
|
2020-03-30 17:39:00 +08:00 |
|
zyy
|
1e2a015955
|
调整区段实际长度逻辑
|
2020-03-30 17:07:51 +08:00 |
|
joylink_cuiweidong
|
68f77a25b6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 16:16:29 +08:00 |
|
joylink_cuiweidong
|
8f6f033870
|
剧本仿真切换仿真类型代码调整
|
2020-03-30 16:16:11 +08:00 |
|
zyy
|
af6eb5917f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 16:15:50 +08:00 |
|
zyy
|
0c56d049ec
|
调整哈尔滨现地实训操作步骤
|
2020-03-30 16:15:35 +08:00 |
|
fan
|
343b8fd55e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 15:28:28 +08:00 |
|
fan
|
779b958613
|
站台调整
|
2020-03-30 15:27:13 +08:00 |
|
joylink_cuiweidong
|
fba96dcaaa
|
佛山有轨线路 步骤操作代码调整
|
2020-03-30 14:34:19 +08:00 |
|
fan
|
643c12335c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_stand
# Conflicts:
# src/utils/baseUrl.js
|
2020-03-30 14:26:27 +08:00 |
|
fan
|
e82e77a507
|
站台调整
|
2020-03-30 14:22:57 +08:00 |
|
joylink_cuiweidong
|
fa3400790b
|
宁波一号线步骤操作代码调整
|
2020-03-30 14:18:07 +08:00 |
|
joylink_cuiweidong
|
3a383793f8
|
北京一号线 步骤操作代码调整
|
2020-03-30 13:33:53 +08:00 |
|
joylink_cuiweidong
|
17c26e26a2
|
佛山一号线 宁波一号线 步骤操作代码调整
|
2020-03-30 11:27:34 +08:00 |
|
joylink_cuiweidong
|
08dc9befc4
|
北京一号线 宁波一号线 步骤操作调整
|
2020-03-30 11:03:35 +08:00 |
|
zyy
|
72f121b7a5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 10:28:22 +08:00 |
|
zyy
|
0321340863
|
调整步骤运行数据
|
2020-03-30 10:28:08 +08:00 |
|
fan
|
8f69177fe1
|
暂存
|
2020-03-30 09:47:26 +08:00 |
|
joylink_cuiweidong
|
1a998f405a
|
佛山一号线 操作代码调整
|
2020-03-30 09:45:23 +08:00 |
|
joylink_cuiweidong
|
60f1149a27
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 18:46:04 +08:00 |
|
joylink_cuiweidong
|
f51bad9c3a
|
代码调整
|
2020-03-27 18:45:48 +08:00 |
|
zyy
|
c5dbd2b141
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/utils/baseUrl.js
|
2020-03-27 18:20:28 +08:00 |
|
zyy
|
47519b7040
|
调整道岔生成默认状态，调整道岔皮肤配置
|
2020-03-27 18:19:40 +08:00 |
|
fan
|
a8d9aa001c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 18:15:02 +08:00 |
|
fan
|
6ef1fc2013
|
实训调整
|
2020-03-27 18:14:46 +08:00 |
|
joylink_cuiweidong
|
93dc9a6983
|
新版剧本编制接口调整
|
2020-03-27 17:29:01 +08:00 |
|
fan
|
c30eae5b1e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 17:26:39 +08:00 |
|
fan
|
19b945962b
|
站台调整
|
2020-03-27 17:26:17 +08:00 |
|
zyy
|
7380953642
|
增加宁波线路实训操作
|
2020-03-27 13:45:36 +08:00 |
|
fan
|
5c7394454d
|
调整
|
2020-03-27 11:35:46 +08:00 |
|
fan
|
723f8ff3e8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 10:18:58 +08:00 |
|
fan
|
1adc50b2d1
|
站台调整
|
2020-03-27 10:17:24 +08:00 |
|
zyy
|
d92813ed72
|
调整道岔定位绘图
|
2020-03-27 10:02:41 +08:00 |
|
fan
|
ead5bd01e6
|
站台调整
|
2020-03-26 15:04:52 +08:00 |
|
fan
|
8a90e2389b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-26 10:42:20 +08:00 |
|
joylink_cuiweidong
|
9a9716e5a9
|
佛山有轨电车操作代码调整
|
2020-03-26 09:56:46 +08:00 |
|
fan
|
aadbe543a5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-26 09:44:27 +08:00 |
|
joylink_cuiweidong
|
8c01b4129f
|
列车绘图代码调整
|
2020-03-25 18:34:43 +08:00 |
|
zyy
|
a2875baa19
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 18:26:30 +08:00 |
|
zyy
|
41100ac9bf
|
调整宁波线路 道岔 封锁 单锁状态
|
2020-03-25 18:26:19 +08:00 |
|
fan
|
5bcb42e0f2
|
宁波调整
|
2020-03-25 17:32:57 +08:00 |
|
joylink_cuiweidong
|
ad4de2cd45
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 17:16:16 +08:00 |
|
joylink_cuiweidong
|
ef33f0f628
|
宁波一号线 增加列车移入显示边框
|
2020-03-25 17:15:16 +08:00 |
|
fan
|
1210496ecb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 15:24:08 +08:00 |
|
fan
|
9d38968751
|
佛山样式调整&&宁波显示调整
|
2020-03-25 15:22:52 +08:00 |
|
joylink_cuiweidong
|
81b2e420d8
|
宁波线
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
|
2020-03-25 15:19:39 +08:00 |
|
joylink_cuiweidong
|
d3b4c090a9
|
佛山有轨电车 现地操作调整
|
2020-03-25 13:20:31 +08:00 |
|
joylink_cuiweidong
|
7604e276e1
|
宁波一号线 列车样式调整
|
2020-03-25 10:43:32 +08:00 |
|
joylink_cuiweidong
|
c31c09e88b
|
佛山有轨电车 现地操作调整
|
2020-03-24 18:18:01 +08:00 |
|
joylink_cuiweidong
|
089b8960b9
|
佛山线路现地界面调整
|
2020-03-24 18:01:10 +08:00 |
|
fan
|
a0b9974040
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 16:51:16 +08:00 |
|
fan
|
70b75e354c
|
状态灯调整
|
2020-03-24 16:50:09 +08:00 |
|
joylink_cuiweidong
|
fabd5f1025
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 16:40:37 +08:00 |
|
joylink_cuiweidong
|
f83753102e
|
北京线宁波线操作代码调整
|
2020-03-24 16:40:17 +08:00 |
|
fan
|
652aa43a2a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 16:37:26 +08:00 |
|
fan
|
1e72a8cff3
|
状态灯调整
|
2020-03-24 16:35:09 +08:00 |
|
zyy
|
98158fdb86
|
删除默认状态
|
2020-03-24 15:10:31 +08:00 |
|
zyy
|
92adfa396a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 15:09:42 +08:00 |
|
zyy
|
a22ec53e39
|
调整佛山线路信号机，站台状态
|
2020-03-24 15:09:25 +08:00 |
|
fan
|
5c7c27d2f3
|
状态灯调整
|
2020-03-24 15:02:14 +08:00 |
|
joylink_cuiweidong
|
be03a9e623
|
宁波线操作代码调整
|
2020-03-24 14:43:58 +08:00 |
|
joylink_cuiweidong
|
21ac6c0ac4
|
北京一号线宁波一号线控制权转换代码调整
|
2020-03-24 13:43:30 +08:00 |
|
zyy
|
6abb83f838
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 13:39:35 +08:00 |
|
zyy
|
bd48b2844c
|
佛山线路道岔状态调整，修改道岔绘图元素逻辑
|
2020-03-24 13:39:20 +08:00 |
|
joylink_cuiweidong
|
22330bf756
|
宁波一号线自动折返操作代码调整
|
2020-03-24 11:09:10 +08:00 |
|
joylink_cuiweidong
|
4e38516efb
|
宁波一号线操作代码调整
|
2020-03-24 10:12:21 +08:00 |
|
joylink_cuiweidong
|
91e2c81c6f
|
佛山有轨电车 操作代码调整
|
2020-03-23 18:12:37 +08:00 |
|
joylink_cuiweidong
|
93fd139b6e
|
佛山有轨电车 信号机站台操作代码调整
|
2020-03-23 17:43:37 +08:00 |
|
joylink_cuiweidong
|
3d6f5a2537
|
佛山有轨电车 区段道岔操作代码调整
|
2020-03-23 17:25:18 +08:00 |
|
fan
|
d82a2cf297
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 16:01:45 +08:00 |
|
fan
|
2501a1a70a
|
综合演练问题调整
|
2020-03-23 16:00:28 +08:00 |
|
joylink_cuiweidong
|
0412a6b1a3
|
宁波一号线 站台信号机区段操作代码调整
|
2020-03-23 14:48:26 +08:00 |
|
zyy
|
a6543ca2b4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 14:28:11 +08:00 |
|
zyy
|
688aa7310b
|
增加佛山有轨线路文件，调整区段显示状态
|
2020-03-23 14:27:57 +08:00 |
|
fan
|
f574279afe
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 13:59:51 +08:00 |
|
zyy
|
72d27264f4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 13:48:56 +08:00 |
|
zyy
|
ad6b8f8dba
|
调整区段流程逻辑，站台流程
|
2020-03-23 13:48:35 +08:00 |
|
joylink_cuiweidong
|
fd302bbbdd
|
北京一号线控制权操作代码调整
|
2020-03-23 11:09:40 +08:00 |
|
fan
|
0e23e9f6a9
|
调整代码
|
2020-03-23 10:47:16 +08:00 |
|
joylink_cuiweidong
|
dd9080c0d0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 18:51:40 +08:00 |
|
joylink_cuiweidong
|
c3e48fe107
|
北京一号线控制权转换代码调整
|
2020-03-20 18:51:26 +08:00 |
|
zyy
|
9280651ed4
|
删除信号机多余元素
|
2020-03-20 18:14:42 +08:00 |
|
zyy
|
788737369a
|
调整哈尔滨线路 现地 行调 菜单高度
|
2020-03-20 17:56:20 +08:00 |
|
fan
|
cc6af4f056
|
综合演练调整
|
2020-03-20 17:36:07 +08:00 |
|
zyy
|
21c453f68d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 17:17:32 +08:00 |
|
zyy
|
7a15c07782
|
调整哈尔滨信号机状态
|
2020-03-20 17:17:23 +08:00 |
|
fan
|
1e8d304249
|
Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
# src/scripts/cmdPlugin/CommandEnum.js
# src/utils/baseUrl.js
|
2020-03-20 15:16:08 +08:00 |
|
fan
|
471fac0499
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 15:01:22 +08:00 |
|
fan
|
457b78bd7e
|
操作调整
|
2020-03-20 15:00:31 +08:00 |
|
joylink_cuiweidong
|
2c4848f4db
|
北京一号线指令操作调整
|
2020-03-20 14:48:22 +08:00 |
|
fan
|
80fda91dba
|
自动折返&引导总锁调整
|
2020-03-20 14:12:02 +08:00 |
|
joylink_cuiweidong
|
d50f096b0a
|
北京一号线站台操作代码调整
|
2020-03-20 13:30:57 +08:00 |
|
zyy
|
402d161e73
|
调整格式
|
2020-03-20 13:07:31 +08:00 |
|
joylink_cuiweidong
|
61d54b2209
|
北京一号线道岔操作代码调整
|
2020-03-20 11:23:46 +08:00 |
|
fan
|
cc21437843
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 11:09:16 +08:00 |
|
fan
|
404d867767
|
绘图&成三现地调整
|
2020-03-20 11:09:06 +08:00 |
|
joylink_cuiweidong
|
59f5336f8a
|
北京一号线信号机区段操作代码调整
|
2020-03-20 10:31:19 +08:00 |
|
fan
|
361f28c905
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 18:43:43 +08:00 |
|
fan
|
352215f142
|
代码调整
|
2020-03-19 18:43:31 +08:00 |
|
zyy
|
912f0f206f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 18:39:32 +08:00 |
|
zyy
|
2f654975d5
|
调整哈尔滨信号机状态
|
2020-03-19 18:39:20 +08:00 |
|
fan
|
85e7fea0ae
|
代码调整
|
2020-03-19 18:13:26 +08:00 |
|
zyy
|
67f0712eaa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 17:19:01 +08:00 |
|
zyy
|
f78d9e80fe
|
调整哈尔滨道岔现地操作
|
2020-03-19 17:18:46 +08:00 |
|
fan
|
5173c4e8d9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 17:11:46 +08:00 |
|
fan
|
5e2beb6d05
|
代码调整
|
2020-03-19 17:11:35 +08:00 |
|
joylink_cuiweidong
|
753534c42a
|
北京一号线区段操作代码封装
|
2020-03-19 17:04:53 +08:00 |
|
fan
|
7de2c38af4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 16:17:53 +08:00 |
|
fan
|
36b7d7309a
|
增加绘图表示灯&&线条颜色
|
2020-03-19 16:17:34 +08:00 |
|
zyy
|
056076c682
|
调整宁波线 引导办理 引导取消
|
2020-03-19 14:43:27 +08:00 |
|
zyy
|
1a20248a0d
|
调整区段逻辑
|
2020-03-19 14:09:50 +08:00 |
|
zyy
|
e4c2cf03b1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 14:04:11 +08:00 |
|
zyy
|
1d46deb12a
|
调整区段绘画逻辑
|
2020-03-19 14:03:54 +08:00 |
|
joylink_cuiweidong
|
65566a1438
|
添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
|
2020-03-19 13:06:48 +08:00 |
|
zyy
|
6570028b95
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 10:52:54 +08:00 |
|
zyy
|
6e3dcf6b65
|
调整哈尔滨线路 区段，信号机操作 处理信号机点击高亮
|
2020-03-19 10:52:42 +08:00 |
|
joylink_cuiweidong
|
e1b411965b
|
北京一号线操作代码调整
|
2020-03-19 10:49:21 +08:00 |
|
fan
|
ad858543d8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 10:23:43 +08:00 |
|
fan
|
acc05f770e
|
调整进路状态影响自动进路功能按钮
|
2020-03-19 10:23:24 +08:00 |
|
joylink_cuiweidong
|
85e587f844
|
北京一号线操作代码调整
|
2020-03-19 10:02:25 +08:00 |
|
fan
|
8ba124ab6f
|
参数调整
|
2020-03-19 09:25:51 +08:00 |
|
fan
|
aa7b0071ca
|
现地操作调整
|
2020-03-19 09:12:46 +08:00 |
|
zyy
|
4243d62ab1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 19:08:12 +08:00 |
|
zyy
|
2ffdf1de32
|
调整代码
|
2020-03-18 19:07:58 +08:00 |
|
fan
|
838f2311f8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 19:05:12 +08:00 |
|
fan
|
a9c19cf1ea
|
现地操作调整
|
2020-03-18 19:05:02 +08:00 |
|
zyy
|
4537080346
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 18:47:48 +08:00 |
|
zyy
|
3afa12711e
|
新增哈尔滨线路底部栏 操作
|
2020-03-18 18:47:37 +08:00 |
|
joylink_cuiweidong
|
7c02daebeb
|
代码调整
|
2020-03-18 18:45:27 +08:00 |
|
joylink_cuiweidong
|
d0107db4f1
|
北京一号线 现地操作总取消操作代码调整
|
2020-03-18 17:18:43 +08:00 |
|
joylink_cuiweidong
|
07af51b757
|
对返回的信号机接近区段数据处理
|
2020-03-18 17:02:07 +08:00 |
|
joylink_cuiweidong
|
68571fff18
|
北京一号线现地 自动折返设置和取消操作代码添加
|
2020-03-18 15:31:59 +08:00 |
|
joylink_cuiweidong
|
a126ddad02
|
北京一号线现地区故解操作代码调整
|
2020-03-18 14:09:38 +08:00 |
|
joylink_cuiweidong
|
96b5cfa3a9
|
北京一号线现地引导总锁操作代码修改
|
2020-03-18 13:34:13 +08:00 |
|
zyy
|
a925c568e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 11:19:10 +08:00 |
|
zyy
|
4203c30e30
|
调整宁波线路自动折返 计轴复位操作
|
2020-03-18 11:18:52 +08:00 |
|
fan
|
aa97a242b1
|
绘图问题调整
|
2020-03-18 10:31:23 +08:00 |
|
zyy
|
11b2ee8130
|
调整代码
|
2020-03-18 10:20:49 +08:00 |
|
zyy
|
12f283cbae
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
# src/views/newMap/newMapdraft/mapoperate/index.vue
|
2020-03-18 09:12:18 +08:00 |
|
zyy
|
0ceb0c2c65
|
调整自动折返 type 类型 增加自动折返菜单流程
|
2020-03-18 09:10:57 +08:00 |
|
joylink_cuiweidong
|
3beb346ce1
|
功能按钮代码调整
|
2020-03-17 18:59:51 +08:00 |
|
joylink_cuiweidong
|
c01b261638
|
引导总锁绘制代码调整
|
2020-03-17 18:25:03 +08:00 |
|
zyy
|
2fb74f520d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 18:02:16 +08:00 |
|
zyy
|
e2930da073
|
调整信号机状态
|
2020-03-17 18:02:02 +08:00 |
|
joylink_cuiweidong
|
d8d143ae38
|
删除地图绘制中，车站里面的引导总锁
|
2020-03-17 17:59:47 +08:00 |
|
joylink_cuiweidong
|
03d85d705c
|
哈尔滨一号线现地界面样式调整
|
2020-03-17 17:05:43 +08:00 |
|
zyy
|
a89b4d5f1d
|
调整宁波线路引导信号显示
|
2020-03-17 16:57:09 +08:00 |
|
zyy
|
a7baf76513
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 16:12:26 +08:00 |
|
zyy
|
2e7e25dd06
|
增加功能按钮绘图方式
|
2020-03-17 16:12:15 +08:00 |
|
fan
|
b94c2b47de
|
综合演练调整
|
2020-03-17 14:54:03 +08:00 |
|
joylink_cuiweidong
|
9dc0124da2
|
哈尔滨线路 现地行调切换代码调整
|
2020-03-17 14:28:23 +08:00 |
|
zyy
|
d3b9b718b3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 11:29:47 +08:00 |
|
zyy
|
96ed68cf65
|
调整宁波线路现地操作
|
2020-03-17 11:29:34 +08:00 |
|
joylink_cuiweidong
|
09e452143d
|
北京一号线 现地 道岔操作代码调整
|
2020-03-17 11:09:09 +08:00 |
|
joylink_cuiweidong
|
81c88dd63c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 09:55:04 +08:00 |
|
joylink_cuiweidong
|
b088287b6c
|
北京一号线 现地 站台总取消 站台扣车操作代码操作
|
2020-03-17 09:54:49 +08:00 |
|
fan
|
36026fc4ed
|
删除日志
|
2020-03-17 09:29:41 +08:00 |
|
fan
|
1598e77215
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-17 09:26:02 +08:00 |
|
fan
|
b06b2b58e2
|
调整现地操作
|
2020-03-17 09:25:40 +08:00 |
|
zyy
|
154b252fd6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 19:08:31 +08:00 |
|
zyy
|
9e150eed8d
|
调整控制权转移请求参数，调整宁波区段显示逻辑
|
2020-03-16 19:08:18 +08:00 |
|
joylink_cuiweidong
|
f437f18f63
|
北京线现地进路建立代码调整
|
2020-03-16 18:53:36 +08:00 |
|
fan
|
7fce0afd5a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 17:57:53 +08:00 |
|
joylink_cuiweidong
|
c695309b9f
|
代码修改
|
2020-03-16 17:56:10 +08:00 |
|
fan
|
18f69e3429
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 17:54:42 +08:00 |
|
fan
|
aa93cfc250
|
调整现地操作
|
2020-03-16 17:54:30 +08:00 |
|
joylink_cuiweidong
|
9bac0200be
|
代码调整
|
2020-03-16 17:46:34 +08:00 |
|
fan
|
9c3a61a747
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 17:17:18 +08:00 |
|
fan
|
0377ef014b
|
合并代码
|
2020-03-16 17:16:59 +08:00 |
|
joylink_cuiweidong
|
1a8b37f2b4
|
北京一号线 现地 排列进路操作代码调整
|
2020-03-16 16:28:53 +08:00 |
|
zyy
|
933f0c1bba
|
调整综合演练ibp获取数据
|
2020-03-16 16:06:50 +08:00 |
|
zyy
|
c39ec3301b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 11:02:46 +08:00 |
|
zyy
|
1c78d52fed
|
调整ibp文件配置路径
|
2020-03-16 11:02:33 +08:00 |
|
joylink_cuiweidong
|
a7193c5424
|
代码调整
|
2020-03-16 10:36:01 +08:00 |
|
fan
|
a29b0360d5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-16 10:16:29 +08:00 |
|
fan
|
00b1b13542
|
调整哈尔滨显示
|
2020-03-16 10:16:17 +08:00 |
|
fan
|
6a77d68c8d
|
调整哈尔滨显示
|
2020-03-16 10:15:58 +08:00 |
|
joylink_cuiweidong
|
fb9fcc30a3
|
代码调整
|
2020-03-13 20:02:40 +08:00 |
|
joylink_cuiweidong
|
6576f3c559
|
代码调整
|
2020-03-13 19:39:36 +08:00 |
|
zyy
|
19f64034fb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/theme/chengdu_01/model.js
# src/utils/baseUrl.js
|
2020-03-13 18:20:02 +08:00 |
|
fan
|
553900df47
|
调整成都三操作
|
2020-03-13 18:19:27 +08:00 |
|
zyy
|
e156bac9ca
|
增加公共地图ibp配置绘图 逻辑
|
2020-03-13 18:19:04 +08:00 |
|
fan
|
5733101b2b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-13 16:35:13 +08:00 |
|
fan
|
a7b81a3383
|
调整车次窗初始显示
|
2020-03-13 16:35:03 +08:00 |
|
joylink_cuiweidong
|
494e1fc815
|
北京一号线 现地 设置进路操作代码调整
|
2020-03-13 15:36:26 +08:00 |
|
fan
|
264310f28e
|
调整成都三显示
|
2020-03-13 15:06:14 +08:00 |
|
fan
|
7753c53ee0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/shape/Train/index.js
|
2020-03-13 13:08:18 +08:00 |
|
fan
|
4a2c539553
|
哈尔滨现地显示
|
2020-03-13 13:01:58 +08:00 |
|
joylink_cuiweidong
|
9e1e329644
|
列车状态代码调整
|
2020-03-13 11:25:43 +08:00 |
|
joylink_cuiweidong
|
bf0e44d512
|
绘图右键代码调整
|
2020-03-12 18:42:38 +08:00 |
|
joylink_cuiweidong
|
2ea2c297a3
|
北京一号线 现地 信号重开(进路锁闭情况) 区故解 操作代码调整
|
2020-03-12 17:15:18 +08:00 |
|
joylink_cuiweidong
|
6031ca59eb
|
代码调整
|
2020-03-12 15:54:30 +08:00 |
|