joylink_cuiweidong
|
c024fd281f
|
更改宁波一号线的 操作定义中的 实训说明
|
2021-06-10 13:42:33 +08:00 |
|
joylink_cuiweidong
|
e31f5aaed5
|
更改福州一号线的 操作定义中的 实训说明
|
2021-06-10 11:10:53 +08:00 |
|
joylink_cuiweidong
|
3a2670a367
|
Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test
|
2021-06-10 10:15:52 +08:00 |
|
joylink_cuiweidong
|
4b75808aea
|
在线用户代码调整
|
2021-06-10 10:09:55 +08:00 |
|
yuan
|
2bef634a07
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_responder_batch
|
2021-06-10 10:01:46 +08:00 |
|
yuan
|
4bd21b30c5
|
地图编辑-应答器-批量创建 页面修改
|
2021-06-10 10:01:34 +08:00 |
|
joylink_cuiweidong
|
15c94bd50c
|
添加 在线用户查询
|
2021-06-09 18:10:21 +08:00 |
|
joylink_cuiweidong
|
de337d4aa6
|
西安三 菜单修改
CM改成SM
URM改成NRM
|
2021-06-09 17:05:40 +08:00 |
|
joylink_cuiweidong
|
7781801171
|
第三方账号通过url登陆 以及 创建第三方账号 功能添加
|
2021-06-09 16:37:02 +08:00 |
|
fan
|
532fd1d5da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ibpHold
|
2021-06-08 16:01:06 +08:00 |
|
fan
|
4b7e2efcba
|
西安三号线ibp盘扣车显示调整
|
2021-06-08 16:00:55 +08:00 |
|
sunzhenyu
|
62f339d3cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-08 14:55:58 +08:00 |
|
sunzhenyu
|
9a2e993b5d
|
修改大铁三维单体设备通信和显示逻辑
|
2021-06-08 14:55:37 +08:00 |
|
fan
|
1ed9fd4d5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt
|
2021-06-08 14:44:36 +08:00 |
|
fan
|
c09da2aa5d
|
列车操作调整
|
2021-06-08 14:44:23 +08:00 |
|
yuan
|
d94a95f261
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL
|
2021-06-08 10:09:01 +08:00 |
|
yuan
|
3093a1bc1c
|
修改PSL菜单显示逻辑为非故障模式且角色为车站值班员
|
2021-06-08 10:08:48 +08:00 |
|
fan
|
ae42915db5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_shichang
|
2021-06-07 16:11:47 +08:00 |
|
fan
|
891db1539c
|
教学管理添加使用时长
|
2021-06-07 16:11:36 +08:00 |
|
yuan
|
e30f81b93d
|
替换PSL亮灯图片
|
2021-06-07 10:46:52 +08:00 |
|
yuan
|
c3a3f8ce63
|
修正PSL试灯按钮不显示
|
2021-06-07 10:08:50 +08:00 |
|
fan
|
2524e45c42
|
Revert "Revert "PSL""
This reverts commit 9832b0c8
|
2021-06-07 09:12:43 +08:00 |
|
fan
|
c0c1ef8d05
|
Revert "Revert "PSL""
This reverts commit 74249e59
|
2021-06-07 09:12:13 +08:00 |
|
fan
|
f10581e2dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-04 18:06:13 +08:00 |
|
fan
|
74249e5992
|
Revert "PSL"
This reverts commit 185a3eff
|
2021-06-04 18:06:01 +08:00 |
|
fan
|
9832b0c87f
|
Revert "PSL"
This reverts commit 786d0f7a
|
2021-06-04 18:05:43 +08:00 |
|
sunzhenyu
|
e0b9861b78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-04 18:05:19 +08:00 |
|
sunzhenyu
|
85e1faa60c
|
增加三维大铁返回按钮
|
2021-06-04 18:05:12 +08:00 |
|
yuan
|
95ce742d95
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL
|
2021-06-04 17:55:58 +08:00 |
|
yuan
|
786d0f7a9f
|
PSL
|
2021-06-04 17:55:39 +08:00 |
|
sunzhenyu
|
45a2c925ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-04 17:26:49 +08:00 |
|
sunzhenyu
|
23ad69529a
|
增加三维大铁驾驶界面更新，增加三维大铁信号机，修改大铁三维加载和大铁信号模块
|
2021-06-04 17:26:41 +08:00 |
|
fan
|
eb6ad1d7c8
|
调整列车故障处理 限速指令 参数范围和提示
|
2021-06-04 16:21:21 +08:00 |
|
fan
|
eeb52c7911
|
西安三列车菜单操作增加单位和提示
|
2021-06-04 16:12:16 +08:00 |
|
yuan
|
aa395d1206
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL
|
2021-06-04 16:06:12 +08:00 |
|
yuan
|
185a3eff6e
|
PSL
|
2021-06-04 16:05:56 +08:00 |
|
fan
|
b6a373a34a
|
西安三列车菜单位置调整
|
2021-06-04 14:57:08 +08:00 |
|
fan
|
50a7b6e039
|
南京二号线列监暂提
|
2021-06-04 14:22:39 +08:00 |
|
fan
|
4d89906af4
|
Merge remote-tracking branch 'origin/test_xian03training' into test
|
2021-06-04 09:52:12 +08:00 |
|
fan
|
3bcc904d5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_xian03
|
2021-06-03 18:09:53 +08:00 |
|
fan
|
16c5659bb9
|
调整西安三号线早晚点文字提示
|
2021-06-03 18:09:43 +08:00 |
|
sunzhenyu
|
9ae1cf2ead
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-03 18:03:50 +08:00 |
|
sunzhenyu
|
1258bc4771
|
单独分出大铁三维单体设备，剔除无用接口，修改大铁驾驶界面，调试接口
|
2021-06-03 18:03:44 +08:00 |
|
fan
|
8004071e6f
|
绘图添加出站信号机进站信号机
|
2021-06-03 17:40:44 +08:00 |
|
fan
|
7ea850497a
|
西安三号线问题调整
|
2021-06-03 17:31:50 +08:00 |
|
fan
|
70d1ed2ce6
|
Merge branch 'test_xian03training' of https://git.code.tencent.com/lian-cbtc/jl-client into test_xian03training
|
2021-06-03 13:09:49 +08:00 |
|
fan
|
ae756864cf
|
西安三号线实训调整
|
2021-06-03 13:09:35 +08:00 |
|
joylink_cuiweidong
|
2a5ab20cde
|
西安三 界面 设置停站时间 显示重叠
|
2021-06-03 11:19:07 +08:00 |
|
yuan
|
c9af4a7031
|
emmm
|
2021-06-03 09:58:24 +08:00 |
|
fan
|
e34cafce7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt
|
2021-06-03 09:47:50 +08:00 |
|
fan
|
0d27da9d3b
|
南京二号线列监调整--暂提
|
2021-06-03 09:47:40 +08:00 |
|
fan
|
9dc64e67ed
|
南京二号线列监调整
|
2021-06-02 17:58:18 +08:00 |
|
fan
|
5bd0f380b6
|
南京二号线列监调整
|
2021-06-02 17:55:24 +08:00 |
|
fan
|
ad0cbdbd0f
|
南京二号线现地初始化列车没清调整
|
2021-06-02 10:22:24 +08:00 |
|
fan
|
3301f9abcd
|
南京二号线车站显示模块调整
|
2021-06-01 18:13:13 +08:00 |
|
fan
|
e134b23fcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-01 17:50:46 +08:00 |
|
fan
|
25f546b205
|
南京二号线车站显示模块调整
|
2021-06-01 17:50:37 +08:00 |
|
joylink_cuiweidong
|
56ea29660f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-01 17:29:33 +08:00 |
|
joylink_cuiweidong
|
d58c80888e
|
西安三号线 添加道岔定反位失表
|
2021-06-01 17:29:02 +08:00 |
|
fan
|
35db44cd42
|
列车故障操作驾驶至调整
|
2021-06-01 15:36:18 +08:00 |
|
fan
|
6b90da452b
|
添加运行图加载规则
|
2021-06-01 14:57:40 +08:00 |
|
fan
|
a52c2d2126
|
信号机接近区段
|
2021-06-01 14:22:09 +08:00 |
|
fan
|
a8ce67ee4a
|
南京二号线调整
|
2021-06-01 14:06:18 +08:00 |
|
fan
|
9ac45050f9
|
列车指令调整
|
2021-06-01 11:01:02 +08:00 |
|
fan
|
a3b62e203d
|
列车指令调整
|
2021-06-01 10:22:10 +08:00 |
|
fan
|
c71f2fde96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-01 10:13:25 +08:00 |
|
fan
|
9f4841e9e0
|
列车指令调整
|
2021-06-01 10:13:10 +08:00 |
|
zyy
|
e1958b1b8e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-31 15:53:03 +08:00 |
|
zyy
|
137b427ebe
|
调整新路预览配置
|
2021-05-31 15:52:46 +08:00 |
|
joylink_cuiweidong
|
426677ab57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-31 15:50:59 +08:00 |
|
joylink_cuiweidong
|
3c34a5b319
|
更改 新版仿真订阅路径
|
2021-05-31 15:50:35 +08:00 |
|
sunzhenyu
|
cde07e6859
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-31 15:50:14 +08:00 |
|
sunzhenyu
|
8ec3baa515
|
修改三维大铁驾驶通信接口
|
2021-05-31 15:50:07 +08:00 |
|
fan
|
aec02b7752
|
南京二行调调整
|
2021-05-31 14:15:09 +08:00 |
|
fan
|
2fd6a971f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 18:25:00 +08:00 |
|
fan
|
cec41aeccf
|
注释南京二行调
|
2021-05-28 18:23:42 +08:00 |
|
zyy
|
58f1e06267
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 18:12:53 +08:00 |
|
zyy
|
224bbc0177
|
调整进路更新延续保护配置
|
2021-05-28 18:12:35 +08:00 |
|
sunzhenyu
|
397c80a967
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 18:09:16 +08:00 |
|
sunzhenyu
|
9ea7abf401
|
修改三维大铁驾驶模块接通车速变化
|
2021-05-28 18:09:10 +08:00 |
|
zyy
|
5678498fa6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 17:20:33 +08:00 |
|
zyy
|
d86566be12
|
调整延续保护字段
|
2021-05-28 17:20:16 +08:00 |
|
fan
|
d11b0c6d47
|
增加列车故障操作-换端&联锁配置项-CTC列车进路延续保护仅折返站处锁闭
|
2021-05-28 17:18:51 +08:00 |
|
fan
|
ee6dfa9df2
|
南京二列监
|
2021-05-28 15:22:23 +08:00 |
|
fan
|
15e1868d6c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 14:08:24 +08:00 |
|
fan
|
e09d5f4aff
|
调整仿真开始显示暂停中 & 南京二列监
|
2021-05-28 14:07:28 +08:00 |
|
zyy
|
e6f3afd6a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 13:08:17 +08:00 |
|
zyy
|
f9835862ce
|
调整侧防流程
|
2021-05-28 13:08:02 +08:00 |
|
fan
|
70ca57d26c
|
时刻表列车总览详览迁移
|
2021-05-28 11:00:26 +08:00 |
|
fan
|
af8a7758c2
|
Merge remote-tracking branch 'origin/test-nan02' into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuBar.vue
|
2021-05-28 10:18:57 +08:00 |
|
fan
|
1b5da46e80
|
背投轨道总览详览调整
|
2021-05-28 10:10:54 +08:00 |
|
sunzhenyu
|
c2bda14c4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-27 18:16:01 +08:00 |
|
sunzhenyu
|
d71c4d7d6d
|
增加大铁三维驾驶模块
|
2021-05-27 18:15:54 +08:00 |
|
joylink_cuiweidong
|
bb73608a1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-27 17:28:36 +08:00 |
|
joylink_cuiweidong
|
8c232d2b13
|
大铁项目 代码调整
|
2021-05-27 17:27:50 +08:00 |
|
zyy
|
a46a2764a5
|
增加用户查询id列表
|
2021-05-27 17:19:05 +08:00 |
|
zyy
|
b2806165ef
|
调整信号机接近区段更新流程
|
2021-05-27 16:40:28 +08:00 |
|
zyy
|
672c95c6c6
|
调整信号接近区段
|
2021-05-27 16:10:58 +08:00 |
|
zyy
|
529839b3ac
|
调整进路更新，延续保护更新
|
2021-05-27 15:15:58 +08:00 |
|
zyy
|
3a06aae186
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-27 14:19:43 +08:00 |
|
zyy
|
e150fda807
|
调整延续保护
|
2021-05-27 14:19:28 +08:00 |
|
joylink_cuiweidong
|
aa9c961cb0
|
旧版仿真 增加 仿真订阅（/queue/simulation/{id}/state）
|
2021-05-27 13:56:17 +08:00 |
|
joylink_cuiweidong
|
796983e9e8
|
合并 设计平台菜单（pdf上传和编辑器）
|
2021-05-27 13:28:35 +08:00 |
|
joylink_cuiweidong
|
2938528c2e
|
sock 断线重连 代码调整
|
2021-05-27 11:30:03 +08:00 |
|
joylink_cuiweidong
|
411099fdc1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-27 09:33:48 +08:00 |
|
joylink_cuiweidong
|
1c2f663d9c
|
西安三号线 行调添加设置/取消自动触发、自动进路
|
2021-05-27 09:33:15 +08:00 |
|
fan
|
4191df5fff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 17:25:26 +08:00 |
|
fan
|
b776b48bf5
|
哈尔滨列监显示条件限制
|
2021-05-26 17:25:16 +08:00 |
|
fan
|
7412e01b32
|
代码暂提
|
2021-05-26 17:18:20 +08:00 |
|
zyy
|
f9e9efc70c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 17:03:54 +08:00 |
|
zyy
|
2b338ba0de
|
调整进路预览
|
2021-05-26 17:03:38 +08:00 |
|
fan
|
ce1b6c5f8a
|
meger
|
2021-05-26 15:48:55 +08:00 |
|
fan
|
46d74d3002
|
代码暂提
|
2021-05-26 15:46:29 +08:00 |
|
joylink_cuiweidong
|
04f156cc28
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 15:01:26 +08:00 |
|
joylink_cuiweidong
|
7b3e127898
|
南京二号线 十一站型 时刻表 页面添加
|
2021-05-26 15:01:02 +08:00 |
|
zyy
|
8b2f8c7bc1
|
Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test-nan02
|
2021-05-26 14:43:51 +08:00 |
|
zyy
|
2d6f8ad984
|
增加车场弹窗
|
2021-05-26 14:43:34 +08:00 |
|
fan
|
49c1eba347
|
列监代码显示
|
2021-05-26 14:19:40 +08:00 |
|
fan
|
86e2520b05
|
代码暂提
|
2021-05-26 14:04:36 +08:00 |
|
fan
|
455fe9dccd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 10:40:29 +08:00 |
|
fan
|
c4b4955541
|
BUG176、174
|
2021-05-26 10:40:17 +08:00 |
|
joylink_cuiweidong
|
300dd3d6d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-26 10:16:45 +08:00 |
|
joylink_cuiweidong
|
cc4eaf034c
|
西安三号线 右键的车站切换划分问题（bug281）
|
2021-05-26 10:16:22 +08:00 |
|
fan
|
16faefb526
|
线路配置添加 figuresOfTripNumber（车次号位数）&figuresOfServiceNumber（服务号位数）
|
2021-05-25 18:02:59 +08:00 |
|
fan
|
5188192736
|
BUG275 南京11站：车次号步进，在马群创建的车次步进到油坊桥的区段后，列车不显示
|
2021-05-25 17:53:23 +08:00 |
|
fan
|
3b3c964636
|
宁波问题调整
|
2021-05-25 16:33:20 +08:00 |
|
fan
|
c4894290f4
|
Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02
|
2021-05-25 16:07:22 +08:00 |
|
fan
|
337ed03f78
|
哈尔滨问题调整
|
2021-05-25 16:05:45 +08:00 |
|
fan
|
a42e3ecafc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-25 13:18:19 +08:00 |
|
fan
|
3ea6c67b0f
|
哈尔滨问题调整
|
2021-05-25 13:17:55 +08:00 |
|
joylink_cuiweidong
|
60fce71f8a
|
西安三号线 鼠标右键无法出现菜单快速切换车站 处理
|
2021-05-25 10:36:20 +08:00 |
|
joylink_cuiweidong
|
8abbe2e05a
|
修改西安三号线问题 道岔失表不能设置定位或反位失表，只能设置成道岔定反位都失表
|
2021-05-25 09:48:54 +08:00 |
|
joylink_cuiweidong
|
45371fb2d3
|
修改canvasId 初始化位置
|
2021-05-25 09:32:11 +08:00 |
|
fan
|
6ec48dab9d
|
BUG273 设置故障时，点击故障列表后，直接点击关闭按钮，故障列表还会显示
|
2021-05-24 17:41:54 +08:00 |
|
fan
|
6ce5bdfbed
|
调整heartBeat重连条件
|
2021-05-24 17:22:36 +08:00 |
|
fan
|
8c1e968213
|
BUG269 哈尔滨：报警信息缺少故障描述
|
2021-05-24 17:01:10 +08:00 |
|
fan
|
640793241a
|
BUG270 问题调整
|
2021-05-24 16:08:52 +08:00 |
|
fan
|
9548e24464
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-24 15:53:50 +08:00 |
|
fan
|
49011b95e2
|
添加线路配置delayWhenCancelRouteWithAbnormalInterlock & 哈尔滨部分问题调整
|
2021-05-24 15:53:38 +08:00 |
|
fan
|
4796e7f648
|
代码暂提
|
2021-05-24 11:29:59 +08:00 |
|
sunzhenyu
|
e031986664
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-21 15:31:29 +08:00 |
|
sunzhenyu
|
04b112223c
|
baseurl
|
2021-05-21 15:31:25 +08:00 |
|
sunzhenyu
|
351d268e52
|
三维课程增加场景id显示，修改提示窗下一步功能区分，修改事件驱动条件
|
2021-05-21 15:30:50 +08:00 |
|
joylink_cuiweidong
|
e17104f537
|
地图绘制 停站时间/运行等级 代码调整
|
2021-05-21 15:12:40 +08:00 |
|
joylink_cuiweidong
|
13af28467c
|
地图绘制 停站时间/运行等级 界面与接口代码调整
生成联锁配置 删除 延续保护构建是否只考虑一个道岔计轴
生成联锁配置 新增 延续保护最小长度
|
2021-05-21 15:02:28 +08:00 |
|
joylink_cuiweidong
|
4cefb0cfbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-21 11:34:28 +08:00 |
|
joylink_cuiweidong
|
bf8d0eb574
|
地图绘制 停站时间 界面与接口代码调整
|
2021-05-21 11:33:37 +08:00 |
|
fan
|
fbd700d52e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-21 10:01:54 +08:00 |
|
fan
|
2438b9f0a0
|
删除仿真、绘图、运行图编制的心跳检测
|
2021-05-21 10:01:45 +08:00 |
|
fan
|
22cfed1774
|
暂提
|
2021-05-21 09:42:03 +08:00 |
|
zyy
|
54ad4bf93b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 17:58:42 +08:00 |
|
zyy
|
55ee64479f
|
调整系统绘图模块新增
|
2021-05-20 17:58:23 +08:00 |
|
fan
|
e49840afc8
|
绑定数据编辑调整
|
2021-05-20 17:51:00 +08:00 |
|
fan
|
7a33bae3fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 17:39:32 +08:00 |
|
fan
|
4c948d91ff
|
绑定数据编辑调整
|
2021-05-20 17:38:55 +08:00 |
|
zyy
|
89b63e9709
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 17:13:19 +08:00 |
|
zyy
|
c4ec37a403
|
调整权限字段显示
|
2021-05-20 17:13:05 +08:00 |
|
sunzhenyu
|
f3c9bfdcb6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 17:06:35 +08:00 |
|
sunzhenyu
|
5392755eda
|
修改三维课程联控菜单位置，修改三维模型添加bug，修改移动模型指示器，修改操作切换，修改模型场景中显示移除逻辑，修改事件触发器逻辑
|
2021-05-20 17:06:28 +08:00 |
|
zyy
|
9789fb4d91
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 16:38:08 +08:00 |
|
zyy
|
3a2baf8374
|
调整权限流程
|
2021-05-20 16:37:55 +08:00 |
|
fan
|
3ac0069577
|
暂提
|
2021-05-20 15:53:21 +08:00 |
|
fan
|
1b62198d55
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 15:40:10 +08:00 |
|
fan
|
0b716d7bc3
|
pad检索调整
|
2021-05-20 15:39:44 +08:00 |
|
fan
|
32ef41b405
|
暂提
|
2021-05-20 15:18:02 +08:00 |
|
zyy
|
24aefdebd4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 15:13:54 +08:00 |
|
zyy
|
be1106fc20
|
调整权限字段显示，地图绘制新增
|
2021-05-20 15:13:37 +08:00 |
|
fan
|
6590c10ab7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 15:06:24 +08:00 |
|
fan
|
e212bd52e9
|
pdf上传检索调整
|
2021-05-20 15:06:14 +08:00 |
|
joylink_cuiweidong
|
7094b1d497
|
南京二号线 列车详览页面 代码调整
|
2021-05-20 15:05:57 +08:00 |
|
fan
|
5ee943a313
|
暂提
|
2021-05-20 11:04:21 +08:00 |
|
fan
|
db6e9503f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02
|
2021-05-20 09:29:10 +08:00 |
|
joylink_cuiweidong
|
beb086e57f
|
南京二号线 列车总览页面 代码调整
|
2021-05-20 09:20:31 +08:00 |
|
joylink_cuiweidong
|
f1e44a9ee8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 09:02:02 +08:00 |
|
zyy
|
fbb9365b62
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-19 18:14:44 +08:00 |
|
zyy
|
83561a2545
|
调整权限分发
|
2021-05-19 18:14:27 +08:00 |
|
joylink_cuiweidong
|
f20793ec0d
|
代码调整
|
2021-05-19 18:11:32 +08:00 |
|
fan
|
8db97250d8
|
暂提
|
2021-05-19 18:03:58 +08:00 |
|
joylink_cuiweidong
|
7cac00b163
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-19 16:46:29 +08:00 |
|
joylink_cuiweidong
|
e6e09d24fb
|
代码调整
|
2021-05-19 16:46:07 +08:00 |
|
fan
|
9b422cd3b9
|
南京二号线调整（未完）
|
2021-05-19 16:07:52 +08:00 |
|
fan
|
999c0197cf
|
区域选择不随仿真角色变化调整
|
2021-05-19 15:58:52 +08:00 |
|
fan
|
43f523cf88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-19 15:46:13 +08:00 |
|
fan
|
6b57369b8f
|
车站值班员名称显示调整&暂停前端仿真计时&仿真倍速管理员可见
|
2021-05-19 15:45:49 +08:00 |
|
zyy
|
267dc4d878
|
删除多余配置
|
2021-05-19 15:20:46 +08:00 |
|
zyy
|
4cd675cf67
|
增加系统预览绘制
|
2021-05-19 15:07:59 +08:00 |
|
zyy
|
850897bd4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-19 10:22:53 +08:00 |
|
zyy
|
c281a51424
|
调整流程
|
2021-05-19 10:22:39 +08:00 |
|
joylink_cuiweidong
|
65daf903bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-19 09:44:05 +08:00 |
|
joylink_cuiweidong
|
17c4fdafa6
|
代码调整
|
2021-05-19 09:43:24 +08:00 |
|
fan
|
be74067c7e
|
轨道详览
|
2021-05-18 17:49:08 +08:00 |
|
fan
|
853e049cc5
|
哈尔滨运行图调整
|
2021-05-18 14:19:28 +08:00 |
|
fan
|
f1d41844dc
|
南京二列车操作报错提示 & BUG267
|
2021-05-18 13:47:22 +08:00 |
|
fan
|
5eef5240e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-18 13:36:26 +08:00 |
|
fan
|
df68e9a969
|
tro 轨道总览
|
2021-05-18 13:36:06 +08:00 |
|
joylink_cuiweidong
|
b87425f8c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-18 10:49:20 +08:00 |
|
joylink_cuiweidong
|
622885d3d5
|
删除暂时没有用的npm 模块（lodash,mock）
发布地图 地图分组代码调整
|
2021-05-18 10:48:58 +08:00 |
|
fan
|
4b83445624
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-18 10:04:20 +08:00 |
|
fan
|
7af49deb90
|
综合演练添加车站值班员
|
2021-05-18 10:04:03 +08:00 |
|
joylink_cuiweidong
|
60aeeaedea
|
代码调整
|
2021-05-17 19:15:25 +08:00 |
|
joylink_cuiweidong
|
1ca70a08b8
|
代码调整
|
2021-05-17 19:07:24 +08:00 |
|
joylink_cuiweidong
|
6a07a81233
|
代码调整
|
2021-05-17 19:06:00 +08:00 |
|
joylink_cuiweidong
|
5a6fcc48eb
|
代码调整
|
2021-05-17 19:00:27 +08:00 |
|
joylink_cuiweidong
|
c0d2b19589
|
代码调整
|
2021-05-17 18:57:20 +08:00 |
|
joylink_cuiweidong
|
fee03bbb41
|
代码调整
|
2021-05-17 18:42:50 +08:00 |
|
joylink_cuiweidong
|
aee104ce99
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 18:42:35 +08:00 |
|
joylink_cuiweidong
|
ada429fcde
|
pdf上传 代码调整
|
2021-05-17 18:41:58 +08:00 |
|
zyy
|
6ba7b730a5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 18:16:38 +08:00 |
|
zyy
|
9a2785f126
|
调整南京二号线 行调操作---> ibp局部控制盘、车站、轨道
|
2021-05-17 18:16:22 +08:00 |
|
fan
|
4384e36314
|
BUG266 南京11站：建议修改车次号输入框只能输入7个数字，车组号6个数字
|
2021-05-17 18:03:44 +08:00 |
|
fan
|
c2272313fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 17:29:41 +08:00 |
|
fan
|
d00f74e190
|
大铁线路图纸检索
|
2021-05-17 17:29:33 +08:00 |
|
joylink_cuiweidong
|
8033c42655
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 17:20:49 +08:00 |
|
joylink_cuiweidong
|
57feb88e6c
|
pdf 上传 代码调整
|
2021-05-17 17:20:26 +08:00 |
|
fan
|
0a9c8665ff
|
代码调整
|
2021-05-17 16:37:56 +08:00 |
|
fan
|
9554643f05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 16:14:17 +08:00 |
|
fan
|
02eaa33fec
|
背投调整
|
2021-05-17 16:14:00 +08:00 |
|
zyy
|
17f25b1e0b
|
处理冲突文件
# src/jmapNew/theme/nanjing_02/menus/menuBar.vue
|
2021-05-17 15:58:57 +08:00 |
|
zyy
|
050d5854d1
|
增加南京区段操作流程，请求暂未调整
|
2021-05-17 15:57:07 +08:00 |
|
fan
|
5c5a1db13d
|
Bug262 福州一：紧急停车状态表示有问题
|
2021-05-17 15:52:26 +08:00 |
|
fan
|
122ca9ec6b
|
列车操作调整
|
2021-05-17 15:13:26 +08:00 |
|
fan
|
dfc5d50fbe
|
ATS显示调整
|
2021-05-17 14:39:16 +08:00 |
|
fan
|
5215d8ba2c
|
merge
|
2021-05-17 13:37:03 +08:00 |
|
fan
|
bc2fa1fbae
|
代码调整
|
2021-05-17 13:35:49 +08:00 |
|
joylink_cuiweidong
|
3bbfae4082
|
pdf上传 代码调整
|
2021-05-17 10:42:13 +08:00 |
|
joylink_cuiweidong
|
290542ee28
|
pdf上传代码调整
|
2021-05-17 09:51:06 +08:00 |
|
zyy
|
1dba8c2e9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2021-05-14 18:33:09 +08:00 |
|
zyy
|
54295fe452
|
增加pdf 上传
|
2021-05-14 18:31:46 +08:00 |
|
sunzhenyu
|
a8d89df500
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-14 18:09:24 +08:00 |
|
sunzhenyu
|
883c70bd30
|
增加三维课程角色选择，增加三维课程信息提示跳转部分
|
2021-05-14 18:09:18 +08:00 |
|
fan
|
01fdc0ef22
|
加载时刻表
|
2021-05-14 18:08:12 +08:00 |
|
fan
|
666e85dec6
|
车次号步进
|
2021-05-14 16:49:27 +08:00 |
|
fan
|
69c6526516
|
Bug260 、Bug261、郑州共赢代码调整
|
2021-05-14 15:59:04 +08:00 |
|
fan
|
006b9762e1
|
merge
|
2021-05-14 15:07:00 +08:00 |
|
fan
|
ddfddfa292
|
代码调整
|
2021-05-14 15:05:57 +08:00 |
|
zyy
|
9bd90ce182
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-14 13:14:24 +08:00 |
|
zyy
|
af9eb2c8b6
|
增加文章编辑器
|
2021-05-14 13:14:08 +08:00 |
|
joylink_cuiweidong
|
d584e7ea7d
|
添加 图纸管理页面
|
2021-05-13 18:09:10 +08:00 |
|
joylink_cuiweidong
|
02241f455a
|
地图绘图 高级数据 代码调整
|
2021-05-13 14:19:58 +08:00 |
|
joylink_cuiweidong
|
61b982e9b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-13 13:55:21 +08:00 |
|
joylink_cuiweidong
|
f4cd046f1a
|
大铁项目 根据车站值班员 显示绘图
|
2021-05-13 13:55:02 +08:00 |
|
fan
|
149d4cf995
|
Bug 206 语音训练结果在查询的时候，选择A用户，结果里出现了B用户的语音
|
2021-05-13 13:22:30 +08:00 |
|
fan
|
bf69914d21
|
代码问题调整
(cherry picked from commit 7cd36b7446)
|
2021-05-13 13:13:44 +08:00 |
|
joylink_cuiweidong
|
d52a5837b4
|
宁波三 列车绘图代码调整
|
2021-05-12 14:17:14 +08:00 |
|
sunzhenyu
|
9a5a9b7ff7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-12 10:53:12 +08:00 |
|
sunzhenyu
|
77584bc346
|
修改三维设备手摇道岔操作
|
2021-05-12 10:53:06 +08:00 |
|
joylink_cuiweidong
|
7138a02900
|
仿真里在打开设备视图的状态下，点击右下角返回按钮退出登录 bug调整
|
2021-05-12 10:41:55 +08:00 |
|
sunzhenyu
|
c5a020e1a6
|
修改三维设备展示文本错别字
|
2021-05-12 10:37:39 +08:00 |
|
sunzhenyu
|
7b4d6a267e
|
修改三维设备手摇道岔文字描述
|
2021-05-11 16:11:15 +08:00 |
|
sunzhenyu
|
7b73ff0e69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-11 15:59:44 +08:00 |
|
sunzhenyu
|
14d63ae42a
|
三维设备视图手摇道岔操作展示
|
2021-05-11 15:59:35 +08:00 |
|
fan
|
8cf5d36ce3
|
南京二号线调整
|
2021-05-11 15:36:11 +08:00 |
|
fan
|
c1d5b84e0b
|
添加一键校验发布地图
|
2021-05-10 15:44:34 +08:00 |
|
fan
|
9c7b6e4ab2
|
运行图解析调整
|
2021-05-10 15:08:58 +08:00 |
|
fan
|
4f07f16ecf
|
运行图解析调整
|
2021-05-10 14:40:37 +08:00 |
|
joylink_cuiweidong
|
d0ce678ca0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-10 13:50:55 +08:00 |
|
joylink_cuiweidong
|
cc259c8a15
|
哈尔滨项目运行图代码调整
|
2021-05-10 13:50:17 +08:00 |
|
fan
|
a9da38daf2
|
运行图解析调整
|
2021-05-10 09:13:22 +08:00 |
|
fan
|
b2892930ad
|
语音训练添加录音播放
|
2021-05-08 14:33:55 +08:00 |
|
fan
|
e597a3ae8f
|
添加站台紧急停车
|
2021-05-08 14:11:22 +08:00 |
|
fan
|
be3ea8384a
|
添加站台紧急停车
|
2021-05-08 13:31:19 +08:00 |
|
fan
|
67f1076dec
|
故障调整
|
2021-05-08 09:22:16 +08:00 |
|
fan
|
181caff10c
|
哈尔滨添加故障操作
|
2021-05-07 16:16:36 +08:00 |
|
fan
|
14d63cecbc
|
哈尔滨打包调整
|
2021-05-07 11:08:28 +08:00 |
|
fan
|
49d19a7d14
|
大铁去掉mBar
|
2021-05-06 16:25:13 +08:00 |
|
fan
|
cfd6990189
|
场景语音训练调整
|
2021-05-06 16:22:10 +08:00 |
|
fan
|
6cb4ee9c27
|
场景语音训练调整
|
2021-05-06 16:15:09 +08:00 |
|
fan
|
0b78df8c9c
|
场景语音训练调整
|
2021-05-06 15:35:14 +08:00 |
|
fan
|
78c8b39edb
|
场景语音训练调整
|
2021-05-06 14:50:34 +08:00 |
|
fan
|
b4a0a42235
|
场景语音训练调整
|
2021-05-06 10:30:29 +08:00 |
|
fan
|
8dc44f11f8
|
场景语音训练调整
|
2021-05-06 09:54:51 +08:00 |
|
fan
|
21990ebf11
|
场景语音训练调整
|
2021-04-30 17:38:15 +08:00 |
|
fan
|
cc00e11304
|
场景语音训练调整
|
2021-04-30 17:34:37 +08:00 |
|
fan
|
d3238e77e2
|
场景语音训练调整
|
2021-04-30 16:50:04 +08:00 |
|
fan
|
2fd786ecbf
|
baseURl
|
2021-04-30 16:36:27 +08:00 |
|
fan
|
21fe3c8b1e
|
语音训练调整
|
2021-04-30 16:35:28 +08:00 |
|
fan
|
f9d2d8a0ac
|
语音训练调整
|
2021-04-30 16:14:56 +08:00 |
|
fan
|
aa2648231f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-30 10:24:44 +08:00 |
|
fan
|
8087d87b22
|
大铁线路操作调整
(cherry picked from commit 0a0917dd32)
|
2021-04-30 10:24:18 +08:00 |
|
sunzhenyu
|
861065e159
|
修改三维编辑器v-for key警告
|
2021-04-30 10:01:36 +08:00 |
|
sunzhenyu
|
528af2fea6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-29 17:56:01 +08:00 |
|
sunzhenyu
|
2f60a7a352
|
增加静态测试模型，修改三维课程播放器模型触发器模块，增加三维动画模块，修改课程信息模块
|
2021-04-29 17:55:55 +08:00 |
|
fan
|
2849342be6
|
大铁线路操作调整
|
2021-04-29 16:26:08 +08:00 |
|
fan
|
0585502691
|
大铁线路操作调整
|
2021-04-29 15:50:15 +08:00 |
|
fan
|
acf4f6bea9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-29 13:25:58 +08:00 |
|
fan
|
ae5df5de5b
|
大铁线路操作调整
|
2021-04-29 13:25:48 +08:00 |
|
joylink_cuiweidong
|
87c86536df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-29 11:02:37 +08:00 |
|
joylink_cuiweidong
|
9ce15c6d25
|
代码调整
|
2021-04-29 11:02:15 +08:00 |
|
fan
|
5ee38364a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-29 10:35:44 +08:00 |
|
fan
|
ed7c4bb8f5
|
大铁线路操作调整
|
2021-04-29 10:35:34 +08:00 |
|
joylink_cuiweidong
|
330416f0e0
|
语音训练代码调整
|
2021-04-29 10:21:51 +08:00 |
|
fan
|
5678d8dfad
|
信号机坐标编辑显示
|
2021-04-28 18:46:04 +08:00 |
|
fan
|
edbd6d55cf
|
信号机坐标编辑显示
|
2021-04-28 17:14:48 +08:00 |
|
fan
|
823c30118c
|
大铁仿真操作调整
|
2021-04-28 16:58:29 +08:00 |
|
fan
|
6ec82c158f
|
大铁仿真操作调整
|
2021-04-28 13:36:58 +08:00 |
|
fan
|
2d044a6810
|
大铁仿真操作调整
|
2021-04-28 09:01:27 +08:00 |
|
fan
|
83eddd42d3
|
大铁仿真操作调整
|
2021-04-27 15:52:39 +08:00 |
|
fan
|
b107ae58d6
|
大铁仿真操作调整
|
2021-04-27 14:40:17 +08:00 |
|
fan
|
19e3bb91d0
|
大铁仿真操作调整
|
2021-04-27 13:24:33 +08:00 |
|
fan
|
fad65a0d66
|
大铁仿真操作调整
|
2021-04-27 13:02:38 +08:00 |
|
fan
|
c99194f84e
|
新版仿真订阅消息调整
|
2021-04-27 10:17:51 +08:00 |
|
fan
|
09781774c7
|
大铁线路操作调整
|
2021-04-26 17:59:23 +08:00 |
|
fan
|
cd84fbb4cd
|
大铁线路操作调整
|
2021-04-26 16:00:39 +08:00 |
|
fan
|
bb973a23d2
|
大铁线路操作调整
|
2021-04-26 13:39:19 +08:00 |
|
fan
|
d917ccce3d
|
大铁线路操作调整
|
2021-04-25 18:13:47 +08:00 |
|
fan
|
c22a40b6f0
|
BUG234 => 测试环境中苏电院教学管理页面显示问题
|
2021-04-25 14:54:05 +08:00 |
|
fan
|
2bd741d4ab
|
大铁操作调整
|
2021-04-25 10:09:43 +08:00 |
|
fan
|
b26d17f607
|
信号机状态调整
|
2021-04-23 18:11:07 +08:00 |
|
fan
|
13e0f107f0
|
后端状态转译
|
2021-04-23 17:43:45 +08:00 |
|
fan
|
87daa342d6
|
query newApi 判断调整
|
2021-04-23 15:14:10 +08:00 |
|
fan
|
c6f5f84d77
|
query测试
|
2021-04-23 15:01:04 +08:00 |
|
fan
|
bd2165ff35
|
大铁仿真调整
|
2021-04-23 14:11:29 +08:00 |
|
fan
|
4fcaffae50
|
大铁仿真调整
|
2021-04-23 10:24:05 +08:00 |
|
fan
|
6f06822793
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-23 09:01:26 +08:00 |
|
fan
|
7379945c42
|
大铁仿真调整
|
2021-04-23 09:01:12 +08:00 |
|
sunzhenyu
|
cf930c1e72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-22 18:08:05 +08:00 |
|
sunzhenyu
|
e9b9345e95
|
增加三维课程播放器，增加第一人称控制碰撞检测，完善编辑器数据
|
2021-04-22 18:07:56 +08:00 |
|
joylink_cuiweidong
|
e1757e4114
|
代码调整
|
2021-04-22 11:30:07 +08:00 |
|
joylink_cuiweidong
|
7ef86d0517
|
代码调整
|
2021-04-22 10:52:48 +08:00 |
|
joylink_cuiweidong
|
40909b073e
|
代码调整
|
2021-04-21 17:55:41 +08:00 |
|
fan
|
38199d0606
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-21 17:22:44 +08:00 |
|
joylink_cuiweidong
|
5039c09c16
|
样式调整
|
2021-04-21 17:19:25 +08:00 |
|
fan
|
863e383311
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-21 16:06:43 +08:00 |
|
joylink_cuiweidong
|
54ec91a835
|
添加 修改检查配置接口
|
2021-04-21 15:46:37 +08:00 |
|
joylink_cuiweidong
|
70e9ab6a87
|
代码调整
|
2021-04-21 15:25:08 +08:00 |
|
fan
|
045840e109
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-21 15:20:12 +08:00 |
|
joylink_cuiweidong
|
62698088d8
|
代码调整
|
2021-04-21 15:19:32 +08:00 |
|
joylink_cuiweidong
|
97a07bb70e
|
大铁 进路删除 代码调整
|
2021-04-21 15:17:27 +08:00 |
|
fan
|
e068496c75
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-21 15:02:38 +08:00 |
|
joylink_cuiweidong
|
6fe2bf0aca
|
大铁 进路预览代码调整
|
2021-04-21 14:40:44 +08:00 |
|
joylink_cuiweidong
|
d13292b8f1
|
大铁线路 进路预览代码调整
|
2021-04-21 13:40:37 +08:00 |
|
fan
|
a29de2d3da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-21 10:44:24 +08:00 |
|
fan
|
16fb67127b
|
信号按钮名称显示调整
|
2021-04-21 10:44:15 +08:00 |
|
joylink_cuiweidong
|
af13800539
|
大铁线路 进路添加代码调整
|
2021-04-21 09:20:48 +08:00 |
|
fan
|
3ba2f8ac5b
|
merge
|
2021-04-20 17:29:32 +08:00 |
|
fan
|
0226042942
|
宁波三Bug调整
|
2021-04-20 17:25:27 +08:00 |
|
joylink_cuiweidong
|
852d53f4a4
|
代码调整
|
2021-04-19 17:54:13 +08:00 |
|
joylink_cuiweidong
|
dfb80a8eb2
|
代码调整
|
2021-04-19 09:31:07 +08:00 |
|
joylink_cuiweidong
|
48c91eb1a9
|
信号机按钮绘图代码调整
|
2021-04-16 18:06:12 +08:00 |
|
joylink_cuiweidong
|
1ffac1ba84
|
代码调整
|
2021-04-16 17:46:07 +08:00 |
|
joylink_cuiweidong
|
ce1ca02392
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 17:21:58 +08:00 |
|
joylink_cuiweidong
|
d1a177827d
|
大铁项目 添加进路 代码调整
|
2021-04-16 17:21:15 +08:00 |
|
fan
|
937689b177
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 16:51:58 +08:00 |
|
fan
|
0fc9c03d2b
|
宁波三信号右键菜单
|
2021-04-16 16:51:42 +08:00 |
|
joylink_cuiweidong
|
e554ff45b7
|
代码调整
|
2021-04-16 16:36:17 +08:00 |
|
joylink_cuiweidong
|
388f85c3db
|
代码调整
|
2021-04-16 16:26:58 +08:00 |
|
joylink_cuiweidong
|
a3dff96e73
|
大铁 项目 添加进路 代码调整
|
2021-04-16 15:59:08 +08:00 |
|
joylink_cuiweidong
|
3ba63c65ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 14:22:48 +08:00 |
|
joylink_cuiweidong
|
84169141ab
|
大铁 指示灯 代码调整
|
2021-04-16 14:22:29 +08:00 |
|
sunzhenyu
|
93af07c20e
|
修改单体设备亮灯逻辑
|
2021-04-16 13:29:25 +08:00 |
|
sunzhenyu
|
3440daf55e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 13:19:07 +08:00 |
|
sunzhenyu
|
72d0bb084f
|
修改三维单体设备信号机亮灯逻辑，修改三维课程编辑播放器
|
2021-04-16 13:18:59 +08:00 |
|
joylink_cuiweidong
|
ad03a0a2bf
|
信号机代码调整
|
2021-04-16 10:56:36 +08:00 |
|
joylink_cuiweidong
|
0de0206192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 09:48:35 +08:00 |
|
joylink_cuiweidong
|
91190c6dc3
|
代码调整
|
2021-04-16 09:48:03 +08:00 |
|
ival
|
14fd6c1a40
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-15 18:15:20 +08:00 |
|
ival
|
14f718ec1a
|
增加指示器显示
|
2021-04-15 18:15:12 +08:00 |
|
joylink_cuiweidong
|
b5b9b493e7
|
代码调整
|
2021-04-15 18:07:51 +08:00 |
|
fan
|
3508380dd1
|
宁波三信号右键按钮
|
2021-04-15 17:51:23 +08:00 |
|
joylink_cuiweidong
|
957f6b08d2
|
代码调整
|
2021-04-15 17:21:18 +08:00 |
|
joylink_cuiweidong
|
06635467a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-15 17:13:08 +08:00 |
|
joylink_cuiweidong
|
16294b6373
|
代码调整
|
2021-04-15 17:12:41 +08:00 |
|
ival
|
b75483ded0
|
删除无用打印
|
2021-04-15 16:30:28 +08:00 |
|
ival
|
f1f2013b27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-15 16:26:19 +08:00 |
|
ival
|
d903ce7fb7
|
增加区段的脱轨其设备
|
2021-04-15 16:26:12 +08:00 |
|
joylink_cuiweidong
|
d3b240989b
|
代码调整
|
2021-04-15 16:15:18 +08:00 |
|
joylink_cuiweidong
|
bb928cb37b
|
代码调整
|
2021-04-15 15:55:30 +08:00 |
|
joylink_cuiweidong
|
4050ddf937
|
大铁进路添加 代码调整
|
2021-04-15 15:53:34 +08:00 |
|
joylink_cuiweidong
|
bebac3b8e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 17:48:55 +08:00 |
|
joylink_cuiweidong
|
9233b651f6
|
代码调整
|
2021-04-14 17:48:28 +08:00 |
|
sunzhenyu
|
2412aac899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 17:35:46 +08:00 |
|
sunzhenyu
|
63f935616d
|
修改三维课程编辑器事件和图片资源部分
|
2021-04-14 17:35:41 +08:00 |
|
joylink_cuiweidong
|
8d763d00e4
|
运行图编制代码调整
|
2021-04-14 16:43:09 +08:00 |
|
joylink_cuiweidong
|
1a7786dd14
|
运行图编制 代码调整
|
2021-04-14 15:30:52 +08:00 |
|
joylink_cuiweidong
|
63855ca1ff
|
运行图编制代码调整
|
2021-04-14 15:17:34 +08:00 |
|
joylink_cuiweidong
|
a1342ed2b6
|
运行图代码调整
|
2021-04-14 14:36:33 +08:00 |
|
joylink_cuiweidong
|
448832293b
|
运行图代码调整
|
2021-04-14 14:26:00 +08:00 |
|
joylink_cuiweidong
|
c9985869f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 13:58:33 +08:00 |
|
joylink_cuiweidong
|
ae263b0dc7
|
运行图样式调整
|
2021-04-14 13:57:35 +08:00 |
|
ival
|
86ad53cfe9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 13:55:30 +08:00 |
|
ival
|
22ddd9f722
|
修改代码
|
2021-04-14 13:55:16 +08:00 |
|
joylink_cuiweidong
|
eadb7a5748
|
大铁线路 车站绘图元素添加
|
2021-04-14 10:24:57 +08:00 |
|
sunzhenyu
|
2d767c4097
|
修改三维课程编辑初始界面
|
2021-04-14 09:22:55 +08:00 |
|
sunzhenyu
|
c9b7d18e43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 09:13:02 +08:00 |
|
sunzhenyu
|
f1ab1f9819
|
三维课程编辑测试展示(未完成)
|
2021-04-14 09:12:53 +08:00 |
|
joylink_cuiweidong
|
6b4bdbc8fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 18:24:59 +08:00 |
|
joylink_cuiweidong
|
ea834dc86a
|
大铁项目 区段状态代码调整
|
2021-04-13 18:24:41 +08:00 |
|
fan
|
8575de2bd9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 18:09:52 +08:00 |
|
fan
|
0b5cc8e15d
|
信号按钮调整
|
2021-04-13 18:09:37 +08:00 |
|
ival
|
821d0b28e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 17:37:48 +08:00 |
|
ival
|
693938a367
|
调整 打铁 道岔状态皮肤配置
|
2021-04-13 17:37:40 +08:00 |
|
joylink_cuiweidong
|
bc83661f1f
|
大铁线路 区段状态代码调整
|
2021-04-13 17:23:12 +08:00 |
|
joylink_cuiweidong
|
58d7f9233e
|
大铁 区段状态代码调整
|
2021-04-13 17:06:13 +08:00 |
|
ival
|
68cad1616a
|
删除无用代码
|
2021-04-13 15:48:01 +08:00 |
|
ival
|
584852038c
|
增加大铁仿真display
# Conflicts:
# src/iscs_new/plugins/shapeBuilder/entry.vue
|
2021-04-13 15:47:49 +08:00 |
|
joylink_cuiweidong
|
de4691da44
|
代码调整
|
2021-04-13 15:40:35 +08:00 |
|
joylink_cuiweidong
|
bd5a46e9dc
|
代码调整
|
2021-04-13 15:17:09 +08:00 |
|
joylink_cuiweidong
|
7eb6725147
|
代码调整
|
2021-04-13 14:27:33 +08:00 |
|
fan
|
e239f1e8c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 14:10:30 +08:00 |
|
fan
|
8a363c068a
|
大铁调整
|
2021-04-13 14:10:20 +08:00 |
|
joylink_cuiweidong
|
259ee2570a
|
添加帮助链接地址
|
2021-04-13 14:06:24 +08:00 |
|
fan
|
0bb06fd142
|
大铁调整
|
2021-04-13 13:52:39 +08:00 |
|
fan
|
34859f8f51
|
大铁调整
|
2021-04-13 13:50:24 +08:00 |
|
fan
|
0adef8a9c9
|
宁波三调整
|
2021-04-13 13:43:56 +08:00 |
|
sunzhenyu
|
3aa47086a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 11:03:25 +08:00 |
|
sunzhenyu
|
36b203746b
|
修改三维沙盘特殊车站加载
|
2021-04-13 11:02:16 +08:00 |
|
fan
|
75e7c00957
|
地图分组管理
|
2021-04-13 10:15:11 +08:00 |
|
fan
|
22c6924db8
|
宁波三操作调整
|
2021-04-12 18:58:40 +08:00 |
|
fan
|
5fbe0161ac
|
宁波三操作调整
|
2021-04-12 18:55:26 +08:00 |
|
fan
|
cbb02621d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-12 18:19:58 +08:00 |
|
fan
|
7901886d3b
|
宁波三操作调整
|
2021-04-12 18:19:52 +08:00 |
|
fan
|
8d5de4cc1a
|
地图分组管理
|
2021-04-12 18:09:49 +08:00 |
|
ival
|
dde06f834d
|
修改语言校验页面
|
2021-04-12 17:11:36 +08:00 |
|
fan
|
904d84e8ab
|
语音
|
2021-04-12 14:56:21 +08:00 |
|
fan
|
c81be6f866
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-12 13:29:40 +08:00 |
|
fan
|
5ebfa5ce38
|
宁波三号线操作调整
|
2021-04-12 13:29:26 +08:00 |
|
sunzhenyu
|
f86c13ea86
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-09 18:21:45 +08:00 |
|
sunzhenyu
|
cea95f9d92
|
三维课程编辑器课程组件和数据结构修改，升级threejs版本
|
2021-04-09 18:21:24 +08:00 |
|
fan
|
51d2d32979
|
宁波三号线操作调整
|
2021-04-09 17:49:46 +08:00 |
|
fan
|
8e9afa9c9b
|
宁波三号线操作调整
|
2021-04-09 13:18:51 +08:00 |
|
fan
|
c58609528a
|
导入运行图调整
|
2021-04-08 17:55:35 +08:00 |
|
fan
|
7532c86e15
|
宁波三操作调整&导入运行图放开
|
2021-04-08 17:28:46 +08:00 |
|
fan
|
cd936dea42
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-07 17:15:06 +08:00 |
|
fan
|
f5e00dd717
|
宁波三列车操作调整
|
2021-04-07 17:14:54 +08:00 |
|
joylink_cuiweidong
|
5f9e6fe882
|
运行图编制代码调整
|
2021-04-07 14:21:26 +08:00 |
|
fan
|
2d5b863231
|
iscs Button hideType 赋值调整
|
2021-04-07 09:27:31 +08:00 |
|
fan
|
9a84b61e5a
|
ISCS调整
|
2021-04-06 17:48:33 +08:00 |
|
ival
|
a8ec3f1d79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-06 16:01:23 +08:00 |
|
ival
|
a215004143
|
修改代码
|
2021-04-06 16:01:14 +08:00 |
|
fan
|
17995e2f40
|
取消mfa等故障状态add
|
2021-04-06 15:05:54 +08:00 |
|
fan
|
dd2722180d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-06 09:44:08 +08:00 |
|
fan
|
924e6154a3
|
南京十一站屏蔽门开启影响站停时间显示调整
|
2021-04-06 09:43:45 +08:00 |
|
sunzhenyu
|
fb00e1418e
|
修改三维课程存读
|
2021-04-02 18:05:19 +08:00 |
|
sunzhenyu
|
a9745eb709
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-02 15:49:32 +08:00 |
|
sunzhenyu
|
1cab2116d6
|
三维课程代码，修改课程组件间逻辑，修改课程数据结构。(未实装)
|
2021-04-02 15:49:24 +08:00 |
|
fan
|
4a037c0e77
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-02 09:58:56 +08:00 |
|
fan
|
fc861b1c70
|
组织管理调整
|
2021-04-02 09:58:45 +08:00 |
|
joylink_cuiweidong
|
f8bebd192e
|
南京二号线 封锁岔心 状态代码跳转
|
2021-04-01 17:31:19 +08:00 |
|
fan
|
baf424cfad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 16:37:25 +08:00 |
|
fan
|
a5b3f9cf04
|
组织管理调整
|
2021-04-01 16:28:30 +08:00 |
|
joylink_cuiweidong
|
81ecf0ac20
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 10:59:05 +08:00 |
|
joylink_cuiweidong
|
fcf7d1b8ee
|
运行图代码调整
|
2021-04-01 10:58:41 +08:00 |
|
fan
|
f1824ad324
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 09:59:11 +08:00 |
|
fan
|
f327889bca
|
组织管理调整
|
2021-04-01 09:59:01 +08:00 |
|
joylink_cuiweidong
|
45c51157a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 09:42:12 +08:00 |
|
joylink_cuiweidong
|
618d975d68
|
运行图编制 代码调整
|
2021-04-01 09:41:14 +08:00 |
|
fan
|
0253e6e590
|
组织管理调整
|
2021-03-31 18:27:29 +08:00 |
|
fan
|
887edee9e6
|
考试系统按钮位置调整
|
2021-03-31 09:35:51 +08:00 |
|
fan
|
30bf7487ae
|
试卷编辑调整
|
2021-03-31 09:31:50 +08:00 |
|
fan
|
076c7192ec
|
教学管理调整
|
2021-03-30 18:07:45 +08:00 |
|
fan
|
1d50b1582d
|
BUG：208、209、210
|
2021-03-30 15:51:15 +08:00 |
|
fan
|
28d092401e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 15:23:48 +08:00 |
|
fan
|
d42579479b
|
教学管理问题调整
|
2021-03-30 15:23:37 +08:00 |
|
joylink_cuiweidong
|
0c407dbfa9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 14:59:09 +08:00 |
|
joylink_cuiweidong
|
b78454781b
|
运行图编制 添加任务/修改任务 代码调整
|
2021-03-30 14:58:51 +08:00 |
|
fan
|
51bce2825e
|
教学管理问题调整
|
2021-03-30 14:49:47 +08:00 |
|
fan
|
0968bcfa9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 14:31:43 +08:00 |
|
fan
|
d8462bb404
|
教学管理问题调整
|
2021-03-30 14:31:25 +08:00 |
|
joylink_cuiweidong
|
4713f1d30f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 11:26:45 +08:00 |
|
joylink_cuiweidong
|
0fb623ef59
|
运行图编制 折返数据解析 代码调整
|
2021-03-30 11:26:25 +08:00 |
|
fan
|
692c9f0c03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 10:41:48 +08:00 |
|
fan
|
894dc96ea5
|
教学管理问题调整
|
2021-03-30 10:41:27 +08:00 |
|
joylink_cuiweidong
|
770bdff791
|
代码调整
|
2021-03-30 09:59:51 +08:00 |
|
joylink_cuiweidong
|
65595cbe85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 09:57:35 +08:00 |
|
joylink_cuiweidong
|
09b2923126
|
iscs 代码调整
|
2021-03-30 09:57:05 +08:00 |
|
fan
|
def94fee3e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-29 18:05:30 +08:00 |
|
fan
|
d0f756ed2f
|
BUG202\200:成绩查询页面点击重置报错;删除课程的提示需要修改
|
2021-03-29 18:05:22 +08:00 |
|
joylink_cuiweidong
|
14b98e0e3e
|
代码调整
|
2021-03-29 17:34:57 +08:00 |
|
joylink_cuiweidong
|
7521b8f2db
|
iscs 代码调整
|
2021-03-29 17:33:31 +08:00 |
|
fan
|
c4ae02df0d
|
BUG196:进入其他用户创建的班级的学生管理界面，建议删除导入模板下载
|
2021-03-29 17:08:45 +08:00 |
|
fan
|
ac56715942
|
课程详情调整
|
2021-03-29 17:07:14 +08:00 |
|
fan
|
1395beacb8
|
考试调整
|
2021-03-29 16:17:52 +08:00 |
|
fan
|
577fc1444f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-29 15:01:56 +08:00 |
|
fan
|
64a673419b
|
考试调整
|
2021-03-29 15:01:43 +08:00 |
|
ival
|
3440c5ddc0
|
增加 圆
|
2021-03-29 15:00:02 +08:00 |
|
ival
|
a1fd2ed090
|
修改 福州door设备图层问题
|
2021-03-29 14:57:18 +08:00 |
|
joylink_cuiweidong
|
3c61302df1
|
代码调整
|
2021-03-29 13:13:35 +08:00 |
|
ival
|
99dd5f5877
|
删除 test分支的iscs_new的代码
|
2021-03-29 13:13:06 +08:00 |
|
ival
|
7456a19b3e
|
增加 门禁iscs背景图，以及iscs_new的部分代码
|
2021-03-29 13:09:51 +08:00 |
|
ival
|
45027796e7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-29 11:32:00 +08:00 |
|
ival
|
7ffff137b5
|
修改 删除生成计划的 滚动
|
2021-03-29 11:31:47 +08:00 |
|
fan
|
5090b14819
|
merge
|
2021-03-29 11:10:57 +08:00 |
|
fan
|
57f3b563fd
|
考试调整
|
2021-03-29 11:04:57 +08:00 |
|
fan
|
d3b4a73595
|
留言板调整
|
2021-03-29 11:04:18 +08:00 |
|
ival
|
3e3ca007e1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-29 11:00:44 +08:00 |
|
ival
|
2a66a7b2c6
|
修改代码
|
2021-03-29 11:00:24 +08:00 |
|
joylink_cuiweidong
|
0a796d4218
|
运行图编制 代码调整
|
2021-03-29 10:09:33 +08:00 |
|
joylink_cuiweidong
|
ea85ed29ae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-26 16:09:44 +08:00 |
|
ival
|
83c630bfc7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2021-03-26 16:09:05 +08:00 |
|
joylink_cuiweidong
|
c22b59733a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-26 16:08:43 +08:00 |
|
ival
|
6f0eca2503
|
修改 iscs加载的问题
|
2021-03-26 16:08:39 +08:00 |
|
joylink_cuiweidong
|
ce79c12b7d
|
代码调整
|
2021-03-26 16:08:21 +08:00 |
|
fan
|
ab49d70a61
|
教学管理返回按钮调整
|
2021-03-26 13:31:12 +08:00 |
|
fan
|
c519f74189
|
教学管理问题调整
|
2021-03-26 13:09:56 +08:00 |
|
fan
|
a70597a267
|
教学管理问题调整
|
2021-03-25 20:01:21 +08:00 |
|
fan
|
0607e63d37
|
教学管理问题调整
|
2021-03-25 19:46:02 +08:00 |
|
fan
|
a267b1b64f
|
教学管理问题调整
|
2021-03-25 18:34:41 +08:00 |
|
fan
|
81d30804bb
|
教学管理问题调整
|
2021-03-25 17:38:46 +08:00 |
|
fan
|
c0add0cf1a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-25 16:08:53 +08:00 |
|
fan
|
bffb689e72
|
教学管理调整
|
2021-03-25 16:08:44 +08:00 |
|
joylink_cuiweidong
|
04ec5432d9
|
运行图编制代码调整
|
2021-03-25 15:18:58 +08:00 |
|
joylink_cuiweidong
|
c541e62be4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 15:07:34 +08:00 |
|
joylink_cuiweidong
|
f8d7ad88bb
|
运行图编制 代码调整
|
2021-03-25 15:07:14 +08:00 |
|
fan
|
c1580ca6ea
|
应用处班级添加提示文字
|
2021-03-25 15:00:30 +08:00 |
|
fan
|
6ea5a3e3aa
|
url
|
2021-03-25 14:11:57 +08:00 |
|
ival
|
d6e24e40fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 14:10:24 +08:00 |
|
ival
|
ba51c50417
|
修改代码
|
2021-03-25 14:10:18 +08:00 |
|
fan
|
19421566de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-25 14:09:38 +08:00 |
|
fan
|
159aec918f
|
教学管理调整
|
2021-03-25 14:09:03 +08:00 |
|
joylink_cuiweidong
|
8a8cc8e04c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 13:39:51 +08:00 |
|
joylink_cuiweidong
|
ccc4970a1a
|
运行图编制 生成计划 获取交路代码调整
|
2021-03-25 13:39:28 +08:00 |
|
ival
|
988f879d46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsDraw/icscComponents/picture.vue
|
2021-03-25 13:20:26 +08:00 |
|
ival
|
85f73964d3
|
调整iscs站厅子图顺序
|
2021-03-25 13:19:28 +08:00 |
|
fan
|
0d57d977a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-25 13:07:34 +08:00 |
|
ival
|
ee7453d5cd
|
修改 站厅子图列表
|
2021-03-25 13:08:03 +08:00 |
|
fan
|
5106ae8d14
|
meger
|
2021-03-25 13:07:02 +08:00 |
|
fan
|
7dc0535ecf
|
教学管理调整
|
2021-03-25 13:05:30 +08:00 |
|
fan
|
a3d6dc727f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-25 13:03:27 +08:00 |
|
fan
|
1c85c5a502
|
教学管理调整
|
2021-03-25 13:03:12 +08:00 |
|
ival
|
d8d3b64dcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 11:31:40 +08:00 |
|
ival
|
1ba979c02c
|
增加 iscs站厅资源
|
2021-03-25 11:31:31 +08:00 |
|
joylink_cuiweidong
|
7619d9097e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 10:38:55 +08:00 |
|
joylink_cuiweidong
|
ca3f01104e
|
运行图编制 代码调整
|
2021-03-25 10:38:36 +08:00 |
|
ival
|
74b260782d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 09:22:17 +08:00 |
|
ival
|
1eef45efe4
|
注释代码
|
2021-03-25 09:22:07 +08:00 |
|
joylink_cuiweidong
|
9984b13759
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 09:15:37 +08:00 |
|
joylink_cuiweidong
|
76fccbc643
|
运行图编制 生成计划 代码调整
|
2021-03-25 09:15:07 +08:00 |
|
fan
|
caafa7578b
|
iscs添加设备图片
|
2021-03-24 15:00:45 +08:00 |
|
fan
|
022b946592
|
iscs添加背景图片
|
2021-03-24 14:12:35 +08:00 |
|
fan
|
b93daf1f8e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-24 13:50:26 +08:00 |
|
fan
|
6cca650a98
|
教学管理调整
|
2021-03-24 13:49:59 +08:00 |
|
ival
|
dd1fb890ad
|
修改 运行图 修改接口
|
2021-03-24 13:30:26 +08:00 |
|
ival
|
fd5716925b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-24 11:09:16 +08:00 |
|
ival
|
833117dc45
|
1.修改 运行图 接口
2.增加 iscs 资源
|
2021-03-24 11:09:02 +08:00 |
|
joylink_cuiweidong
|
213e654abc
|
iscs 代码调整
|
2021-03-23 18:20:06 +08:00 |
|
joylink_cuiweidong
|
d62d6ba815
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsSystem/stationConfig/index.vue
|
2021-03-23 18:19:47 +08:00 |
|
joylink_cuiweidong
|
6db9593a40
|
iscs 代码调整
|
2021-03-23 18:17:54 +08:00 |
|
fan
|
aed6392c88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-23 17:52:42 +08:00 |
|
fan
|
ebb618e053
|
iscs自动售检票
|
2021-03-23 17:52:32 +08:00 |
|
joylink_cuiweidong
|
5c5366e46a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 17:52:11 +08:00 |
|
joylink_cuiweidong
|
9c31d4963c
|
iscs 代码调整
|
2021-03-23 17:51:36 +08:00 |
|
ival
|
04444b2b12
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 17:35:50 +08:00 |
|
ival
|
27e938c102
|
修改 复制iscs图形 生成codebug的问题
|
2021-03-23 17:35:42 +08:00 |
|
fan
|
7a3677cf8f
|
调整感温光纤探测系统高度
|
2021-03-23 17:24:48 +08:00 |
|
fan
|
2f4cd5569a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-23 17:14:17 +08:00 |
|
joylink_cuiweidong
|
0796a12dd7
|
iscs 代码调整
|
2021-03-23 17:12:19 +08:00 |
|
fan
|
65dfe7d570
|
url调整
|
2021-03-23 17:12:18 +08:00 |
|
joylink_cuiweidong
|
f749aa6709
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 16:42:21 +08:00 |
|
joylink_cuiweidong
|
cbedee3c3b
|
iscs 代码调整
|
2021-03-23 16:42:06 +08:00 |
|
joylink_cuiweidong
|
9398ccfa7c
|
iSCS 代码调整
|
2021-03-23 16:41:40 +08:00 |
|
fan
|
c146dacecb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-23 15:55:38 +08:00 |
|
fan
|
7a5e1bf701
|
评价规则调整
|
2021-03-23 15:55:23 +08:00 |
|
ival
|
160cbaf2bf
|
增加 iscs 火灾 展厅和站台 背景图
|
2021-03-23 15:29:42 +08:00 |
|
fan
|
c6cfa2d816
|
merge
|
2021-03-23 11:08:11 +08:00 |
|
fan
|
e38b236aed
|
教学管理暂提
|
2021-03-23 11:06:14 +08:00 |
|
ival
|
09ec3247ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 10:42:01 +08:00 |
|
ival
|
fcc8cbf988
|
修改iscs
|
2021-03-23 10:41:47 +08:00 |
|
joylink_cuiweidong
|
393f3fe68a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 10:37:14 +08:00 |
|
joylink_cuiweidong
|
43e0379926
|
运行图编制 生成计划 界面调整
|
2021-03-23 10:36:56 +08:00 |
|
ival
|
050141025a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-22 18:40:41 +08:00 |
|
ival
|
a63b8e0179
|
增加iscs图样
|
2021-03-22 18:40:29 +08:00 |
|
joylink_cuiweidong
|
ba18a549fb
|
运行图编制 生成计划代码调整
|
2021-03-22 17:39:12 +08:00 |
|
joylink_cuiweidong
|
b383815100
|
地图绘制 交路预览 显示代码调整
|
2021-03-22 16:04:33 +08:00 |
|
joylink_cuiweidong
|
7e80c71fef
|
代码调整
|
2021-03-22 15:49:14 +08:00 |
|
joylink_cuiweidong
|
74c5764087
|
代码调整
|
2021-03-22 15:30:10 +08:00 |
|
joylink_cuiweidong
|
7ac00f45dc
|
运行图编制 代码调整
|
2021-03-22 15:12:34 +08:00 |
|
joylink_cuiweidong
|
42b59cc752
|
代码调整
|
2021-03-22 14:51:34 +08:00 |
|
joylink_cuiweidong
|
9b4309d0c1
|
代码调整
|
2021-03-22 14:38:19 +08:00 |
|
joylink_cuiweidong
|
2dae1bc8d8
|
代码调整
|
2021-03-22 14:30:21 +08:00 |
|
joylink_cuiweidong
|
26b72f9228
|
代码调整
|
2021-03-22 13:20:51 +08:00 |
|
joylink_cuiweidong
|
e945d654eb
|
代码调整
|
2021-03-22 13:16:07 +08:00 |
|
sunzhenyu
|
2ce3d41cad
|
mergetest
|
2021-03-19 18:14:58 +08:00 |
|
sunzhenyu
|
d22f9d62de
|
新三维客流逻辑基本完成(未实装)
|
2021-03-19 18:14:21 +08:00 |
|
fan
|
82fe1f3dc9
|
权重藐视调整
|
2021-03-19 17:34:37 +08:00 |
|
fan
|
6e6e6ac31d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-19 17:20:30 +08:00 |
|
fan
|
f3aed3f16e
|
评价规则创建调整
|
2021-03-19 17:20:22 +08:00 |
|
ival
|
c2a9a73f28
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-19 17:14:22 +08:00 |
|
ival
|
7625666431
|
调整成都01，显示车站为等间距
|
2021-03-19 17:14:14 +08:00 |
|
fan
|
268ae6ad88
|
评价结果展示调整
|
2021-03-19 16:47:06 +08:00 |
|
fan
|
061df7a389
|
评价规则管理宽度调整
|
2021-03-19 16:27:44 +08:00 |
|
fan
|
5732f85453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-19 16:17:23 +08:00 |
|
fan
|
36e9d7c6bd
|
课程管理调整
|
2021-03-19 16:17:01 +08:00 |
|
ival
|
ffb4dbbba3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-19 16:11:55 +08:00 |
|
ival
|
9dabd1604f
|
注释同济运行图中不用模块
|
2021-03-19 16:11:45 +08:00 |
|
fan
|
efee6ddfc4
|
merge
|
2021-03-19 15:55:05 +08:00 |
|
fan
|
44b2c5d0f8
|
教学管理调整
|
2021-03-19 15:49:05 +08:00 |
|
joylink_cuiweidong
|
3230f15415
|
代码调整
|
2021-03-19 14:50:52 +08:00 |
|
joylink_cuiweidong
|
5e271d3320
|
运行图代码调整
|
2021-03-19 14:49:33 +08:00 |
|
joylink_cuiweidong
|
8acee05b38
|
运行图代码调整
|
2021-03-19 13:38:53 +08:00 |
|
joylink_cuiweidong
|
82f8db41d1
|
运行图 代码调整
|
2021-03-19 13:23:58 +08:00 |
|
joylink_cuiweidong
|
70260cfbe3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-19 11:19:00 +08:00 |
|
joylink_cuiweidong
|
5fdf48b7ab
|
运行图 代码调整
|
2021-03-19 11:18:37 +08:00 |
|
ival
|
d7e068c79d
|
修改引入文件路径问题
|
2021-03-19 11:02:40 +08:00 |
|
ival
|
12f6bae8e5
|
解决冲突
|
2021-03-19 10:52:57 +08:00 |
|
ival
|
1b2abcffb3
|
Merge branch 'test-ival' into test
# Conflicts:
# src/permission.js
# src/views/demo/index.vue
# src/views/newMap/displayNew/demoTraining/index.vue
# src/views/newMap/displayNew/lesson/index.vue
|
2021-03-19 10:15:43 +08:00 |
|
ival
|
a1b6201f9b
|
新增文件
|
2021-03-19 10:11:33 +08:00 |
|
ival
|
d03315f8fd
|
重构运行图解析代码逻辑
|
2021-03-19 10:10:51 +08:00 |
|
joylink_cuiweidong
|
1383dfbee3
|
运行图 代码调整
|
2021-03-18 18:46:52 +08:00 |
|
joylink_cuiweidong
|
e603837d9c
|
运行图代码调整
|
2021-03-18 17:52:19 +08:00 |
|
joylink_cuiweidong
|
e49d7c8ef8
|
代码调整
|
2021-03-18 16:30:28 +08:00 |
|
joylink_cuiweidong
|
f8860eba00
|
demo 代码调整
|
2021-03-18 15:58:27 +08:00 |
|
joylink_cuiweidong
|
07f477ae54
|
运行图代码调整
|
2021-03-18 15:05:56 +08:00 |
|
joylink_cuiweidong
|
b0a04a9dec
|
Merge remote-tracking branch 'remotes/origin/test_newRunplan' into test
|
2021-03-18 15:02:03 +08:00 |
|
joylink_cuiweidong
|
f3c5feefcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-18 15:01:30 +08:00 |
|
joylink_cuiweidong
|
d4a6aa1cb2
|
demo 代码调整
|
2021-03-18 15:01:13 +08:00 |
|
fan
|
700928ed22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-18 11:21:17 +08:00 |
|
fan
|
23d8feb8b7
|
按钮顺序调整
|
2021-03-18 11:21:00 +08:00 |
|
joylink_cuiweidong
|
816fa77d79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-18 11:13:01 +08:00 |
|
joylink_cuiweidong
|
5336a1899e
|
demo 修改
|
2021-03-18 11:12:31 +08:00 |
|
fan
|
36aee735a8
|
设备检测登录调整
|
2021-03-18 10:57:33 +08:00 |
|
fan
|
12698a808b
|
设备检测登录调整
|
2021-03-18 10:25:41 +08:00 |
|
fan
|
52898a24ac
|
仿真按钮样式调整
|
2021-03-18 09:35:45 +08:00 |
|
fan
|
e875fa92fc
|
教学管理暂提
|
2021-03-18 09:03:15 +08:00 |
|
ival
|
b4bf5114c6
|
demo
|
2021-03-17 18:07:49 +08:00 |
|
ival
|
43b6ebaa37
|
demo
|
2021-03-17 18:06:45 +08:00 |
|
ival
|
520c95a00c
|
增加demo
|
2021-03-17 17:51:22 +08:00 |
|
ival
|
666ad3f7d9
|
增加demo
|
2021-03-17 17:50:17 +08:00 |
|
ival
|
e183f40611
|
提交代码
|
2021-03-17 13:35:15 +08:00 |
|
ival
|
94bb1a0395
|
修改运行图代码代码
|
2021-03-17 10:15:21 +08:00 |
|
joylink_cuiweidong
|
df2ff455d3
|
运行图代码调整
|
2021-03-17 09:36:00 +08:00 |
|
joylink_cuiweidong
|
f21d270cf5
|
地图数据 交路预览页面调整
|
2021-03-17 09:33:19 +08:00 |
|
ival
|
e38bca7ff8
|
运行图 任务修改弹窗，显示描述的问题
|
2021-03-17 09:13:19 +08:00 |
|
ival
|
01d166a9c9
|
修改定位偏差的问题
|
2021-03-17 09:05:28 +08:00 |
|
fan
|
7da708858d
|
教学管理暂提
|
2021-03-16 19:06:25 +08:00 |
|
ival
|
64f38e7091
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-16 18:24:08 +08:00 |
|
ival
|
2480a8b110
|
迁移以前的运行图到同济新版
|
2021-03-16 18:23:56 +08:00 |
|
joylink_cuiweidong
|
e5047e1e16
|
运行图代码调整
|
2021-03-16 18:06:31 +08:00 |
|
joylink_cuiweidong
|
553ec75fd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-16 17:43:44 +08:00 |
|
joylink_cuiweidong
|
76dcd271d9
|
代码调整
|
2021-03-16 17:43:22 +08:00 |
|
ival
|
0985a6f1df
|
修改运行图表单名称
|
2021-03-16 11:14:52 +08:00 |
|
ival
|
1ad9ea0cb7
|
修改运行图菜单名称
|
2021-03-16 09:55:28 +08:00 |
|
ival
|
b678416593
|
修改 隐藏
|
2021-03-16 09:52:45 +08:00 |
|
ival
|
72281db3a8
|
隐藏 生成仅环路计划
|
2021-03-16 09:28:00 +08:00 |
|
ival
|
c11568348f
|
优化代码
|
2021-03-15 21:15:03 +08:00 |
|
ival
|
c44c2a0e0c
|
暂存文件
|
2021-03-15 19:23:33 +08:00 |
|
ival
|
13f3302cfc
|
修改新版运行图显示的问题
|
2021-03-15 17:32:12 +08:00 |
|
ival
|
d5d9b91cb4
|
创建运行图 出库数据，环路数据，进库数据页面操作时，过滤显示的问题
|
2021-03-15 17:31:47 +08:00 |
|
ival
|
1cc4cebb27
|
任务：运行图编辑工具
问题：优化生成计划的操作以及menubar的页面描述
|
2021-03-15 14:34:24 +08:00 |
|
sunzhenyu
|
ab6acbc7d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-15 10:56:45 +08:00 |
|
sunzhenyu
|
b2b669df66
|
修改三维客流
|
2021-03-15 10:56:37 +08:00 |
|
ival
|
fa73c7c365
|
修改进路 控制显示的条件
|
2021-03-15 10:43:08 +08:00 |
|
ival
|
b400f78fe5
|
线路：新版运行图编辑功能部分接口和界面调整
|
2021-03-15 09:59:52 +08:00 |
|
|
|
37e98a7d57
|
89版本问题
|
2021-03-13 00:20:59 +08:00 |
|
|
|
b92c8cafdc
|
Revert "清除chrome89版本 windowopen 的noopener参数打不开的问题"
This reverts commit 2e442e6e8c.
# Conflicts:
# src/views/newMap/displayNew/menuSchema.vue
# src/views/newMap/jlmapNew/index.vue
|
2021-03-13 00:15:32 +08:00 |
|
sunleking
|
7fa30c1a30
|
merge
|
2021-03-13 00:13:08 +08:00 |
|
sunleking
|
608d8b03f5
|
merge
|
2021-03-13 00:11:48 +08:00 |
|
sunleking
|
2e442e6e8c
|
清除chrome89版本 windowopen 的noopener参数打不开的问题
|
2021-03-13 00:10:55 +08:00 |
|
fan
|
e97a5a88a1
|
教学管理暂提
|
2021-03-12 18:44:43 +08:00 |
|
ival
|
a2103b0486
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-12 18:23:43 +08:00 |
|
ival
|
fa2c7c8297
|
线路：同济大学版本运行图功能样式调整
|
2021-03-12 18:23:32 +08:00 |
|
joylink_cuiweidong
|
80b67e7f94
|
运行图 代码调整
|
2021-03-12 17:18:02 +08:00 |
|
joylink_cuiweidong
|
40f6314b85
|
运行图编制 代码调整
|
2021-03-12 16:37:32 +08:00 |
|
joylink_cuiweidong
|
c3fec625e2
|
运行图编制 代码调整
|
2021-03-12 16:16:51 +08:00 |
|
joylink_cuiweidong
|
905e59c869
|
运行图编制 生成仅环路计划 代码调整
|
2021-03-12 16:00:23 +08:00 |
|
joylink_cuiweidong
|
8c05faab0a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-12 13:45:47 +08:00 |
|
joylink_cuiweidong
|
866b661c4f
|
南京二号线 岔心 绘图 代码调整
|
2021-03-12 13:45:14 +08:00 |
|
ival
|
150eeaaaba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-12 11:31:21 +08:00 |
|
ival
|
ef0915ea98
|
线路：宁波3
问题：调整实训流程
|
2021-03-12 11:31:11 +08:00 |
|
joylink_cuiweidong
|
83781ac67d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-12 10:43:17 +08:00 |
|
joylink_cuiweidong
|
6cac5cdf51
|
运行图编制 导入公共进路代码调整
|
2021-03-12 10:42:55 +08:00 |
|
ival
|
62c0bd160f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 18:31:01 +08:00 |
|
ival
|
50c206cad3
|
调整宁波3道岔封锁实训
|
2021-03-11 18:30:43 +08:00 |
|
fan
|
757c5d62df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 18:11:27 +08:00 |
|
fan
|
330e15c993
|
南京二号线menuBar放开
|
2021-03-11 18:11:08 +08:00 |
|
fan
|
32e7155fb0
|
教学管理暂提
|
2021-03-11 18:09:26 +08:00 |
|
sunzhenyu
|
1de6eda1a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 17:11:03 +08:00 |
|
sunzhenyu
|
9434928436
|
新版三维车站客流管理代码修改(未实装)
|
2021-03-11 17:10:50 +08:00 |
|
ival
|
8481e2d927
|
删除宁波3 无用文件
|
2021-03-11 15:35:41 +08:00 |
|
ival
|
1a1745d49c
|
增加宁波3 状态逻辑判断
|
2021-03-11 15:33:43 +08:00 |
|
ival
|
13c1cc6819
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 15:27:38 +08:00 |
|
ival
|
0f0b95cafb
|
增加 宁波3 menuBar operation定义
修改加载当日运行图界面没有显示运行图名称的问题
|
2021-03-11 15:27:30 +08:00 |
|
joylink_cuiweidong
|
29a4dfac76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 15:01:28 +08:00 |
|
joylink_cuiweidong
|
05ff67f546
|
南京二号线 岔心 通信车占用状态/非通信车占用状态 代码调整
|
2021-03-11 15:00:52 +08:00 |
|
ival
|
6c19a3ad2c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 13:44:50 +08:00 |
|
ival
|
414bd05d0c
|
优化实训过程中，点击空白menuBar被关掉的问题
|
2021-03-11 13:44:40 +08:00 |
|
fan
|
b620e0f3a3
|
iscs报错修改
|
2021-03-11 10:58:03 +08:00 |
|
ival
|
4d8f116f4d
|
优化
|
2021-03-11 09:27:46 +08:00 |
|
ival
|
dc8c74632d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 09:22:41 +08:00 |
|
ival
|
3fff0da60d
|
修改 数据库名称 为后端baseUrl的域名关键字
|
2021-03-11 09:22:30 +08:00 |
|
fan
|
8631b66be9
|
岔芯预复位报错调整
|
2021-03-11 09:17:57 +08:00 |
|
fan
|
659054f1fa
|
岔芯添加parentCode
|
2021-03-10 19:03:04 +08:00 |
|
fan
|
661adb9add
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 18:14:34 +08:00 |
|
fan
|
605d60b06c
|
岔芯添加parentCode
|
2021-03-10 18:14:12 +08:00 |
|
ival
|
81aa4d12c4
|
修改电子屏样式
|
2021-03-10 18:06:25 +08:00 |
|
ival
|
1ee6c29666
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 17:44:30 +08:00 |
|
ival
|
cfe979fce4
|
线路：宁波3
问题：调整页面样式
|
2021-03-10 17:40:43 +08:00 |
|
fan
|
b05ab63bc6
|
关联岔芯参数可删除
|
2021-03-10 17:28:09 +08:00 |
|
fan
|
56c6cebbfe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 17:18:51 +08:00 |
|
fan
|
d9d2e9b6cd
|
道岔计轴添加关联岔芯参数&宁波三排列进路到
|
2021-03-10 17:18:35 +08:00 |
|
joylink_cuiweidong
|
c986e22d53
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuBar.vue
|
2021-03-10 16:50:43 +08:00 |
|
ival
|
9991bf605d
|
增加确实窗口
|
2021-03-10 16:48:57 +08:00 |
|
joylink_cuiweidong
|
e8c7fbdfff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuBar.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
|
2021-03-10 16:48:26 +08:00 |
|
joylink_cuiweidong
|
96eef9053e
|
宁波三号线 菜单操作 代码调整
|
2021-03-10 16:39:53 +08:00 |
|
ival
|
3759386e1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 15:09:24 +08:00 |
|
ival
|
90bdb12e57
|
线路：宁波3
问题：优化初始化操作的事件模型
|
2021-03-10 15:09:15 +08:00 |
|
fan
|
0b361fd0fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 13:19:39 +08:00 |
|
fan
|
0bf5e348a0
|
岔芯不生成车次窗
|
2021-03-10 13:19:17 +08:00 |
|
fan
|
f9c9e25d08
|
登录路径错误调整
|
2021-03-10 10:31:16 +08:00 |
|
joylink_cuiweidong
|
4edb42bbbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 10:25:39 +08:00 |
|
joylink_cuiweidong
|
2146b28b9a
|
宁波三号线 运行线 代码调整
|
2021-03-10 10:25:05 +08:00 |
|
ival
|
1aa009075f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 18:37:31 +08:00 |
|
ival
|
0c98c06440
|
线路：宁波3
任务：修改带初始化的界面操作
|
2021-03-09 18:37:20 +08:00 |
|
joylink_cuiweidong
|
b434824d97
|
运行图编制 删除重复的页面
|
2021-03-09 17:11:58 +08:00 |
|
joylink_cuiweidong
|
208041fb24
|
运行图编制 删除暂时无用的文件
|
2021-03-09 16:50:38 +08:00 |
|
joylink_cuiweidong
|
e7c89ef4bf
|
运行图编制 删除暂时无用的文件
|
2021-03-09 16:35:40 +08:00 |
|
joylink_cuiweidong
|
b7a24387b4
|
运行图编制 删除无用与重复的文件
|
2021-03-09 16:11:27 +08:00 |
|
joylink_cuiweidong
|
ffe7214c11
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 15:58:16 +08:00 |
|
joylink_cuiweidong
|
ae948f80cc
|
删除多余的 运行图编制文件
|
2021-03-09 15:57:59 +08:00 |
|
fan
|
b2bb43b47f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 15:47:15 +08:00 |
|
fan
|
c9f656c4a7
|
西安一实训调整
|
2021-03-09 15:46:54 +08:00 |
|
joylink_cuiweidong
|
0e99302cf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 15:41:35 +08:00 |
|
joylink_cuiweidong
|
cb8e07863e
|
运行图代码调整
|
2021-03-09 15:41:05 +08:00 |
|
ival
|
c28be4acd7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 14:57:24 +08:00 |
|
ival
|
605280e7d5
|
1.宁波3号线 操作修正
2.运行图编辑修改数据计算错误的问题
|
2021-03-09 14:57:14 +08:00 |
|
joylink_cuiweidong
|
f89d557393
|
运行图代码调整
|
2021-03-09 14:55:03 +08:00 |
|
joylink_cuiweidong
|
b3af1646dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 14:46:07 +08:00 |
|
joylink_cuiweidong
|
d4aa841077
|
运行图代码调整
|
2021-03-09 14:45:50 +08:00 |
|
fan
|
f2a7955bf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 14:44:16 +08:00 |
|
fan
|
fd49034b57
|
南京十一站调整&添加线路配置switchTurnOperationCanRecoverSplitFault
|
2021-03-09 14:43:40 +08:00 |
|
joylink_cuiweidong
|
0ec4a64f5d
|
运行图编制 代码调整
|
2021-03-09 14:30:45 +08:00 |
|
joylink_cuiweidong
|
2afd703938
|
代码调整
|
2021-03-09 11:04:40 +08:00 |
|
joylink_cuiweidong
|
5352671383
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/planMonitor/editTool/menus/addTask.vue
|
2021-03-09 10:34:16 +08:00 |
|
joylink_cuiweidong
|
2a74ff0c48
|
运行图编制代码调整
|
2021-03-09 10:31:56 +08:00 |
|
ival
|
b1552ccba5
|
Merge remote-tracking branch 'remotes/origin/test-tj' into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuBar.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
|
2021-03-09 10:17:25 +08:00 |
|
ival
|
8febc0c1d1
|
线路：宁波3
问题：操作方式调整
|
2021-03-09 10:14:16 +08:00 |
|
ival
|
a62248d4a6
|
优化运行图代码，防止报错
|
2021-03-09 10:03:21 +08:00 |
|
ival
|
1a1fbbfd69
|
优化运行图计算
|
2021-03-09 09:33:05 +08:00 |
|
ival
|
d993771f72
|
线路：南京2
问题：修改岔区设限报错问题，以及点击设置store值得优化
|
2021-03-09 09:24:08 +08:00 |
|
ival
|
1e881ad0db
|
线路：南京2
问题：修改岔区设限报错问题，以及点击设置store值得优化
|
2021-03-09 09:20:25 +08:00 |
|
fan
|
ee6d3b41b1
|
实训调整
|
2021-03-08 18:03:33 +08:00 |
|
fan
|
48e26565df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-08 16:20:42 +08:00 |
|
fan
|
a6d81b5e3a
|
实训调整&ibp图片更换
|
2021-03-08 16:20:29 +08:00 |
|
joylink_cuiweidong
|
c39350daf3
|
运行图 代码调整
|
2021-03-08 15:20:47 +08:00 |
|
joylink_cuiweidong
|
142168fd14
|
宁波三号线 信号机操作代码调整
|
2021-03-08 13:49:14 +08:00 |
|
joylink_cuiweidong
|
03cab67c62
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-08 13:13:30 +08:00 |
|
joylink_cuiweidong
|
58c9ac7df7
|
宁波三号线 信号机 引导 操作代码调整
|
2021-03-08 13:13:06 +08:00 |
|
ival
|
12b804e110
|
Merge remote-tracking branch 'remotes/origin/test-tj' into test
|
2021-03-08 13:05:11 +08:00 |
|
ival
|
c8296f27db
|
同步代码
|
2021-03-08 13:04:39 +08:00 |
|
ival
|
886bec7aea
|
问题：运行图设置折返例行取值错误的问题
|
2021-03-08 11:30:46 +08:00 |
|
fan
|
2a977c8b43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-08 10:12:21 +08:00 |
|
fan
|
5614d90776
|
添加线路配置配置generateDestination: '是否生成目的地码定义（泰雷兹）'
|
2021-03-08 10:12:01 +08:00 |
|
ival
|
788ddfc228
|
线路：通用menuBar
问题：点击空白关闭多级菜单时，所有层级都关闭。
|
2021-03-08 09:42:02 +08:00 |
|
ival
|
faaded9b1e
|
线路：通用menuBar
问题：点击空白关闭多级菜单时，所有层级都关闭。
|
2021-03-08 09:41:07 +08:00 |
|
ival
|
c4af252a3e
|
线路：福州
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
|
2021-03-08 09:27:02 +08:00 |
|
ival
|
46d139e8a5
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-08 09:17:30 +08:00 |
|
ival
|
11df0526b0
|
线路：福州
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
|
2021-03-08 09:17:18 +08:00 |
|
joylink_cuiweidong
|
c841a6457c
|
宁波三号线 代码调整
|
2021-03-05 18:03:16 +08:00 |
|
joylink_cuiweidong
|
4e133ff643
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
# Conflicts:
# src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue
|
2021-03-05 17:56:54 +08:00 |
|
ival
|
d5c29af3fb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-05 17:54:34 +08:00 |
|
ival
|
4ca2403d36
|
问题：修改弹窗问题
|
2021-03-05 17:53:19 +08:00 |
|
joylink_cuiweidong
|
43c8c577ae
|
代码调整
|
2021-03-05 17:50:22 +08:00 |
|
ival
|
07eaf3d8d4
|
问题：修改弹窗问题
|
2021-03-05 17:47:30 +08:00 |
|
fan
|
ae20d55493
|
成都名称调整
|
2021-03-05 17:44:32 +08:00 |
|
ival
|
a565e1f204
|
修改编辑运行图路基问题
|
2021-03-05 16:44:32 +08:00 |
|
ival
|
b9014f4118
|
问题：运行图到站停站数据计算
|
2021-03-05 16:07:51 +08:00 |
|
ival
|
f3532e980d
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-05 15:39:17 +08:00 |
|
ival
|
96ad7becf2
|
修改 增加任务逻辑
|
2021-03-05 15:39:08 +08:00 |
|
joylink_cuiweidong
|
c785523699
|
运行图 代码调整
|
2021-03-05 13:06:06 +08:00 |
|
joylink_cuiweidong
|
e9997a2f7f
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-05 09:40:33 +08:00 |
|
joylink_cuiweidong
|
f1b72f8103
|
代码调整
|
2021-03-05 09:40:14 +08:00 |
|
ival
|
f171db029c
|
调整：新版TJ 运行图界面样式
|
2021-03-04 18:31:59 +08:00 |
|
ival
|
6baf23149f
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-04 18:22:42 +08:00 |
|
ival
|
20f3acdc1f
|
问题：同级编辑工具模板
|
2021-03-04 18:22:32 +08:00 |
|
joylink_cuiweidong
|
45054de1f9
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-04 16:36:42 +08:00 |
|
joylink_cuiweidong
|
66af660f18
|
其他参数的配置页面 折返数据 代码调整
|
2021-03-04 16:36:18 +08:00 |
|
ival
|
2fe27a3c47
|
问题：运行图编辑问题
1：交路设置 ，转换轨<——>折返轨 或者 折返轨 <——>折返轨
2：高亮问题处理
|
2021-03-04 13:45:25 +08:00 |
|
fan
|
7572e39664
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-04 10:26:18 +08:00 |
|
fan
|
d0c129b56b
|
宁波一区域选择退出添加
|
2021-03-04 10:25:54 +08:00 |
|
ival
|
4c649312c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-04 09:20:42 +08:00 |
|
ival
|
4e4d602400
|
修改同济大学运行图bar
|
2021-03-04 09:20:27 +08:00 |
|
joylink_cuiweidong
|
bf52e1ace9
|
西安三号线 顶部菜单样式调整
|
2021-03-03 17:53:54 +08:00 |
|
joylink_cuiweidong
|
11c2c816b3
|
福州一号线 顶部菜单 弹窗样式调整
西安三号线 顶部菜单 代码调整
|
2021-03-03 17:29:33 +08:00 |
|
joylink_cuiweidong
|
403b8b2ca1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-03 16:15:23 +08:00 |
|
joylink_cuiweidong
|
52e589466f
|
宁波三号线 运行线 操作 代码调整
|
2021-03-03 16:15:02 +08:00 |
|
fan
|
345205fcd7
|
取消quillEditor为全局组件
|
2021-03-03 15:13:19 +08:00 |
|
joylink_cuiweidong
|
ed791a0a2f
|
地图绘图 目的地码 添加起始区段的字段
|
2021-03-03 13:21:41 +08:00 |
|
joylink_cuiweidong
|
5e91907816
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-02 18:51:25 +08:00 |
|
joylink_cuiweidong
|
759d62b52a
|
西安二号线 下令停车 取消停车命令添加 列车绘图状态调整
|
2021-03-02 18:50:58 +08:00 |
|
ival
|
d84f4ba836
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-02 18:22:06 +08:00 |
|
ival
|
aaae6db62e
|
任务：同济大学运行图界面
进路：完成menu的创建
|
2021-03-02 18:21:55 +08:00 |
|
joylink_cuiweidong
|
cc946c8333
|
代码调整
|
2021-03-02 16:02:00 +08:00 |
|
joylink_cuiweidong
|
398e813490
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-02 15:47:12 +08:00 |
|
joylink_cuiweidong
|
972ab3006d
|
宁波三号线 运行线 绘图与操作页面 代码调整
|
2021-03-02 15:45:48 +08:00 |
|
ival
|
a75c603f21
|
线路：成都3
问题：取消引导或进路没有生成实训的问题
|
2021-03-02 15:28:07 +08:00 |
|
ival
|
e48543d5ee
|
线路：西安2
问题：
1.扣车和跳停互斥的问题；
2.为获取控制权时，没有限制排列进路的问题
3.修改车站AU/MN LA 的绘图处理
|
2021-03-02 15:06:40 +08:00 |
|
ival
|
ab9a11ef60
|
线路：西安2
问题：修改优先折法为侧线优先
|
2021-03-02 09:17:35 +08:00 |
|
ival
|
2e2a347f20
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-01 18:41:04 +08:00 |
|
ival
|
f034dcd163
|
运行图新版代码
|
2021-03-01 18:40:58 +08:00 |
|
joylink_cuiweidong
|
2294791148
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-01 18:39:09 +08:00 |
|
joylink_cuiweidong
|
bfb6d12426
|
宁波三号线 顶部菜单 代码调整
|
2021-03-01 18:38:50 +08:00 |
|
ival
|
e983194879
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-01 18:36:45 +08:00 |
|
ival
|
5278c2308a
|
线路：宁波1号线
问题：调试 全线取消限速、设置电灯实训过程
|
2021-03-01 18:36:33 +08:00 |
|
fan
|
393064474f
|
成都工职院调整地图列表顺序调整
|
2021-03-01 17:51:14 +08:00 |
|
fan
|
d9681d32a5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-01 17:15:36 +08:00 |
|
fan
|
ee60474a40
|
成都工职院调整&教学管理调整
|
2021-03-01 17:15:10 +08:00 |
|
sunzhenyu
|
e4e19cd224
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-01 16:42:48 +08:00 |
|
sunzhenyu
|
408ac659ac
|
修改三维车站管理内容
|
2021-03-01 16:42:38 +08:00 |
|
joylink_cuiweidong
|
26cb70e009
|
顶部菜单组件 代码封装
|
2021-03-01 16:35:57 +08:00 |
|
joylink_cuiweidong
|
561e6633c0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-01 14:19:33 +08:00 |
|
joylink_cuiweidong
|
92cc3d60c0
|
地图绘图 信号机添加 不生成进路 字段
|
2021-03-01 14:18:49 +08:00 |
|
ival
|
eac7f13784
|
修改南京2，操作车站的部分问题
|
2021-03-01 10:29:39 +08:00 |
|
fan
|
d13b2444ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-26 16:49:20 +08:00 |
|
fan
|
dc56726661
|
教学管理展示判断调整
|
2021-02-26 16:46:08 +08:00 |
|
lVAL
|
d908de6d7c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-26 16:23:41 +08:00 |
|
lVAL
|
1580a89770
|
线路：宁波一，南京2
问题：
a.南京2现地实训进入后，视图有的站没有拆分成两列
b.修改宁波一，设置通过dialog的title提示
c.恢复showStationContent函数的加入位置
d.删除代码中的一些无用注释代码
|
2021-02-26 16:23:16 +08:00 |
|
fan
|
627677db98
|
教学管理展示判断调整
|
2021-02-26 14:54:13 +08:00 |
|
fan
|
24a4d74adb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-26 13:54:49 +08:00 |
|
fan
|
44d8f5e3b0
|
成都工业页面注册账号
|
2021-02-26 13:52:55 +08:00 |
|
lVAL
|
ab61ee94df
|
线路：成都3
问题：增加“取消引导”实训
|
2021-02-26 11:01:07 +08:00 |
|
lVAL
|
501c79f477
|
优化代码
|
2021-02-26 09:33:45 +08:00 |
|
lVAL
|
fa8766a2af
|
线路：宁波1
问题：增加计轴复位的实训配置，由于现有的配置无法实现实训，增加配置并注释说明
|
2021-02-25 18:27:00 +08:00 |
|
lVAL
|
ad1c0d4c5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-25 18:03:27 +08:00 |
|
lVAL
|
c608b8ae89
|
线路：宁波1
问题：增加宁波线缺失的实训
|
2021-02-25 18:03:16 +08:00 |
|
joylink_cuiweidong
|
40b2dceaf9
|
代码调整
|
2021-02-25 16:16:43 +08:00 |
|
joylink_cuiweidong
|
5e74ecd66d
|
成都三号线 顶部菜单 代码调整
|
2021-02-25 15:41:03 +08:00 |
|
joylink_cuiweidong
|
1bbc7a684e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-25 15:20:06 +08:00 |
|
joylink_cuiweidong
|
279cbc7133
|
地图绘图数据 目的地码 代码调整
|
2021-02-25 15:19:22 +08:00 |
|
lVAL
|
81514db725
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-25 15:02:16 +08:00 |
|
lVAL
|
a482e3a866
|
线路：西安2
问题：核对和修改西安2号线实训以及操作存在的问题
|
2021-02-25 15:02:01 +08:00 |
|
joylink_cuiweidong
|
d5fb5bc94b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-25 14:27:48 +08:00 |
|
joylink_cuiweidong
|
fd26d2dd77
|
福州一号线 顶部菜单代码调整
|
2021-02-25 14:27:32 +08:00 |
|
lVAL
|
2994b833fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-25 13:40:34 +08:00 |
|
lVAL
|
7df00e6d64
|
线路：福州
问题：福州线路双灯引导后的始端信号机为一红一黄，前状态未处理。
|
2021-02-25 13:40:23 +08:00 |
|
joylink_cuiweidong
|
40e26a2165
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-25 13:15:33 +08:00 |
|
joylink_cuiweidong
|
7d5fb87dc5
|
宁波一号线 菜单代码调整
|
2021-02-25 13:14:55 +08:00 |
|
lVAL
|
52b1a87e9c
|
线路：成都3
问题：现地第一次加载，引导按钮没有显示的问题
|
2021-02-25 11:18:59 +08:00 |
|
lVAL
|
981e8a83d5
|
线路：成都3
问题：人解实训问题修改
|
2021-02-25 09:25:02 +08:00 |
|
lVAL
|
979d38053f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-24 18:53:07 +08:00 |
|
lVAL
|
461d64afe1
|
线路：南京2，哈尔滨
问题：
1.绘制哈尔滨传输信号机
2.处理传输信号机的逻辑处理问题
|
2021-02-24 18:52:38 +08:00 |
|
sunzhenyu
|
88194319cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-24 18:15:17 +08:00 |
|
sunzhenyu
|
6c1fef1bea
|
三维车站客流管理模块代码修改
|
2021-02-24 18:15:07 +08:00 |
|
joylink_cuiweidong
|
7da97340b6
|
宁波三号线 控制权转换 代码调整
|
2021-02-24 18:11:50 +08:00 |
|
joylink_cuiweidong
|
06a87aaaea
|
宁波三号线 删除不需要的文件
|
2021-02-24 15:16:55 +08:00 |
|
joylink_cuiweidong
|
0deda5096c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-24 14:57:47 +08:00 |
|
joylink_cuiweidong
|
c40fae43ad
|
宁波三号线 控制权转移 代码调整
|
2021-02-24 14:57:23 +08:00 |
|
lVAL
|
62b5cea8fb
|
提交修改的接口文件
|
2021-02-24 11:30:57 +08:00 |
|
lVAL
|
8727f91638
|
修改 实训步骤接口
|
2021-02-24 11:23:59 +08:00 |
|
lVAL
|
9b8d3b72d6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-24 11:09:36 +08:00 |
|
lVAL
|
a31e6da5cf
|
问题：实训步骤参数增加order
|
2021-02-24 11:04:35 +08:00 |
|
joylink_cuiweidong
|
70d440b2b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-24 10:43:32 +08:00 |
|
joylink_cuiweidong
|
b47cff956a
|
宁波三号线 控制权转移 代码调整
|
2021-02-24 10:43:07 +08:00 |
|
fan
|
68cbbbab99
|
宁波一：区域选择限制控制权
|
2021-02-24 10:21:29 +08:00 |
|
fan
|
0ac7e5f8b5
|
成都工业登录页面调整
|
2021-02-24 09:44:43 +08:00 |
|
fan
|
4b0320061e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-23 18:17:23 +08:00 |
|
fan
|
f0cd6ff07c
|
问题调整
|
2021-02-23 18:17:15 +08:00 |
|
joylink_cuiweidong
|
180ee94bde
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-23 18:12:31 +08:00 |
|
joylink_cuiweidong
|
908cf9dddf
|
宁波三号线 控制权 状态调整
|
2021-02-23 18:12:12 +08:00 |
|
lVAL
|
460b48cd7e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-23 18:11:11 +08:00 |
|
lVAL
|
52b12d3442
|
线路：成都3
问题：引导信号机排列进路和未排列进路情况下执行指令的问题
|
2021-02-23 18:10:59 +08:00 |
|
joylink_cuiweidong
|
5bbfaec42e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-23 17:46:08 +08:00 |
|
joylink_cuiweidong
|
93b7e782d4
|
宁波三号线控制权 状态 代码调整
|
2021-02-23 17:45:54 +08:00 |
|
lVAL
|
1c67b07706
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-23 16:57:51 +08:00 |
|
lVAL
|
d77b866da4
|
线路：成都3
问题：人解进路
|
2021-02-23 16:57:40 +08:00 |
|
joylink_cuiweidong
|
6bcdc9993d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2021-02-23 16:39:48 +08:00 |
|
joylink_cuiweidong
|
2ffc9e0781
|
宁波三号线 控制权状态 代码处理
|
2021-02-23 16:37:42 +08:00 |
|
lVAL
|
d7d3fee044
|
线路：成都3，佛山1，西安2
问题：
a.成都3实训描述问题
b.佛山引导实训不提示的问题
c.西安2引导实训不生成的问题
|
2021-02-23 16:32:42 +08:00 |
|
lVAL
|
cb8d4f9f03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-23 14:54:24 +08:00 |
|
lVAL
|
a8a3a8a5cc
|
线路：南京2，宁波1，宁波3
问题：增加引导的实训
|
2021-02-23 14:54:14 +08:00 |
|
fan
|
1eb5dd05c3
|
问题调整
|
2021-02-23 14:20:05 +08:00 |
|
fan
|
6068ea00ef
|
添加线路配置stationPreResetBeforeAxlePreReset
|
2021-02-23 13:43:09 +08:00 |
|
fan
|
195de40008
|
车站计轴复位状态调整
|
2021-02-23 13:34:42 +08:00 |
|
fan
|
85a50338f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-23 13:04:43 +08:00 |
|
fan
|
069c1b7203
|
ibp盘计轴复位
|
2021-02-23 13:04:29 +08:00 |
|
lVAL
|
420f67693d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-23 12:17:04 +08:00 |
|
lVAL
|
cf912b7834
|
线路：宁波3
问题：增加设置跳停的操作
|
2021-02-23 12:16:54 +08:00 |
|
joylink_cuiweidong
|
f0a3e0005d
|
删除 宁波三号线 暂时不用的文件
|
2021-02-23 09:27:50 +08:00 |
|
joylink_cuiweidong
|
914b710e43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-23 09:18:03 +08:00 |
|
joylink_cuiweidong
|
b1353c6d69
|
宁波三号线 控制权转移 下放控制 收回控制 代码调整
|
2021-02-23 09:17:44 +08:00 |
|
lVAL
|
0f492cfbe2
|
修改配置描述
|
2021-02-23 08:59:39 +08:00 |
|
lVAL
|
e52242773c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-22 18:56:49 +08:00 |
|
lVAL
|
dafe484a0a
|
修改为人解列车进路
|
2021-02-22 18:56:39 +08:00 |
|
fan
|
a432cfc632
|
实训调整
|
2021-02-22 18:51:24 +08:00 |
|
fan
|
33c76f6098
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-22 18:48:31 +08:00 |
|
fan
|
8adadc5858
|
区域控制权在实训中不生效
|
2021-02-22 18:48:24 +08:00 |
|
lVAL
|
867d09cd4a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-22 18:47:00 +08:00 |
|
lVAL
|
7110d2f06f
|
修改菜单列表
|
2021-02-22 18:46:52 +08:00 |
|
joylink_cuiweidong
|
dbf1006f8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-22 18:38:55 +08:00 |
|
joylink_cuiweidong
|
1a0e2a1c84
|
宁波三号线 控制权转移 下放站控 请求区域控制 代码调整
|
2021-02-22 18:38:38 +08:00 |
|
lVAL
|
23385f1718
|
修改实训名称
|
2021-02-22 18:38:24 +08:00 |
|
lVAL
|
20ba9fbc15
|
优化代码 没有参数e 报错的问题
|
2021-02-22 18:13:55 +08:00 |
|
lVAL
|
e5cba385b1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-22 17:50:54 +08:00 |
|
lVAL
|
08de82a230
|
线路：宁波1
问题：站台部分操作完成后，深蓝色高亮未清除干净
|
2021-02-22 17:49:55 +08:00 |
|
fan
|
6f91ee4b28
|
区域控制权在实训中不生效
|
2021-02-22 17:17:54 +08:00 |
|
fan
|
0f5805addc
|
线路配置添加参数
|
2021-02-22 17:07:59 +08:00 |
|
fan
|
6501a68a1c
|
merge
|
2021-02-22 16:43:01 +08:00 |
|
fan
|
04efafeb5c
|
宁波一 根据区域选择控制权 限制菜单
|
2021-02-22 16:41:30 +08:00 |
|
lVAL
|
07b38833fd
|
线路：宁波1
问题：mouseEvent.mouseout 报错问题
|
2021-02-22 16:34:56 +08:00 |
|
lVAL
|
609d34b8fb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-22 16:29:55 +08:00 |
|
lVAL
|
f016e0f6bf
|
线路：宁波1
问题：设置道岔操作时，岔芯蓝色高亮设置
|
2021-02-22 16:29:45 +08:00 |
|
fan
|
33dc1ea677
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-22 16:17:04 +08:00 |
|
fan
|
63a37caed3
|
宁波一 区域选择
|
2021-02-22 16:16:54 +08:00 |
|
lVAL
|
b804f78dae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-22 10:56:57 +08:00 |
|
lVAL
|
9b42af2dd6
|
优化提示问题
|
2021-02-22 10:56:50 +08:00 |
|
fan
|
e6814f4def
|
merge
|
2021-02-22 10:31:30 +08:00 |
|
fan
|
dc3e3d7b7e
|
宁波一 计轴复位按钮操作
|
2021-02-22 10:27:32 +08:00 |
|
joylink_cuiweidong
|
61be91ed77
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-22 10:15:11 +08:00 |
|
joylink_cuiweidong
|
4b8782cf05
|
代码调整
|
2021-02-22 10:15:01 +08:00 |
|
joylink_cuiweidong
|
1d41095b46
|
运行图 转换函数代码调整
宁波三号线 控制权转移 请求区域控制代码调整
|
2021-02-22 10:13:14 +08:00 |
|
lVAL
|
48b1bc9ae4
|
线路：宁波1
问题：
1.优化区域选择，点击应用后关闭弹窗；
2.修改控制模式的文字状态不发生变化。
|
2021-02-22 09:19:20 +08:00 |
|
lVAL
|
6d7abac8d8
|
线路： 北京1 宁波1
问题： 关于选择设备后，两次操作第二次操作中有时候无故高亮消失的问题
|
2021-02-20 18:23:26 +08:00 |
|
lVAL
|
faf2bc09a1
|
线路：宁波1
问题：修改代码中组件名称重复导致的错误
|
2021-02-20 17:24:49 +08:00 |
|
lVAL
|
a4b55d303b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-20 17:14:59 +08:00 |
|
lVAL
|
36364f9f26
|
线路：宁波1
问题：道岔和区段 选择设备后高亮在菜单出来后消失的问题
|
2021-02-20 17:14:52 +08:00 |
|
fan
|
efcb9ff262
|
冲掉代码回补
|
2021-02-20 17:13:27 +08:00 |
|
fan
|
2e385e7fe2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-20 17:11:02 +08:00 |
|
fan
|
fdf63db248
|
车站计轴复位（未完）
|
2021-02-20 17:10:10 +08:00 |
|
lVAL
|
17057cc014
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/ningbo_01.js
|
2021-02-20 17:03:45 +08:00 |
|
lVAL
|
69f5379356
|
调整福州1号线实训
|
2021-02-20 17:02:40 +08:00 |
|
fan
|
871b9beb5d
|
merge
|
2021-02-20 15:57:34 +08:00 |
|
fan
|
7413d131c3
|
区域选择
|
2021-02-20 15:55:53 +08:00 |
|
joylink_cuiweidong
|
f38c4fcb91
|
代码调整
|
2021-02-20 15:51:39 +08:00 |
|
joylink_cuiweidong
|
466d57b4be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-20 15:05:36 +08:00 |
|
joylink_cuiweidong
|
86ac34e899
|
泰雷兹 宁波三号线 控制权转移代码调整
|
2021-02-20 15:05:25 +08:00 |
|
joylink_cuiweidong
|
858c7dd7a7
|
宁波三号线（泰雷兹线路） 系统扣车设置/取消 操作添加
|
2021-02-20 15:03:44 +08:00 |
|
fan
|
7483b1be46
|
调整综合演练现地设备显示
|
2021-02-20 13:28:11 +08:00 |
|
fan
|
37d44bf6d2
|
现地 设备显示调整
|
2021-02-20 10:42:25 +08:00 |
|
fan
|
8a2f3b02ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-20 09:28:34 +08:00 |
|
fan
|
7e80d34e50
|
宁波一 信号机封锁调整
|
2021-02-20 09:27:21 +08:00 |
|
lVAL
|
c6ecccc788
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 18:30:34 +08:00 |
|
lVAL
|
7583442a2f
|
优化，排列进路加载速度
|
2021-02-19 18:30:26 +08:00 |
|
fan
|
fdeebc9e60
|
添加线路配置参数
|
2021-02-19 18:27:26 +08:00 |
|
fan
|
14f8b05538
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 18:26:02 +08:00 |
|
fan
|
77af4b9288
|
宁波一： 操作流程调整
|
2021-02-19 18:25:51 +08:00 |
|
lVAL
|
1f438bb2ee
|
修改 宁波车次窗显示状态
|
2021-02-19 17:39:38 +08:00 |
|
lVAL
|
4a64a59ce4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 17:27:20 +08:00 |
|
lVAL
|
3b53548ba1
|
宁波1号线 鼠标选择高亮状态
|
2021-02-19 17:27:10 +08:00 |
|
fan
|
5fe0250639
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 14:47:32 +08:00 |
|
fan
|
d083f56a7e
|
宁波一： 操作流程调整
|
2021-02-19 14:47:23 +08:00 |
|
joylink_cuiweidong
|
7d3dfc2d31
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 13:28:53 +08:00 |
|
joylink_cuiweidong
|
414aa1a3ca
|
地图绘制 列车数据模型更改
|
2021-02-19 13:28:19 +08:00 |
|
fan
|
159cd4cdf0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 11:06:20 +08:00 |
|
fan
|
2f8c2a3d42
|
宁波一： 设置扣车流程调整&区故解二次确认调整提示
|
2021-02-19 11:06:03 +08:00 |
|
lVAL
|
86a420d8ec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 10:43:06 +08:00 |
|
lVAL
|
b7ea10b459
|
修改宁波3号线 操作中的部分bug
|
2021-02-19 10:42:58 +08:00 |
|
fan
|
b44011057c
|
宁波一： 取消进路流程调整
|
2021-02-19 10:10:53 +08:00 |
|
fan
|
10bef80096
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 09:32:01 +08:00 |
|
fan
|
b43537cf94
|
宁波一： 排列进路流程微调
|
2021-02-19 09:31:35 +08:00 |
|
lVAL
|
2aff2be8b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 09:26:36 +08:00 |
|
lVAL
|
1030f13d37
|
修改宁波3号线，二次确认 锁闭标题问题；
修改西安2号线，定操、反操实训第一步描述错误。
|
2021-02-19 09:26:26 +08:00 |
|
fan
|
baa0ba70a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 09:12:39 +08:00 |
|
fan
|
827e52e0f4
|
宁波一： 全站进路交自动控
|
2021-02-19 09:12:09 +08:00 |
|
joylink_cuiweidong
|
1aa597fa39
|
宁波一号线 区故解指令代码调整 计轴预复位报错调整
|
2021-02-18 18:23:33 +08:00 |
|
joylink_cuiweidong
|
8bd93ba1d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 17:03:25 +08:00 |
|
joylink_cuiweidong
|
0e9454f890
|
宁波一号线 现地 设置进路报错提示调整
|
2021-02-18 17:03:08 +08:00 |
|
fan
|
b30ffd5635
|
宁波一 设置/取消全站自动通过进路
|
2021-02-18 16:58:35 +08:00 |
|
fan
|
c7e63a3d22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 16:22:23 +08:00 |
|
fan
|
e2a36fdf92
|
宁波一 设置/取消全站自动通过进路
|
2021-02-18 16:22:15 +08:00 |
|
joylink_cuiweidong
|
c0c5356f8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 15:50:32 +08:00 |
|
joylink_cuiweidong
|
5762399c6b
|
宁波一号线 菜单样式调整
|
2021-02-18 15:50:14 +08:00 |
|
fan
|
3e5f101a3a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 15:38:35 +08:00 |
|
fan
|
731c8e7fc3
|
宁波一 设置/取消强制点灯
|
2021-02-18 15:38:20 +08:00 |
|
lVAL
|
22101f30c0
|
添加 baseUrl配置
|
2021-02-18 14:15:44 +08:00 |
|
lVAL
|
d85bf0424d
|
更新 .gitignore
|
2021-02-18 14:10:56 +08:00 |
|
lVAL
|
78fc1ca5e9
|
修改 gitignore配置
|
2021-02-18 13:39:43 +08:00 |
|
lVAL
|
f482a4cf71
|
问题：仿真系统添加“运行图编制工作站”的路由和操作
|
2021-02-18 13:37:54 +08:00 |
|
lVAL
|
88e0c99135
|
线路：宁波
问题：修改排列进路预览，选择性进路后，以左侧信号机左对齐设置显示偏移
|
2021-02-18 10:18:51 +08:00 |
|
lVAL
|
b0fe7b7755
|
线路：宁波1
问题：排列进路展开预览多次后，图不显示的问题
|
2021-02-18 09:57:31 +08:00 |
|
lVAL
|
c6fc85397a
|
修改排列进路的操作的问题
|
2021-02-18 09:55:15 +08:00 |
|
lVAL
|
f05a3d496e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/map.js
# src/jmapNew/shape/Cross/index.js
# src/jmapNew/shape/Section/index.js
|
2021-02-18 09:23:17 +08:00 |
|
fan
|
3366718864
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 18:11:06 +08:00 |
|
fan
|
510b26c86c
|
宁波一新指令
|
2021-02-05 18:10:55 +08:00 |
|
lVAL
|
3475d573a6
|
修改代码
|
2021-02-05 18:07:35 +08:00 |
|
lVAL
|
a038ca7040
|
增加 宁波线处理
|
2021-02-05 18:01:16 +08:00 |
|
lVAL
|
d7c17d0935
|
修改道岔太短的问题
|
2021-02-05 18:00:06 +08:00 |
|
joylink_cuiweidong
|
70556faea6
|
北交大 客流系统 代码调整
|
2021-02-05 17:29:25 +08:00 |
|
joylink_cuiweidong
|
7a949cd5e2
|
北交大 客流系统 大客流策略 代码调整
|
2021-02-05 17:23:09 +08:00 |
|
joylink_cuiweidong
|
f94f3deadf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 17:06:18 +08:00 |
|
joylink_cuiweidong
|
a429f53015
|
北交大 客流系统 大客流策略 页面代码调整
|
2021-02-05 17:05:42 +08:00 |
|
fan
|
b6550e6500
|
国赛取消注释 取消临时限速函数
|
2021-02-05 16:30:11 +08:00 |
|
fan
|
1cea217aa9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 15:17:41 +08:00 |
|
fan
|
f3ec3a1476
|
南京二号线折行显示调整
|
2021-02-05 15:12:57 +08:00 |
|
joylink_cuiweidong
|
62bf080515
|
成都三号线 引导总锁 实训代码调整
|
2021-02-05 14:55:55 +08:00 |
|
joylink_cuiweidong
|
871a04e441
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 11:01:41 +08:00 |
|
joylink_cuiweidong
|
9cdecca6bd
|
成都三号线 添加设置联锁控操作
成都三号线 添加设置 联锁控实训，引导总锁，取消引导总锁实训
|
2021-02-05 11:01:21 +08:00 |
|
fan
|
88683b3763
|
代码调整
|
2021-02-05 09:19:18 +08:00 |
|
fan
|
766059611c
|
国赛=》取消临时限速 取消注释
(cherry picked from commit 18b5688cdf)
|
2021-02-05 09:18:15 +08:00 |
|
joylink_cuiweidong
|
3233ce39f0
|
北交大 客流代码调整
|
2021-02-04 18:34:31 +08:00 |
|
joylink_cuiweidong
|
e0f2d0a288
|
北交大 客流 代码调整
|
2021-02-04 18:30:02 +08:00 |
|
joylink_cuiweidong
|
68d2ecd6db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 17:18:25 +08:00 |
|
joylink_cuiweidong
|
61fb768bdc
|
北交大客流项目 大客流策略
|
2021-02-04 17:17:45 +08:00 |
|
lVAL
|
d0ce0a9132
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 13:30:03 +08:00 |
|
lVAL
|
c70a383e91
|
线路：宁波3
问题：增加宁波3 用户权限/转移控制/请求区域控制权|授权转移|下放站控|回收站控 菜单和实训配置。
|
2021-02-04 13:29:47 +08:00 |
|
sunzhenyu
|
f3e95ffccb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 13:28:00 +08:00 |
|
sunzhenyu
|
a96b8be0fa
|
修改三维客流列车车站订阅消息处理
|
2021-02-04 13:27:53 +08:00 |
|
fan
|
3bfa419bbe
|
宁波一 上电解锁调整
|
2021-02-04 13:23:42 +08:00 |
|
fan
|
3b87f7ef14
|
注释：执行关键操作测试
|
2021-02-04 13:10:24 +08:00 |
|
fan
|
e8de151360
|
宁波一操作实训策略调整&线路配置参数
|
2021-02-04 13:08:59 +08:00 |
|
sunzhenyu
|
8cb4ef4bdc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 11:03:57 +08:00 |
|
sunzhenyu
|
67d8c9467c
|
修改三维客流订阅连接，增加三维车站管理界面
|
2021-02-04 11:03:48 +08:00 |
|
lVAL
|
bb1c8eca45
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-03 17:07:23 +08:00 |
|
lVAL
|
ff7e32ec0d
|
线路：宁波1，成都3
问题：补充缺失部分实训，成都的全线取消扣车，宁波的设置折返
|
2021-02-03 17:07:05 +08:00 |
|
joylink_cuiweidong
|
2de373dd24
|
北交大 客流系统 退出系统 关闭其他窗口
|
2021-02-03 15:44:18 +08:00 |
|
joylink_cuiweidong
|
3a91ccfa0a
|
北交大 客流策略 代码调整
|
2021-02-03 14:08:58 +08:00 |
|
joylink_cuiweidong
|
acbbf14d1c
|
北交大 代码调整
|
2021-02-03 13:45:11 +08:00 |
|
joylink_cuiweidong
|
dd6f3cf7d3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-03 13:40:40 +08:00 |
|
joylink_cuiweidong
|
2968b1ddfb
|
北交大客流策略 添加
|
2021-02-03 13:40:11 +08:00 |
|
lVAL
|
7a10d0497a
|
线路：佛山，宁波3
问题：控制模式实训配置
|
2021-02-03 13:27:11 +08:00 |
|
lVAL
|
579858d02a
|
线路：南京2
问题：配置插芯的实训区段限制
|
2021-02-03 09:46:17 +08:00 |
|
lVAL
|
b7b90fe707
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 19:00:15 +08:00 |
|
fan
|
3e50519732
|
宁波一实训折返策略调整
|
2021-02-02 19:00:48 +08:00 |
|
lVAL
|
6dd4e305b3
|
修改实训配置
|
2021-02-02 19:00:03 +08:00 |
|
fan
|
f5e0539e6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 18:55:42 +08:00 |
|
fan
|
83a1eecb40
|
宁波一实训折返策略调整
|
2021-02-02 18:55:33 +08:00 |
|
joylink_cuiweidong
|
eeb7e3afad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
|
2021-02-02 18:16:51 +08:00 |
|
joylink_cuiweidong
|
c149f33a99
|
删除无用的代码
|
2021-02-02 18:06:02 +08:00 |
|
fan
|
18dcc3b089
|
BUG 160: 宁波一：控制模式（按钮）处缺少紧急站控
|
2021-02-02 17:54:40 +08:00 |
|
fan
|
1729082bac
|
折返策略 宁波一实训
|
2021-02-02 17:28:56 +08:00 |
|
fan
|
8aaaf9f9df
|
国赛提交试卷后初始化结果
|
2021-02-02 17:23:29 +08:00 |
|
fan
|
ec32fb62ff
|
折返策略 宁波一实训
|
2021-02-02 17:13:05 +08:00 |
|
fan
|
264770d316
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 17:03:53 +08:00 |
|
fan
|
c7e0bdc1e7
|
国赛理论测试显示结果调整
|
2021-02-02 17:03:39 +08:00 |
|
lVAL
|
a6070c49f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
|
2021-02-02 16:45:24 +08:00 |
|
lVAL
|
7d9803165c
|
修改，宁波线路，道岔状态更改，操作界面检测，不刷新页面的问题
|
2021-02-02 16:40:58 +08:00 |
|
fan
|
e7b47de9f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 16:35:06 +08:00 |
|
fan
|
7d60412e96
|
国赛试题调整
|
2021-02-02 16:34:55 +08:00 |
|
joylink_cuiweidong
|
efd8c86762
|
宁波一号线，南京二号线，哈尔滨一号线 删除不需要的代码
|
2021-02-02 16:28:03 +08:00 |
|
joylink_cuiweidong
|
e73d5d33d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 15:22:28 +08:00 |
|
joylink_cuiweidong
|
14cd1948b3
|
福州一号线 佛山一号线 删除不需要的代码
|
2021-02-02 15:22:13 +08:00 |
|
fan
|
e4881b4efc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 14:53:46 +08:00 |
|
fan
|
a431f17246
|
实训调整
|
2021-02-02 14:53:33 +08:00 |
|
joylink_cuiweidong
|
1abd14d7e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 14:10:06 +08:00 |
|
joylink_cuiweidong
|
2ddd9a0dc8
|
北京一号线/成都1，3号线 删除不需要的代码
|
2021-02-02 14:09:46 +08:00 |
|
fan
|
d594af49e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 11:03:24 +08:00 |
|
fan
|
f66e3e3cc0
|
实训代码调整
|
2021-02-02 11:03:11 +08:00 |
|
joylink_cuiweidong
|
2ca7c33966
|
宁波三号线 操作调整
|
2021-02-02 10:57:41 +08:00 |
|
lVAL
|
dbdfe26e86
|
修改宁波3 检测selected的方式
|
2021-02-02 10:49:25 +08:00 |
|
lVAL
|
3acdfc95fd
|
修改 action 引入state
|
2021-02-02 10:26:59 +08:00 |
|
lVAL
|
7c80fc77c6
|
修改代码
|
2021-02-02 10:25:21 +08:00 |
|
lVAL
|
7b11378443
|
修改 宁波 selected报错问题
|
2021-02-02 09:41:35 +08:00 |
|
lVAL
|
ef8066f9ef
|
修改分页查询 表单显示
|
2021-02-02 09:13:14 +08:00 |
|
lVAL
|
cb7ae5fe6b
|
线路：宁波3
问题：实训提示描述
|
2021-02-02 09:09:11 +08:00 |
|
lVAL
|
231898af92
|
增加指令产品类型展示。
|
2021-02-02 09:04:06 +08:00 |
|
lVAL
|
6be29c157b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 18:36:20 +08:00 |
|
lVAL
|
0a2f2b08b3
|
增加信号机和站台 显示
|
2021-02-01 18:36:07 +08:00 |
|
fan
|
07efc9ae51
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 18:31:23 +08:00 |
|
fan
|
fa384b79ee
|
代码调整
|
2021-02-01 18:31:09 +08:00 |
|
joylink_cuiweidong
|
077457a4ac
|
西安二号线 添加帮助 操作定义
|
2021-02-01 18:11:58 +08:00 |
|
lVAL
|
26a82237b1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 17:56:15 +08:00 |
|
lVAL
|
7095f145c9
|
增加 西安02 的信号机帮助和站台帮助实训
|
2021-02-01 17:56:03 +08:00 |
|
joylink_cuiweidong
|
def8b44d97
|
佛山 宁波 竞赛 车站操作 调整
|
2021-02-01 15:23:45 +08:00 |
|
joylink_cuiweidong
|
2ad9f691bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 14:38:09 +08:00 |
|
joylink_cuiweidong
|
2aadda7606
|
福州一号线 实训 操作定义 代码调整
|
2021-02-01 14:37:52 +08:00 |
|
fan
|
900a858010
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 14:31:28 +08:00 |
|
fan
|
8982177e99
|
代码调整
|
2021-02-01 14:31:16 +08:00 |
|
lVAL
|
811bf75a8e
|
注释掉 实训和指令发送中的log
|
2021-02-01 13:49:48 +08:00 |
|
lVAL
|
9071ce93e9
|
线路：南京2
问题：行调 交出控制、接受控制实训流程问题
|
2021-02-01 13:46:59 +08:00 |
|
lVAL
|
2e890a378c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 13:44:14 +08:00 |
|
lVAL
|
f0e3ee1f49
|
线路：南京2
问题：修改现地 强制站控，交出控制权，接受控制的实训流程。
|
2021-02-01 13:43:48 +08:00 |
|
joylink_cuiweidong
|
c4619c0784
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 11:24:14 +08:00 |
|
joylink_cuiweidong
|
7818a149c4
|
福州一号线 道岔计轴预复位 操作定义调整
|
2021-02-01 11:23:37 +08:00 |
|
fan
|
e0245e4cbd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 10:19:07 +08:00 |
|
fan
|
143f517097
|
卡斯柯 紧急站控实训调整
|
2021-02-01 10:18:54 +08:00 |
|
lVAL
|
ad385fbe97
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 18:37:37 +08:00 |
|
lVAL
|
0598e48b42
|
修改宁波线状态刷新
|
2021-01-29 18:37:10 +08:00 |
|
joylink_cuiweidong
|
7e173b4c4c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 17:32:09 +08:00 |
|
joylink_cuiweidong
|
8c4f24f9e2
|
bug101 交控仿真路线:控制模式转换的操作与手册不一致 实训 调整
|
2021-01-29 17:31:48 +08:00 |
|
fan
|
96256020c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 17:17:50 +08:00 |
|
fan
|
39e7cb83b9
|
南京二选中区段调整
|
2021-01-29 17:17:41 +08:00 |
|
lVAL
|
8c25f274f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 16:21:35 +08:00 |
|
lVAL
|
fa5b6027d3
|
删除无用打印
|
2021-01-29 16:21:19 +08:00 |
|
fan
|
22ac51f595
|
国赛购买调整描述
|
2021-01-29 16:20:18 +08:00 |
|
fan
|
216e8f0f19
|
国赛购买调整
|
2021-01-29 16:15:24 +08:00 |
|
fan
|
c53000186a
|
调整国赛购买位置
|
2021-01-29 15:28:51 +08:00 |
|
fan
|
e77ce189d1
|
放开国赛购买注释
|
2021-01-29 15:09:12 +08:00 |
|
fan
|
84a438a74d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 15:01:50 +08:00 |
|
fan
|
318d120db6
|
BUG 107: 浙大网新仿真线路：对立的功能应设置有误
|
2021-01-29 15:01:38 +08:00 |
|
joylink_cuiweidong
|
fcf3ec5b8e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 14:40:27 +08:00 |
|
joylink_cuiweidong
|
f1106b7dc0
|
运行图编制 菜单顺序 调整
|
2021-01-29 14:40:09 +08:00 |
|
fan
|
f1822495d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 13:23:41 +08:00 |
|
fan
|
12e16f9a99
|
BUG 152: 教学系统：在课程中点击实训进入实训后点击返回应退出到课程详情页面，目前退出到教学系统界面了，建议修改
|
2021-01-29 13:23:29 +08:00 |
|
joylink_cuiweidong
|
3175321085
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 11:24:07 +08:00 |
|
joylink_cuiweidong
|
2e3d576614
|
生成联锁添加配置项：信号机接近区段不跨过前方同向信号机
|
2021-01-29 11:23:01 +08:00 |
|
lVAL
|
f91f045a1e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 11:08:19 +08:00 |
|
lVAL
|
20a71051c7
|
线路：佛州
问题：设置限速和取消限速，配置逻辑区段生成实训
|
2021-01-29 11:08:03 +08:00 |
|
fan
|
dadeca50fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 10:04:07 +08:00 |
|
fan
|
009f3981ff
|
BUG 153:课程设计实训管理：操作类型查询不可更换，更换后显示无数据
|
2021-01-29 10:03:49 +08:00 |
|
joylink_cuiweidong
|
67d7008ec0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 09:57:39 +08:00 |
|
joylink_cuiweidong
|
45572a9f2a
|
删除不需要的文件
|
2021-01-29 09:57:22 +08:00 |
|
lVAL
|
4d3d92e18b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-29 09:46:05 +08:00 |
|
lVAL
|
e28047773d
|
线路：福州1
问题：设置运行等级实训提示运行时间未提示的问题
|
2021-01-29 09:45:43 +08:00 |
|
fan
|
e232c805ed
|
成都工业登录页面调整
|
2021-01-29 09:18:37 +08:00 |
|
fan
|
012fdd117f
|
注释国赛系统购买
|
2021-01-28 20:05:45 +08:00 |
|
fan
|
80cb675d9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 18:54:57 +08:00 |
|
fan
|
f4e3deaabc
|
仿真异常不清除订阅
|
2021-01-28 18:54:48 +08:00 |
|
joylink_cuiweidong
|
a9f47fdeb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 18:49:59 +08:00 |
|
joylink_cuiweidong
|
381f26b661
|
成都三号线 设置/取消 自动进路/自动折返 实训 操作定义代码调整
|
2021-01-28 18:49:36 +08:00 |
|
lVAL
|
d4014b53c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 18:44:21 +08:00 |
|
lVAL
|
31f9e2a4d3
|
修改生成实训配置 佛山1
|
2021-01-28 18:44:03 +08:00 |
|
fan
|
5bf8ffe9ac
|
BUG 149:浙大网新：现地仿真系统中车站切换显示有误;
|
2021-01-28 18:22:13 +08:00 |
|
fan
|
cc8c3aac36
|
成都工业调整配置
|
2021-01-28 18:03:17 +08:00 |
|
fan
|
370d538345
|
成都工业登录页面调整
|
2021-01-28 17:53:08 +08:00 |
|
fan
|
3f70632b84
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 17:47:56 +08:00 |
|
fan
|
b1d944c52f
|
国赛购买成功调整
|
2021-01-28 17:47:43 +08:00 |
|
lVAL
|
6a033b2a9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 16:28:14 +08:00 |
|
lVAL
|
590fb34edf
|
修改 宁波线操作
|
2021-01-28 16:27:44 +08:00 |
|
fan
|
18dee86d9c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 16:20:30 +08:00 |
|
fan
|
f07981ce64
|
国赛购买权限 --暂提
|
2021-01-28 16:20:18 +08:00 |
|
joylink_cuiweidong
|
b6731bd25a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 16:12:37 +08:00 |
|
joylink_cuiweidong
|
694fe461a6
|
成都1和3，北京1，佛山有轨电车，哈尔滨1，南京2 运行图 折返点计算 代码调整
|
2021-01-28 16:12:10 +08:00 |
|
sunzhenyu
|
84e77d7fbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 16:10:45 +08:00 |
|
sunzhenyu
|
e45e933436
|
修改三维驾驶中cctv视角按钮
|
2021-01-28 16:10:36 +08:00 |
|
joylink_cuiweidong
|
2e50989ac8
|
运行图添加任务 报错提示调整
运行图编制 折返时间 最少是2分钟
|
2021-01-28 15:21:06 +08:00 |
|
joylink_cuiweidong
|
cea7af664e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 14:45:52 +08:00 |
|
joylink_cuiweidong
|
909a5cb7f9
|
宁波一、三号线，西安二号线 运行图 转换函数 调整
|
2021-01-28 14:45:33 +08:00 |
|
fan
|
bf445ba174
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 14:29:08 +08:00 |
|
fan
|
3850bc6e34
|
BUG 105: 浙大网新线路在设计剧本的时候，两个窗口重叠后无法移动导致无法操作下面的窗口
|
2021-01-28 14:28:43 +08:00 |
|
joylink_cuiweidong
|
f6d3a6f030
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 13:38:29 +08:00 |
|
joylink_cuiweidong
|
c9a8d09e67
|
福州一号线 运行图绘图 折返点计算调整
|
2021-01-28 13:38:10 +08:00 |
|
fan
|
87ca64e33b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 10:30:08 +08:00 |
|
fan
|
9c341fed70
|
退出仿真时清除requestList请求栈堆数据
|
2021-01-28 10:29:38 +08:00 |
|
lVAL
|
035ae9d367
|
修改 南京2 实训配置
|
2021-01-28 09:27:32 +08:00 |
|
joylink_cuiweidong
|
a034a9ed91
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 18:38:59 +08:00 |
|
lVAL
|
369c5446cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuButton.vue
|
2021-01-27 18:39:11 +08:00 |
|
joylink_cuiweidong
|
e39bb88a1d
|
代码调整
|
2021-01-27 18:38:27 +08:00 |
|
lVAL
|
ba5de90773
|
配置 南京2实训
|
2021-01-27 18:32:16 +08:00 |
|
sunzhenyu
|
169bd38449
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 18:06:48 +08:00 |
|
sunzhenyu
|
59a785056d
|
更新北交大三维车站模型
|
2021-01-27 18:06:40 +08:00 |
|
fan
|
72e25c49f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 15:54:07 +08:00 |
|
fan
|
3c499369a6
|
meger
|
2021-01-27 15:53:09 +08:00 |
|
joylink_cuiweidong
|
68fc7c255f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 15:40:18 +08:00 |
|
joylink_cuiweidong
|
8f82b0fdd5
|
北交大客流 车站人数代码调整
地图绘图代码调整
|
2021-01-27 15:39:53 +08:00 |
|
fan
|
cb894aec34
|
南京二号线操作调整显示
|
2021-01-27 15:37:01 +08:00 |
|
lVAL
|
fbcfca4f9b
|
优化 南京2 提示信息的代码
|
2021-01-27 13:42:33 +08:00 |
|
lVAL
|
89c0b4f693
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 13:31:31 +08:00 |
|
lVAL
|
d5dd86be69
|
删除南京2 无用代码
|
2021-01-27 13:31:18 +08:00 |
|
joylink_cuiweidong
|
ccaceffeca
|
删除暂不需要文件
|
2021-01-27 13:13:44 +08:00 |
|
joylink_cuiweidong
|
b2adbb8eda
|
删除不需要的文件
|
2021-01-27 13:06:24 +08:00 |
|
lVAL
|
14e7acd715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuBar.vue
|
2021-01-27 11:25:23 +08:00 |
|
lVAL
|
62d52fd27f
|
修改南京2错误提示功能
|
2021-01-27 11:24:14 +08:00 |
|
joylink_cuiweidong
|
030a603da4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 10:40:50 +08:00 |
|
joylink_cuiweidong
|
c52474b771
|
宁波三号线（泰雷兹）
扣车后没有显示扣车标识修改
|
2021-01-27 10:38:34 +08:00 |
|
fan
|
d562037967
|
调整报警闪烁
|
2021-01-27 10:18:47 +08:00 |
|
fan
|
c0d1ffffd6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 09:47:38 +08:00 |
|
fan
|
ca1b5892af
|
剧本编辑框和请求栈堆微调
|
2021-01-27 09:47:26 +08:00 |
|
lVAL
|
b237d09402
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 09:27:59 +08:00 |
|
lVAL
|
ad0590dfe4
|
修改南京2 登录密码为1 以及限制普通站不能登录
|
2021-01-27 09:27:44 +08:00 |
|
fan
|
86dfe7a5f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 18:19:14 +08:00 |
|
fan
|
f92e017f1b
|
调整南京二号线岔区设限显示
|
2021-01-26 18:19:04 +08:00 |
|
lVAL
|
be6610a850
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 17:45:39 +08:00 |
|
lVAL
|
4efca07ac8
|
配置 宁波3 设置跳停和取消跳停配置
|
2021-01-26 17:45:24 +08:00 |
|
fan
|
de1d8bb0db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 17:13:20 +08:00 |
|
fan
|
98488d3095
|
BUG 106:浙大网新线路点击剧本加载再退出后，车站切换框显示无数据
|
2021-01-26 17:13:00 +08:00 |
|
sunzhenyu
|
1b0fddd2e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 16:51:42 +08:00 |
|
sunzhenyu
|
bb64976818
|
修改三维轨道生成参数，修改tdt生成位置
|
2021-01-26 16:51:32 +08:00 |
|
fan
|
832e2a0ddd
|
修改单位调整
|
2021-01-26 16:22:31 +08:00 |
|
fan
|
aa74b86dbd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 16:19:39 +08:00 |
|
fan
|
abed3ef7c1
|
BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整
|
2021-01-26 16:19:29 +08:00 |
|
lVAL
|
0c527d8b63
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 15:03:00 +08:00 |
|
lVAL
|
5858bb1eb3
|
优化代码
|
2021-01-26 15:02:39 +08:00 |
|
fan
|
324f662c8f
|
BUG109: 浙大网新：站台设置停站时间时有误，详细请看图
|
2021-01-26 14:54:37 +08:00 |
|
joylink_cuiweidong
|
103cecffa1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 14:40:41 +08:00 |
|
joylink_cuiweidong
|
519916458f
|
成都三号线 实训操作定义代码调整
|
2021-01-26 14:40:17 +08:00 |
|
fan
|
399e4be4e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 14:35:23 +08:00 |
|
fan
|
b193ef5f7e
|
成都工业职业技术学院 登录页面
|
2021-01-26 14:35:12 +08:00 |
|
joylink_cuiweidong
|
2525d57f8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 14:04:36 +08:00 |
|
joylink_cuiweidong
|
bd9917c0ca
|
道岔区段 切除闪烁绘图代码调整
|
2021-01-26 14:04:17 +08:00 |
|
fan
|
4f911227fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 13:07:11 +08:00 |
|
fan
|
c32009a9d2
|
南京二号线折行显示列车调整
|
2021-01-26 13:07:02 +08:00 |
|
joylink_cuiweidong
|
44cd7b3c01
|
运行图编制 代码调整
|
2021-01-26 11:28:29 +08:00 |
|
joylink_cuiweidong
|
c8986b3a4e
|
运行图 绘图 生成计划 增加计划 代码调整
|
2021-01-26 11:25:06 +08:00 |
|
joylink_cuiweidong
|
ebcd6b9bd9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 11:10:38 +08:00 |
|
joylink_cuiweidong
|
7d0a4269e6
|
运行图绘制代码调整
南京二号线 运行图转换函数代码调整
|
2021-01-26 11:10:18 +08:00 |
|
lVAL
|
9602cfc27a
|
修改实训查询 表单联动查询的问题
|
2021-01-26 11:05:18 +08:00 |
|
lVAL
|
c2ecb60cd7
|
修改 南京2 刚登陆进去执行操作异常的问题
|
2021-01-26 10:42:39 +08:00 |
|
lVAL
|
8d9114cfa7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-26 09:36:04 +08:00 |
|
lVAL
|
c3553c87f1
|
修改 南京2现地登录操作问题
|
2021-01-26 09:35:54 +08:00 |
|
joylink_cuiweidong
|
212b286408
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 18:36:38 +08:00 |
|
joylink_cuiweidong
|
da2caf0396
|
运行图 代码调整
|
2021-01-25 18:36:22 +08:00 |
|
lVAL
|
8ecbee01b2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 18:23:32 +08:00 |
|
lVAL
|
d325a10c40
|
配置宁波3 线路 实训
|
2021-01-25 18:23:23 +08:00 |
|
joylink_cuiweidong
|
f118e0ed46
|
运行图编制 代码调整
|
2021-01-25 18:06:11 +08:00 |
|
joylink_cuiweidong
|
194b31094d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:48:00 +08:00 |
|
joylink_cuiweidong
|
6b0d8cf772
|
代码调整
|
2021-01-25 17:47:49 +08:00 |
|
joylink_cuiweidong
|
db35ba370e
|
运行图编制代码调整
|
2021-01-25 17:45:39 +08:00 |
|
lVAL
|
388bd1e328
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:43:46 +08:00 |
|
lVAL
|
1f9ade8ec8
|
修改宁波一 实训代码格式
|
2021-01-25 17:43:38 +08:00 |
|
fan
|
b427f8a8e6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:42:11 +08:00 |
|
fan
|
f4db53df3f
|
调整南京二号线显示问题
|
2021-01-25 17:42:01 +08:00 |
|
fan
|
5bc124fe54
|
用户管理单位管理页面调整
|
2021-01-25 17:30:44 +08:00 |
|
lVAL
|
78863b868c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:30:27 +08:00 |
|
lVAL
|
76a7d1fe83
|
修改西安二号线实训折返不发指令的问题
|
2021-01-25 17:30:16 +08:00 |
|
fan
|
76f0fa96ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:21:40 +08:00 |
|
fan
|
4fb1cd1bed
|
南京二号线行值折行显示
|
2021-01-25 17:21:24 +08:00 |
|
joylink_cuiweidong
|
4da53f69e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:05:29 +08:00 |
|
joylink_cuiweidong
|
068c3331e4
|
运行图绘制代码调整
|
2021-01-25 17:05:05 +08:00 |
|
lVAL
|
32304d294e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 15:46:29 +08:00 |
|
lVAL
|
b5788f01d4
|
增加 现地车站登录功能
|
2021-01-25 15:46:18 +08:00 |
|
joylink_cuiweidong
|
ec89eca2ad
|
运行图编制工具 修改站间运行时间那里加个更新距离的功能
bug144 运行图设计：生成计划的服务号不能输入0，修改
|
2021-01-25 15:31:18 +08:00 |
|
joylink_cuiweidong
|
6d70fd3fb2
|
成都三号线（交控）现地 人工控/自动控 操作定义代码调整
|
2021-01-25 14:05:51 +08:00 |
|
joylink_cuiweidong
|
e49cce6b8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 13:51:23 +08:00 |
|
joylink_cuiweidong
|
41447e97dc
|
代码调整
|
2021-01-25 13:51:13 +08:00 |
|
joylink_cuiweidong
|
d3546c5de2
|
岔心鼠标事件 绘图代码调整
|
2021-01-25 13:48:37 +08:00 |
|
fan
|
3b6563351b
|
运行图层级调整
|
2021-01-25 10:30:43 +08:00 |
|
fan
|
98342c2423
|
南京二号线遮盖信号机的颜色调整
|
2021-01-25 10:23:13 +08:00 |
|
fan
|
7e026191c9
|
报警和记录框无法拖动，是固定的。
|
2021-01-25 09:57:20 +08:00 |
|
fan
|
a55f69a3cb
|
南京二号线 延时解锁
|
2021-01-22 21:28:30 +08:00 |
|
fan
|
e574bcf2eb
|
南二 挤岔恢复
|
2021-01-22 21:14:20 +08:00 |
|
fan
|
cf871345e3
|
注释南京二列车操作
|
2021-01-22 19:52:08 +08:00 |
|
fan
|
67a061d9da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 19:35:23 +08:00 |
|
fan
|
32f68ed895
|
道岔状态调整
|
2021-01-22 19:35:14 +08:00 |
|
joylink_cuiweidong
|
8373a96229
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 19:18:37 +08:00 |
|
joylink_cuiweidong
|
8eee00f454
|
代码调整
|
2021-01-22 19:18:16 +08:00 |
|
lVAL
|
d9de6c2548
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 18:58:33 +08:00 |
|
lVAL
|
b5d69120ff
|
增加 宁波三 实训部分配置，以及修改西安控制模式操作提示未知错误的问题
|
2021-01-22 18:58:01 +08:00 |
|
fan
|
0d8a6df9de
|
预复位调整
|
2021-01-22 18:33:21 +08:00 |
|
fan
|
3407d4d13b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 17:47:05 +08:00 |
|
fan
|
d2d854b0c0
|
预复位调整
|
2021-01-22 17:46:51 +08:00 |
|
lVAL
|
4211651bcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 17:39:26 +08:00 |
|
lVAL
|
584a30a634
|
增加 区段的新建列车操作，以及菜单实训operate配置
|
2021-01-22 17:39:12 +08:00 |
|
fan
|
97d8a66ccb
|
道岔的故障和预复位的显示
|
2021-01-22 16:55:00 +08:00 |
|
sunzhenyu
|
1ca93b98e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 16:47:36 +08:00 |
|
sunzhenyu
|
4a6b004621
|
注释
|
2021-01-22 16:47:24 +08:00 |
|
fan
|
052b1c3688
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 15:40:27 +08:00 |
|
fan
|
fbbf2be009
|
BUG: 126 => 在已发布地图列表中的某个城市退出仿真后，重新点击另一个城市，页面显示有误，建议修改
|
2021-01-22 15:40:16 +08:00 |
|
lVAL
|
527f59cc58
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 15:00:50 +08:00 |
|
lVAL
|
2ec8d1686a
|
福州线排查操作和实训情况
|
2021-01-22 15:00:36 +08:00 |
|
fan
|
c80e08292c
|
调整实际长度 小数计算
|
2021-01-22 14:51:37 +08:00 |
|
fan
|
420163ec07
|
逻辑区段实际长度设置调整&实训平台二级主页
|
2021-01-22 14:47:49 +08:00 |
|
fan
|
e0fe554699
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-22 13:59:42 +08:00 |
|
fan
|
4a0c7e1e95
|
逻辑区段实际长度设置调整
|
2021-01-22 13:59:32 +08:00 |
|
lVAL
|
6d443c9bd0
|
增加 案例 https://joylink.club/oss/portal/cases/江苏电子信息职业学院-城市轨道交通行车组织综合实训室.pdf
|
2021-01-22 11:15:13 +08:00 |
|
lVAL
|
277252916c
|
修改成都3操作优化，以及实训配置修正
|
2021-01-22 10:57:27 +08:00 |
|
joylink_cuiweidong
|
5d7810b6f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 19:19:41 +08:00 |
|
joylink_cuiweidong
|
3e6da71787
|
代码调整
|
2021-01-21 19:19:20 +08:00 |
|
fan
|
2cdbc1ee78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 19:12:17 +08:00 |
|
fan
|
258796555e
|
车队进路调整
|
2021-01-21 19:11:50 +08:00 |
|
joylink_cuiweidong
|
2b6e1ca117
|
岔心 代码调整
|
2021-01-21 19:02:28 +08:00 |
|
joylink_cuiweidong
|
a9ea00c0c8
|
南京十一站 代码调整
|
2021-01-21 18:39:00 +08:00 |
|
fan
|
60e82ec34e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 17:45:09 +08:00 |
|
fan
|
ff6dac7c60
|
南二强解道岔&强解区段
|
2021-01-21 17:44:57 +08:00 |
|
lVAL
|
49b7de7cae
|
调整西安 开放自动进路和关闭自动进路 实训
|
2021-01-21 17:08:17 +08:00 |
|
lVAL
|
84306b2507
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 17:00:22 +08:00 |
|
lVAL
|
1e488cdec6
|
西安2号线，修改开放自动进路和取消自动进路 实训配置
|
2021-01-21 17:00:12 +08:00 |
|
lVAL
|
0b9aeacda3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 16:38:52 +08:00 |
|
joylink_cuiweidong
|
5fec6faef3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 16:38:49 +08:00 |
|
lVAL
|
2f2316e353
|
增加西安2区故解流程
|
2021-01-21 16:38:44 +08:00 |
|
joylink_cuiweidong
|
21f4b004c9
|
西安二号线 开放自动进路/关闭自动进路 操作添加
|
2021-01-21 16:38:29 +08:00 |
|
fan
|
45fd2d348b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 16:32:22 +08:00 |
|
fan
|
5b69262124
|
南京二好像长闪短闪调整
|
2021-01-21 16:32:11 +08:00 |
|
joylink_cuiweidong
|
8e958875f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 15:54:13 +08:00 |
|
joylink_cuiweidong
|
e5069bbe92
|
西安二号线 部分操作 暂时隐藏
|
2021-01-21 15:53:51 +08:00 |
|
lVAL
|
56df3cd81c
|
添加 南京2 道岔 强解道岔配置
|
2021-01-21 15:53:37 +08:00 |
|
lVAL
|
bdbd5b9cc0
|
删除 福州2现地定位反位右键操作
|
2021-01-21 15:49:52 +08:00 |
|
lVAL
|
5bf71f2d7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 15:28:32 +08:00 |
|
lVAL
|
c3c3548574
|
修改，西安2 删除现地 信号机封锁解封配置
|
2021-01-21 15:28:21 +08:00 |
|
joylink_cuiweidong
|
5b1e331d26
|
岔心区段 批量设置集中站 调整
|
2021-01-21 14:49:02 +08:00 |
|
joylink_cuiweidong
|
be9e15567e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 14:15:18 +08:00 |
|
joylink_cuiweidong
|
16f255fcae
|
bug136 南铁院11站：现地仿真里岔心设置限速后不显示数字 调整
|
2021-01-21 14:15:00 +08:00 |
|
fan
|
e71fe4cea8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 13:45:32 +08:00 |
|
fan
|
6df9350155
|
卡斯柯实训调整&南京二号线封锁调整
|
2021-01-21 13:45:20 +08:00 |
|
sunzhenyu
|
19fb971847
|
修改三维驾驶非驾驶车辆更新逻辑
|
2021-01-21 11:16:19 +08:00 |
|
sunzhenyu
|
f13b062db8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 11:14:02 +08:00 |
|
sunzhenyu
|
6647ff9b58
|
修改三维驾驶非驾驶车辆更新逻辑
|
2021-01-21 11:13:53 +08:00 |
|
lVAL
|
eac5a23ddf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/foshan_01/operationConfig.js
|
2021-01-21 11:10:52 +08:00 |
|
lVAL
|
b8a36028fd
|
增加 佛山线全线限速配置注释
|
2021-01-21 11:09:51 +08:00 |
|
joylink_cuiweidong
|
1d32bd66b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/foshan_01/operationConfig.js
|
2021-01-21 11:04:25 +08:00 |
|
joylink_cuiweidong
|
cd9aa64552
|
佛山线路 实训代码调整
|
2021-01-21 11:02:04 +08:00 |
|
lVAL
|
322f0724c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 10:42:27 +08:00 |
|
lVAL
|
f0829b768b
|
增加佛州线实训配置
|
2021-01-21 10:42:17 +08:00 |
|
fan
|
356ec2db79
|
南京二号线调整
|
2021-01-21 10:13:30 +08:00 |
|
fan
|
ac4580f1b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-21 10:06:13 +08:00 |
|
fan
|
89700f2245
|
卡斯柯调整
|
2021-01-21 10:05:59 +08:00 |
|
joylink_cuiweidong
|
c5da33da6f
|
代码调整
|
2021-01-20 18:47:19 +08:00 |
|
lVAL
|
8e634b78e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 18:45:24 +08:00 |
|
lVAL
|
9ed523fb86
|
增加佛州控制模式
|
2021-01-20 18:45:05 +08:00 |
|
fan
|
50321992c0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 18:29:24 +08:00 |
|
fan
|
75e48959ba
|
调整生成课程和试卷问题&设置运行等级报错调整
|
2021-01-20 18:29:12 +08:00 |
|
joylink_cuiweidong
|
ea99e7a9e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 18:13:58 +08:00 |
|
lVAL
|
2dc837020c
|
增加控制模式实训
|
2021-01-20 18:14:03 +08:00 |
|
joylink_cuiweidong
|
7171601b06
|
佛山线路 实训 代码调整
|
2021-01-20 18:13:42 +08:00 |
|
lVAL
|
2408e28509
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/foshan_01/operationConfig.js
|
2021-01-20 17:53:00 +08:00 |
|
lVAL
|
87f2d274d1
|
修改指令
|
2021-01-20 17:52:34 +08:00 |
|
joylink_cuiweidong
|
913a9229d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 17:47:22 +08:00 |
|
joylink_cuiweidong
|
cc462621f5
|
佛山线 实训 代码调整
|
2021-01-20 17:47:05 +08:00 |
|
lVAL
|
d2a7098a90
|
删除测试 debugger
|
2021-01-20 17:43:56 +08:00 |
|
lVAL
|
5cacc9b6e6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 17:42:50 +08:00 |
|
lVAL
|
338a7c9cbe
|
增加信号机封锁解封 实训
|
2021-01-20 17:42:42 +08:00 |
|
fan
|
2440e1e280
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:47:31 +08:00 |
|
fan
|
295ddee738
|
调整showMode初始值
|
2021-01-20 16:47:20 +08:00 |
|
lVAL
|
8d25d8c1d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:33:31 +08:00 |
|
lVAL
|
711f0bc70a
|
修改 成都3 实训配置情况
|
2021-01-20 16:33:19 +08:00 |
|
fan
|
287e6251b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:26:42 +08:00 |
|
fan
|
5a36ce69fe
|
添加线路配置项 signalHumanControlBeforeSetAtsControlOrCIAutoTrigger、cancelAtsControlOfAllRoutesWhenCancelRoute
|
2021-01-20 16:26:32 +08:00 |
|
joylink_cuiweidong
|
88234d9154
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:20:58 +08:00 |
|
joylink_cuiweidong
|
fe81a31883
|
佛山有轨电车 线路 暂时隐藏 iscs ibp 数据
|
2021-01-20 16:20:20 +08:00 |
|
lVAL
|
a4a7494975
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:10:25 +08:00 |
|
lVAL
|
78822e9c30
|
成都3 实训引导总锁配置，先注释掉
|
2021-01-20 16:10:14 +08:00 |
|
fan
|
2e4cdc698e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 16:07:37 +08:00 |
|
fan
|
70045c8f87
|
现地行调条件显示调整
|
2021-01-20 16:07:10 +08:00 |
|
lVAL
|
5764a103c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:53:51 +08:00 |
|
lVAL
|
c8e2b30271
|
增加 成都3 中控、站控、紧急站控、扣车、设置跳停、取消跳停实训
|
2021-01-20 15:53:36 +08:00 |
|
fan
|
25b6ad4ca8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:53:23 +08:00 |
|
fan
|
34aca8de12
|
现地行调条件显示调整
|
2021-01-20 15:53:13 +08:00 |
|
sunzhenyu
|
1286bb79ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:41:30 +08:00 |
|
sunzhenyu
|
0fb8eeb52b
|
修改三维驾驶和沙盘读取站场图内外侧数据验证
|
2021-01-20 15:41:20 +08:00 |
|
joylink_cuiweidong
|
c8c4264be9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 15:32:08 +08:00 |
|
joylink_cuiweidong
|
057d7a7d75
|
北交大项目 运行图预览打不开 bug 处理
|
2021-01-20 15:31:41 +08:00 |
|
fan
|
a7d4e0c195
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 13:50:57 +08:00 |
|
fan
|
330f58eba4
|
右键选择 进路快捷操作盘
|
2021-01-20 13:50:37 +08:00 |
|
joylink_cuiweidong
|
79f0de576c
|
代码调整
|
2021-01-20 11:16:09 +08:00 |
|
joylink_cuiweidong
|
5cbfa16d6c
|
bug104 交控线行调仿真：站台信息显示的默认停站时间不正确 修改
|
2021-01-20 10:16:15 +08:00 |
|
joylink_cuiweidong
|
3c76a3139c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 09:54:26 +08:00 |
|
joylink_cuiweidong
|
5b5d635f07
|
bug103 设置停站时间范围改为15-300S 修改
|
2021-01-20 09:54:01 +08:00 |
|
fan
|
92929a02fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 19:03:53 +08:00 |
|
fan
|
0126066322
|
调整传输信号机选择
|
2021-01-19 19:03:42 +08:00 |
|
lVAL
|
332aa9b61a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 18:22:14 +08:00 |
|
lVAL
|
35a98a6e00
|
修改 nameAlone 报错的优化
|
2021-01-19 18:22:04 +08:00 |
|
joylink_cuiweidong
|
10ed69f5ec
|
代码调整
|
2021-01-19 17:44:18 +08:00 |
|
joylink_cuiweidong
|
745dbd6859
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 17:15:07 +08:00 |
|
joylink_cuiweidong
|
df6ede1e4b
|
南京二号线 站台操作调整
|
2021-01-19 17:14:47 +08:00 |
|
sunzhenyu
|
f798de0fcf
|
修改三维沙盘站台提示标位置，去除无用log
|
2021-01-19 16:39:42 +08:00 |
|
sunzhenyu
|
4b09761b01
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 16:27:17 +08:00 |
|
sunzhenyu
|
a2bb806b03
|
修改三维铁轨透明贴图渲染，修改佛山线场景漫游轨迹
|
2021-01-19 16:27:09 +08:00 |
|
fan
|
b4059db243
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 16:08:04 +08:00 |
|
fan
|
c6e9e1fe38
|
列车状态调整
|
2021-01-19 16:07:32 +08:00 |
|
joylink_cuiweidong
|
9828c65b26
|
代码调整
|
2021-01-19 14:07:57 +08:00 |
|
joylink_cuiweidong
|
be344cf815
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuButton.vue
|
2021-01-19 14:00:32 +08:00 |
|
joylink_cuiweidong
|
d404ed01dc
|
代码调整
|
2021-01-19 13:57:35 +08:00 |
|
fan
|
606c4ae301
|
menuButton调整
|
2021-01-19 13:56:45 +08:00 |
|
fan
|
12be0c61cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:26:05 +08:00 |
|
fan
|
daea6e1760
|
传输信号机选中状态
|
2021-01-19 13:25:53 +08:00 |
|
lVAL
|
5f80334433
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:04:06 +08:00 |
|
lVAL
|
696af622b7
|
调整南京2岔芯设置限速和设置封锁
|
2021-01-19 13:03:43 +08:00 |
|
fan
|
49405666df
|
传输信号机参数调整
|
2021-01-19 11:18:24 +08:00 |
|
fan
|
732c44fea0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 11:10:04 +08:00 |
|
fan
|
145259d3b5
|
传输信号机 && 佛山进路预览调整
|
2021-01-19 11:09:53 +08:00 |
|
lVAL
|
7afd9025b5
|
增加南京2站台取消设置指令
|
2021-01-19 10:39:01 +08:00 |
|
lVAL
|
396d7ec14e
|
修改南京2号线菜单配置方式
|
2021-01-19 10:31:31 +08:00 |
|
lVAL
|
267a815956
|
修改南京2按钮配置
|
2021-01-19 09:54:45 +08:00 |
|
joylink_cuiweidong
|
05a8c85d6b
|
代码调整
|
2021-01-19 09:20:37 +08:00 |
|
joylink_cuiweidong
|
4cbc3de4ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 18:06:23 +08:00 |
|
joylink_cuiweidong
|
ba80512efa
|
南京二号线 站台添加 月台 按钮
|
2021-01-18 18:06:08 +08:00 |
|
sunzhenyu
|
19cede5338
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 17:59:14 +08:00 |
|
sunzhenyu
|
2463d09bcc
|
修改三维驾驶更新本地客户端驾驶员
|
2021-01-18 17:59:04 +08:00 |
|
fan
|
07ad4c85dd
|
被覆盖代码重新提交
|
2021-01-18 17:41:46 +08:00 |
|
lVAL
|
b156097cba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuButton.vue
|
2021-01-18 17:35:19 +08:00 |
|
lVAL
|
aed7f034b1
|
南京2车站操作设备并且状态刷新后，页面操作菜单disabled刷新问题
|
2021-01-18 17:32:20 +08:00 |
|
fan
|
f18c48ffa8
|
南京二号线初始获取车站调整&计轴占用状态调整
|
2021-01-18 17:24:00 +08:00 |
|
fan
|
057687a678
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 16:57:03 +08:00 |
|
lVAL
|
9617c36d01
|
修改控制模式 disabled 控制
|
2021-01-18 16:53:54 +08:00 |
|
fan
|
1ba5d404b5
|
南京二号线进路锁闭封锁状态调整
|
2021-01-18 16:51:45 +08:00 |
|
fan
|
58f1bc5950
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 16:22:38 +08:00 |
|
fan
|
cff6a78d3a
|
南京二号线行调点击空白关闭
|
2021-01-18 16:22:26 +08:00 |
|
lVAL
|
198602923c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 15:49:00 +08:00 |
|
lVAL
|
7d61451fa9
|
修改 应答器 创建的几个优化问题，以及南京线路中心左键弹窗，右键不弹
|
2021-01-18 15:48:05 +08:00 |
|
fan
|
14091957d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 15:41:43 +08:00 |
|
fan
|
5f3300e889
|
信号机添加所属车站&批量设置
|
2021-01-18 15:41:28 +08:00 |
|
joylink_cuiweidong
|
d322aad5d4
|
南京二号线 站台安全门 通信正常开启状态 调整
|
2021-01-18 15:16:00 +08:00 |
|
fan
|
6aea2334e6
|
南京二号线 控制模式none 车站字体闪烁
|
2021-01-18 14:10:55 +08:00 |
|
joylink_cuiweidong
|
74b9c8cc7e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 13:40:29 +08:00 |
|
joylink_cuiweidong
|
5687ffc5a8
|
南京二号线 区段 轨区设限 代码调整
|
2021-01-18 13:37:45 +08:00 |
|
fan
|
f60054ccad
|
现地切行调后 车站显示问题调整
|
2021-01-18 11:29:03 +08:00 |
|
fan
|
4dc2382075
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 10:52:19 +08:00 |
|
fan
|
fa412d1079
|
南京二号线 状态调整
|
2021-01-18 10:52:06 +08:00 |
|
lVAL
|
20880fe1fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuButton.vue
|
2021-01-15 18:53:43 +08:00 |
|
lVAL
|
63881d156c
|
修改指令配置
|
2021-01-15 18:52:28 +08:00 |
|
fan
|
e7f2d73857
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 18:42:43 +08:00 |
|
fan
|
649691b1c3
|
操作表盘调整
|
2021-01-15 18:42:17 +08:00 |
|
joylink_cuiweidong
|
3e1696d081
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 18:36:52 +08:00 |
|
joylink_cuiweidong
|
69737a06f0
|
区段 颜色配置文件调整
|
2021-01-15 18:36:13 +08:00 |
|
sunzhenyu
|
1412834ce5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 18:21:42 +08:00 |
|
sunzhenyu
|
a63060ac2f
|
修改测试中三维沙盘数据ui
|
2021-01-15 18:21:36 +08:00 |
|
lVAL
|
a70de561ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 18:10:23 +08:00 |
|
lVAL
|
fd5d8245c7
|
修改代码
|
2021-01-15 18:10:14 +08:00 |
|
fan
|
1c9c8aab8a
|
南京二号线 道岔 侧防 和进路锁闭 优先级调整
|
2021-01-15 18:00:32 +08:00 |
|
fan
|
bacdca5e19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:53:05 +08:00 |
|
fan
|
844b2ee382
|
南京二号线引导进路
|
2021-01-15 17:52:54 +08:00 |
|
lVAL
|
dd7f4d2aeb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:23:37 +08:00 |
|
lVAL
|
0ee148437b
|
增加应答器 创建时必须选择信号机以及校验
|
2021-01-15 17:23:27 +08:00 |
|
joylink_cuiweidong
|
0eb7ca8a06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:17:33 +08:00 |
|
joylink_cuiweidong
|
f61df9b1e8
|
岔心状态 绘图代码调整
|
2021-01-15 17:17:17 +08:00 |
|
fan
|
087f1123b8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:00:10 +08:00 |
|
fan
|
45869c5362
|
信号机状态调整
|
2021-01-15 16:59:58 +08:00 |
|
joylink_cuiweidong
|
39da2a712d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 16:44:55 +08:00 |
|
joylink_cuiweidong
|
9aef723b3f
|
bug修改：
逻辑区段修改 导致逻辑区段起终点坐标出现错误问题
逻辑区段修改坐标 导致相邻物理区段坐标出现问题
功能：
增加线路配置：信号封锁下进路是否可以办理
|
2021-01-15 16:44:22 +08:00 |
|
lVAL
|
89dacd7deb
|
增加南京2号线 信号机配置
|
2021-01-15 16:40:23 +08:00 |
|
lVAL
|
5b4e15a979
|
修改操作提示
|
2021-01-15 16:12:49 +08:00 |
|
lVAL
|
c06bad3005
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 16:09:35 +08:00 |
|
lVAL
|
cc5ee4661f
|
修改 发送命令后 提示的信息
|
2021-01-15 16:09:26 +08:00 |
|
fan
|
a60209a10f
|
信号机状态调整
|
2021-01-15 16:01:15 +08:00 |
|
lVAL
|
bc8f65c149
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 15:25:49 +08:00 |
|
lVAL
|
57acd71924
|
修改南京2蓝色颜色
|
2021-01-15 15:25:41 +08:00 |
|
fan
|
e5611cebc8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 15:24:30 +08:00 |
|
fan
|
cd5bcfe888
|
信号机&道岔状态调整
|
2021-01-15 15:24:19 +08:00 |
|
lVAL
|
c63d475d57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 15:11:24 +08:00 |
|
lVAL
|
3c37037558
|
增加应答器关联信号机，以及绘图信号机，区段激活选择
|
2021-01-15 15:11:13 +08:00 |
|
joylink_cuiweidong
|
f21cfd2256
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 13:35:28 +08:00 |
|
fan
|
93eaaacd96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 13:34:35 +08:00 |
|
fan
|
0caf3d233a
|
排列进路
|
2021-01-15 13:34:25 +08:00 |
|
joylink_cuiweidong
|
0f4f6ef5f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 13:27:09 +08:00 |
|
joylink_cuiweidong
|
53b51a7b63
|
道岔 生成逻辑代码调整
|
2021-01-15 13:26:42 +08:00 |
|
lVAL
|
25e89c9b1c
|
配置强解 道岔和区段，（道岔等待后端确定指令）
|
2021-01-15 12:25:25 +08:00 |
|
lVAL
|
2024cef7c9
|
修改南京仿真bar遮挡运行图的问题
|
2021-01-15 12:18:27 +08:00 |
|
fan
|
12925e92bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 11:21:22 +08:00 |
|
fan
|
29c8e5b4b9
|
暂提
|
2021-01-15 11:21:11 +08:00 |
|
lVAL
|
80f8ecf19f
|
修改南京2号线 tempData 报错问题
|
2021-01-15 11:16:17 +08:00 |
|
lVAL
|
356042f673
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 11:00:05 +08:00 |
|
lVAL
|
ec30635c02
|
修改应答器图层以及回车修改属性的问题
|
2021-01-15 10:59:58 +08:00 |
|
joylink_cuiweidong
|
04e4df6225
|
代码调整
|
2021-01-15 10:38:35 +08:00 |
|
joylink_cuiweidong
|
4e28468ad9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 10:33:15 +08:00 |
|
joylink_cuiweidong
|
a86c76422f
|
岔心绘图代码调整
区段绘图（左右关联区段 关系）调整
|
2021-01-15 10:32:57 +08:00 |
|
lVAL
|
48955258ea
|
修改应答器 绘制card css
|
2021-01-15 09:54:56 +08:00 |
|
lVAL
|
4c89a777ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:53:46 +08:00 |
|
lVAL
|
c6c59f48b7
|
修改代码
|
2021-01-15 09:53:37 +08:00 |
|
fan
|
0671c6e733
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:42:36 +08:00 |
|
fan
|
15928a6248
|
道岔封锁状态调整
|
2021-01-15 09:42:19 +08:00 |
|
lVAL
|
1c06c408ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:39:35 +08:00 |
|
lVAL
|
cb364658fc
|
修改替换错误
|
2021-01-15 09:39:27 +08:00 |
|
sunzhenyu
|
5bbe37c30b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:35:57 +08:00 |
|
sunzhenyu
|
b6ab1b3c6a
|
测试版本三维沙盘增加镜头控制模型大小，信号机朝向，修改单线路
|
2021-01-15 09:35:49 +08:00 |
|
lVAL
|
41f1253746
|
修改 南京2号线 中心操作弹窗为非模式对话框
|
2021-01-15 09:34:16 +08:00 |
|
lVAL
|
284899599c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuButton.vue
|
2021-01-14 18:38:29 +08:00 |
|
lVAL
|
b5c2202114
|
增加 南京线增加参数选择的步骤功能
|
2021-01-14 18:37:31 +08:00 |
|
joylink_cuiweidong
|
c8d0bf50f5
|
代码调整
|
2021-01-14 17:11:10 +08:00 |
|
joylink_cuiweidong
|
06edd5f531
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 17:00:04 +08:00 |
|
joylink_cuiweidong
|
3dd6696140
|
代码调整
|
2021-01-14 16:59:41 +08:00 |
|
fan
|
359e24dfbd
|
merge
|
2021-01-14 16:35:45 +08:00 |
|
fan
|
ab804e3b95
|
南京二号线状态调整 道岔长闪
|
2021-01-14 16:26:04 +08:00 |
|
joylink_cuiweidong
|
c4f6cde2c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 16:04:03 +08:00 |
|
joylink_cuiweidong
|
28babc78f9
|
岔心 绘图调整
|
2021-01-14 16:03:48 +08:00 |
|
lVAL
|
2fc70489eb
|
修改南京2号线菜单皮肤
|
2021-01-14 15:44:56 +08:00 |
|
lVAL
|
51096d5ea1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 15:32:33 +08:00 |
|
lVAL
|
eb7fa1f5cb
|
修改实现南京2行调和现地界面操作
|
2021-01-14 15:32:17 +08:00 |
|
joylink_cuiweidong
|
8118b1ffad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:59:12 +08:00 |
|
joylink_cuiweidong
|
cadda00719
|
区段 物理区段 实际长度修改 bug调整
|
2021-01-14 14:58:42 +08:00 |
|
fan
|
ec87dc8eaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:43:03 +08:00 |
|
fan
|
9c7c0f674e
|
南京二号线状态调整
|
2021-01-14 14:42:53 +08:00 |
|
lVAL
|
44adeaf24a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:15:18 +08:00 |
|
lVAL
|
22403b198d
|
修改南京2号线菜单，以及样式
|
2021-01-14 14:15:02 +08:00 |
|
joylink_cuiweidong
|
845f10caf6
|
岔心绘图代码调整
bug调整：新建完一个信号机 三个状态不发生改变
|
2021-01-14 13:04:04 +08:00 |
|
joylink_cuiweidong
|
3be5df98e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:33:21 +08:00 |
|
joylink_cuiweidong
|
becb6a03df
|
岔心代码调整
|
2021-01-13 18:33:07 +08:00 |
|
lVAL
|
1dfa8f5b19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:08:02 +08:00 |
|
lVAL
|
37bc98d706
|
修改应答器 计算方式
|
2021-01-13 18:07:49 +08:00 |
|
joylink_cuiweidong
|
c42a184b7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:54:11 +08:00 |
|
joylink_cuiweidong
|
7ac59f6006
|
岔心 绘图代码调整
|
2021-01-13 17:53:51 +08:00 |
|
lVAL
|
9f4155b70d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:45:49 +08:00 |
|
lVAL
|
15f94a7d1d
|
优化 应答器创建 选择关联区段类型 以及优化绘制显示位置
|
2021-01-13 17:45:38 +08:00 |
|
joylink_cuiweidong
|
752b4e9a26
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/utils/parser.js
|
2021-01-13 17:43:15 +08:00 |
|
joylink_cuiweidong
|
99644039d3
|
新建车站以后 无法点击其他的东西 bug 调整
|
2021-01-13 17:34:57 +08:00 |
|
sunzhenyu
|
d3c833a35f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:11:20 +08:00 |
|
sunzhenyu
|
90fea11aab
|
临时增加三维数据创建场景时同步站场图内外侧数据
|
2021-01-13 17:11:07 +08:00 |
|
joylink_cuiweidong
|
ac6f3673d4
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2021-01-13 17:02:31 +08:00 |
|
joylink_cuiweidong
|
7599458c8f
|
岔心 元素绘图代码调整
|
2021-01-13 17:01:53 +08:00 |
|
lVAL
|
fd3f82e7ba
|
修改炼精二号线 逻辑区段名称大小
|
2021-01-13 14:18:48 +08:00 |
|
lVAL
|
006d784178
|
修改应答器bug
|
2021-01-13 10:26:52 +08:00 |
|
lVAL
|
47d9e6573d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 09:52:24 +08:00 |
|
lVAL
|
ede7335ab1
|
修改 交路选择起始信号机和终止信号机操作的bug问题
|
2021-01-13 09:51:59 +08:00 |
|
|
|
032ec93af4
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:46:38 +08:00 |
|
|
|
2d154f1611
|
设备登录行值显示
|
2021-01-12 23:46:07 +08:00 |
|
|
|
8eb293f074
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:14:34 +08:00 |
|
|
|
4adc474b54
|
设备登录行值显示
|
2021-01-12 23:13:05 +08:00 |
|
joylink_cuiweidong
|
b8c8f773c3
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 20:22:06 +08:00 |
|
joylink_cuiweidong
|
fbb8157ff1
|
代码调整
|
2021-01-12 20:20:56 +08:00 |
|
joylink_cuiweidong
|
b26ec956d0
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 20:16:07 +08:00 |
|
joylink_cuiweidong
|
5cfef217d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 20:15:28 +08:00 |
|
joylink_cuiweidong
|
0b4636f618
|
添加 绑定单位 功能
|
2021-01-12 20:15:14 +08:00 |
|
fan
|
df3c31dd44
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-12 20:06:58 +08:00 |
|
fan
|
67d9af587f
|
生成组织二维码state修改
|
2021-01-12 20:06:45 +08:00 |
|
joylink_cuiweidong
|
f9ad56bca6
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 19:06:59 +08:00 |
|
joylink_cuiweidong
|
b13136df51
|
代码调整
|
2021-01-12 19:05:28 +08:00 |
|
joylink_cuiweidong
|
cb35140942
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 19:01:29 +08:00 |
|
joylink_cuiweidong
|
3a5d5def46
|
考试系统 添加 修改试卷 代码调整
|
2021-01-12 18:59:16 +08:00 |
|
fan
|
73f98ce8b4
|
考试权限调整
|
2021-01-12 18:51:38 +08:00 |
|
fan
|
378d5430e6
|
考试权限调整
|
2021-01-12 18:34:10 +08:00 |
|
fan
|
35790f6693
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 18:27:05 +08:00 |
|
fan
|
21e2455472
|
项目登录行调 运行图预览跳转新页面
|
2021-01-12 18:26:55 +08:00 |
|
joylink_cuiweidong
|
7378220e85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 18:07:08 +08:00 |
|
joylink_cuiweidong
|
12acee5bc7
|
代码调整
|
2021-01-12 18:06:52 +08:00 |
|
sunzhenyu
|
646836ecb4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 17:58:12 +08:00 |
|
sunzhenyu
|
057a6e41f8
|
删除无用注释
|
2021-01-12 17:57:59 +08:00 |
|
joylink_cuiweidong
|
b33e4b92ed
|
暂时 注释 西安二号线 未实现的 功能
|
2021-01-12 17:57:44 +08:00 |
|
sunzhenyu
|
d257bf254b
|
修改sdy行调沙盘，现地cctv
|
2021-01-12 17:57:04 +08:00 |
|
joylink_cuiweidong
|
b04792f529
|
运行图编辑 新增计划代码bug 调整
|
2021-01-12 17:38:30 +08:00 |
|
joylink_cuiweidong
|
1e2e8c2609
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/shape/Responder/index.js
|
2021-01-12 17:27:25 +08:00 |
|
joylink_cuiweidong
|
85a88a9431
|
岔心 绘图代码调整
|
2021-01-12 17:25:32 +08:00 |
|
fan
|
a6481906fb
|
编辑用户信息强制要有名称=》去掉避免
|
2021-01-12 16:19:10 +08:00 |
|
fan
|
63e2a57f36
|
Bug48: 地图列表的位置锁定&仿真权限判断调整
|
2021-01-12 15:40:05 +08:00 |
|
fan
|
4b95be70dd
|
单位添加关联项目
|
2021-01-12 14:34:20 +08:00 |
|
fan
|
affd81e756
|
试卷创建调整
|
2021-01-12 14:13:56 +08:00 |
|
fan
|
e4cf9de494
|
绑定单位调整
|
2021-01-12 13:22:24 +08:00 |
|
fan
|
de395f9bb4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 13:20:12 +08:00 |
|
fan
|
dbc02056fb
|
绑定单位调整
|
2021-01-12 13:18:52 +08:00 |
|
lVAL
|
64df012fc3
|
设置应答器 绘图显示 仿真不显示
|
2021-01-12 11:32:39 +08:00 |
|
lVAL
|
ec5be4bccb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 11:00:38 +08:00 |
|
lVAL
|
8c261bb3a6
|
优化应答器 状态处理功能
|
2021-01-12 11:00:16 +08:00 |
|
fan
|
0e5ebf2445
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 10:20:49 +08:00 |
|
fan
|
097c95beaa
|
教学管理文字调整
|
2021-01-12 10:19:43 +08:00 |
|
joylink_cuiweidong
|
54a312c20f
|
岔心 地图绘图 代码调整
|
2021-01-12 10:11:16 +08:00 |
|
lVAL
|
7bacd3c49f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 10:07:50 +08:00 |
|
lVAL
|
9bd12bb82e
|
增加应答器配置
|
2021-01-12 10:07:31 +08:00 |
|
fan
|
c8150bfa32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-11 17:52:12 +08:00 |
|
fan
|
9a74d3ee39
|
成绩导出调整
|
2021-01-11 17:51:54 +08:00 |
|
sunzhenyu
|
96e2179bd7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-11 15:55:57 +08:00 |
|
sunzhenyu
|
b2ab6d4fd1
|
修改综合演练中三维驾驶不显示选择司机
|
2021-01-11 15:55:48 +08:00 |
|
joylink_cuiweidong
|
e1af8e878e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-11 15:40:15 +08:00 |
|
joylink_cuiweidong
|
6ef0498ffd
|
添加 岔心 地图绘制页面
|
2021-01-11 15:39:06 +08:00 |
|
fan
|
0dca101acd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-11 15:24:10 +08:00 |
|
fan
|
84354dde17
|
课程迁移问题调整&区段限速取消限速仅逻辑区段显示
|
2021-01-11 15:23:56 +08:00 |
|
sunzhenyu
|
0dbc481e3f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-11 13:05:39 +08:00 |
|
sunzhenyu
|
857307644f
|
三维沙盒修改，通号VR内容隐藏
|
2021-01-11 13:05:30 +08:00 |
|
fan
|
ec5b0e0a1e
|
西门子列车未实现操作注释
|
2021-01-11 11:04:14 +08:00 |
|
fan
|
b248e69ffe
|
导入学生信息添加校验&哈尔滨打包不再区分路由文件
|
2021-01-11 10:55:07 +08:00 |
|
fan
|
be8821435b
|
课程迁移调整
|
2021-01-08 17:55:42 +08:00 |
|
fan
|
c6b81eada0
|
课程迁移调整
|
2021-01-08 17:53:04 +08:00 |
|
fan
|
ec5c335d37
|
课程迁移调整
|
2021-01-08 17:48:25 +08:00 |
|
fan
|
682a47f730
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-08 17:27:36 +08:00 |
|
fan
|
0051560fff
|
课程迁移调整
|
2021-01-08 17:27:25 +08:00 |
|
zyy
|
9e355206c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-08 16:51:07 +08:00 |
|
zyy
|
bb22ed66ed
|
调整大屏预览显示流程
|
2021-01-08 16:50:50 +08:00 |
|
joylink_cuiweidong
|
ae722ee86f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-08 16:43:24 +08:00 |
|
joylink_cuiweidong
|
fd89b426b8
|
bug16 管理运行图计划中的查询功能缺失 代码调整
|
2021-01-08 16:42:59 +08:00 |
|
fan
|
6b7acc7f97
|
课程迁移调整
|
2021-01-08 11:26:43 +08:00 |
|
fan
|
4d3991f3e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_lesson
|
2021-01-08 11:13:16 +08:00 |
|
fan
|
dfa815fe6d
|
课程创建迁移&调度电话调整
|
2021-01-08 11:12:58 +08:00 |
|
joylink_cuiweidong
|
18ff2dcd22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-08 09:54:21 +08:00 |
|
joylink_cuiweidong
|
8145673f5d
|
成都三号线 代码调整
|
2021-01-08 09:54:04 +08:00 |
|
lVAL
|
d5f94f8539
|
修改 变量名称
|
2021-01-07 15:18:48 +08:00 |
|
lVAL
|
f5cfb5f787
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/xian_01.js
|
2021-01-07 15:16:34 +08:00 |
|
lVAL
|
1a0612020e
|
增加，信号机灯丝故障处理
|
2021-01-07 15:15:54 +08:00 |
|
fan
|
680b043904
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-07 15:15:11 +08:00 |
|
fan
|
38be92528e
|
组织单位管理
|
2021-01-07 15:14:58 +08:00 |
|
joylink_cuiweidong
|
4d8932e155
|
触发故障管理 布局代码调整
|
2021-01-07 11:13:03 +08:00 |
|
joylink_cuiweidong
|
5469afd2ec
|
调度电话 代码调整
（现地工作站去掉 所有车站）
（呼叫 已经通话的人 会话逻辑处理）
|
2021-01-07 10:31:26 +08:00 |
|
fan
|
fe71e0b0a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-06 18:17:54 +08:00 |
|
fan
|
e94ffd235a
|
故障模式快捷键&ISCS返回（退出）调整
|
2021-01-06 18:17:40 +08:00 |
|
joylink_cuiweidong
|
c266442842
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-06 18:15:34 +08:00 |
|
joylink_cuiweidong
|
558ea5cc95
|
代码调整
|
2021-01-06 18:15:14 +08:00 |
|
joylink_cuiweidong
|
85a6b0c617
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-06 16:01:51 +08:00 |
|
joylink_cuiweidong
|
35645688a5
|
代码调整
|
2021-01-06 16:01:26 +08:00 |
|
fan
|
554d2e994f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-06 13:23:30 +08:00 |
|
fan
|
26d2556502
|
单位暂提
|
2021-01-06 13:23:16 +08:00 |
|
joylink_cuiweidong
|
728ba4b47b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-06 11:28:11 +08:00 |
|
joylink_cuiweidong
|
6e3cdc6bd1
|
bug56 设置运行等级后，查询站台状态显示自动 代码调整
|
2021-01-06 11:27:55 +08:00 |
|
lVAL
|
9993cc3d63
|
如果检测实训生成，就清空数据。
|
2021-01-06 11:21:38 +08:00 |
|
lVAL
|
c4e41ccd6a
|
修改 实训生成过程中，点击限制的问题
|
2021-01-06 11:18:15 +08:00 |
|
lVAL
|
0ad6925791
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-06 10:21:20 +08:00 |
|
lVAL
|
0e37349fcd
|
修改，站台设置跳停和取消跳停现地没有生成实训的配置问题
|
2021-01-06 10:21:11 +08:00 |
|
joylink_cuiweidong
|
923e3ba05c
|
bug57 苏电院西门子仿真线路：进路控制模式显示有误，自动显示人工 修改
|
2021-01-06 09:32:27 +08:00 |
|
joylink_cuiweidong
|
411bde3aee
|
bug 64 苏电院交控仿真线路：信号解封无效 调整
|
2021-01-05 18:19:02 +08:00 |
|
joylink_cuiweidong
|
dd0a0b2fdf
|
bug70（在课程树创建课程章节时，创建二级章节后无法继续创建一级章节）修改
|
2021-01-05 17:31:03 +08:00 |
|
fan
|
e630f870e2
|
merge
|
2021-01-05 16:43:00 +08:00 |
|
fan
|
c352214e89
|
代码暂提
|
2021-01-05 16:37:50 +08:00 |
|
lVAL
|
42dd23b716
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_02/menus/menuSignal.vue
|
2021-01-05 16:05:52 +08:00 |
|
lVAL
|
cc2814f722
|
增加西安2号线实训配置
|
2021-01-05 16:05:13 +08:00 |
|
joylink_cuiweidong
|
c0a949eafa
|
更改 西安二号线 信号机解封 实训提示
|
2021-01-05 15:32:12 +08:00 |
|
lVAL
|
e8d1777703
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-05 15:08:08 +08:00 |
|
fan
|
5dadc4747a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-05 15:09:25 +08:00 |
|
fan
|
382336971d
|
BUG 48:地图列表的位置锁定
|
2021-01-05 15:09:07 +08:00 |
|
lVAL
|
ea7d29f520
|
增加 信号机解封实训配置
|
2021-01-05 15:07:54 +08:00 |
|
