joylink_cuiweidong
|
5e78f3ac64
|
运行图编制代码调整
|
2020-12-09 17:03:22 +08:00 |
|
fan
|
06dbabf05a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:44:47 +08:00 |
|
fan
|
8f7caf199c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:44:06 +08:00 |
|
fan
|
a9b94c8e5d
|
国赛界面去掉截止日期&拦截器提示登出修复&宁波三号线
|
2020-12-08 18:43:55 +08:00 |
|
zyy
|
d5925c305b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:41:30 +08:00 |
|
zyy
|
7ce6cf6e8a
|
调整修改区段bug
|
2020-12-08 18:41:18 +08:00 |
|
sunzhenyu
|
ed5f1dd7eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 16:43:20 +08:00 |
|
sunzhenyu
|
e656be567d
|
三维客流，修复列车人数显示，增加列车进站语音，修改列车pis显示，更新客流站台贴图，修改编辑器车站name。code校对
|
2020-12-08 16:43:12 +08:00 |
|
zyy
|
9ede8ad97d
|
增加删除范围，调整退出仿真发送取消订阅
|
2020-12-08 13:56:36 +08:00 |
|
sunzhenyu
|
5ead363453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 11:28:46 +08:00 |
|
sunzhenyu
|
7a607d308d
|
修改三维客流pis
|
2020-12-08 11:28:34 +08:00 |
|
zyy
|
085990f755
|
增加站台紧急按钮批量删除，增加区段批量删除范围
|
2020-12-08 11:09:02 +08:00 |
|
joylink_cuiweidong
|
4edd31f699
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 09:42:56 +08:00 |
|
joylink_cuiweidong
|
40141c7428
|
剧本编制代码调整
|
2020-12-08 09:42:38 +08:00 |
|
zyy
|
4362eef88b
|
增加删除范围
|
2020-12-07 18:36:53 +08:00 |
|
zyy
|
ed93c3159e
|
删除元素补充
|
2020-12-07 18:19:31 +08:00 |
|
zyy
|
c97074f585
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 18:00:42 +08:00 |
|
zyy
|
b0234db4a2
|
调整道岔生成逻辑
|
2020-12-07 18:00:26 +08:00 |
|
sunzhenyu
|
ce7a3de96f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 17:14:15 +08:00 |
|
sunzhenyu
|
d973dbc46e
|
修改三维设备界面隐藏显示
|
2020-12-07 17:14:06 +08:00 |
|
zyy
|
6b53bc55d6
|
调整删除区段关联车次窗
|
2020-12-07 16:10:03 +08:00 |
|
zyy
|
6995a8a962
|
增加以区段为目标删除左右所有元素
|
2020-12-07 15:09:53 +08:00 |
|
fan
|
0294839530
|
国赛界面调整
|
2020-12-07 09:13:03 +08:00 |
|
zyy
|
9f0465beac
|
增加过滤条件
|
2020-12-06 21:56:00 +08:00 |
|
fan
|
049ab8aa4c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 18:35:11 +08:00 |
|
fan
|
e2e9978cbd
|
大赛信息添加
|
2020-12-04 18:34:58 +08:00 |
|
joylink_cuiweidong
|
cd39147257
|
实训平台代码调整
|
2020-12-04 18:10:07 +08:00 |
|
zyy
|
85cc4ee3d5
|
过滤报错提示
|
2020-12-04 17:22:58 +08:00 |
|
zyy
|
f466ec6fee
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 17:10:14 +08:00 |
|
zyy
|
7054f6c1e6
|
增加运行图编辑
|
2020-12-04 17:10:03 +08:00 |
|
joylink_cuiweidong
|
a0e3875e69
|
实训平台样式调整
|
2020-12-04 15:46:45 +08:00 |
|
joylink_cuiweidong
|
0884f6d227
|
实训平台 样式调整
|
2020-12-04 13:21:41 +08:00 |
|
joylink_cuiweidong
|
c6f58607be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 09:32:20 +08:00 |
|
joylink_cuiweidong
|
666ff5afbb
|
实训平台样式调整
代码调整
|
2020-12-04 09:31:45 +08:00 |
|
fan
|
1b6d212e7d
|
试题定义 placeholder 调整
|
2020-12-04 09:17:34 +08:00 |
|
joylink_cuiweidong
|
8a81682170
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:40:13 +08:00 |
|
joylink_cuiweidong
|
ce001395ff
|
代码调整
|
2020-12-03 18:39:57 +08:00 |
|
fan
|
8accd0c664
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:22:24 +08:00 |
|
fan
|
05f6324413
|
company update
|
2020-12-03 18:22:04 +08:00 |
|
joylink_cuiweidong
|
ddd6905a0c
|
代码调整
|
2020-12-03 16:36:21 +08:00 |
|
joylink_cuiweidong
|
0933930011
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 15:30:03 +08:00 |
|
joylink_cuiweidong
|
a52c9786c1
|
发布地图 导出地图 代码调整
|
2020-12-03 15:29:45 +08:00 |
|
zyy
|
704356cec9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 14:01:27 +08:00 |
|
zyy
|
dfbeb6b604
|
删除多余配置
|
2020-12-03 14:01:15 +08:00 |
|
joylink_cuiweidong
|
7dc23a645d
|
代码调整
|
2020-12-03 13:52:51 +08:00 |
|
joylink_cuiweidong
|
646d585ecf
|
实训/设计平台 左侧地图列表样式调整
|
2020-12-03 11:00:50 +08:00 |
|
joylink_cuiweidong
|
23cbc94c78
|
代码调整
|
2020-12-02 18:37:32 +08:00 |
|
fan
|
cdbd7a0d5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 18:38:40 +08:00 |
|
fan
|
6cc64d7cfc
|
导入学生信息添加loading&哈尔滨日志
|
2020-12-02 18:38:28 +08:00 |
|
joylink_cuiweidong
|
95c685bfab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/demonMenu.vue
|
2020-12-02 17:49:08 +08:00 |
|