Commit Graph

348 Commits

Author SHA1 Message Date
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
zyy
473b289692 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 14:49:58 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
fan
1f88b03322 连接真实设备-国际化提示调整 2020-01-07 13:50:09 +08:00
fan
5dc3eb83f8 设备管理-配置编辑 信号机配置调整 2020-01-07 13:05:06 +08:00
zyy
5eb56d0a96 调整旧版地图右键菜单操作 2020-01-07 10:52:44 +08:00
fan
f2b62f281e 指令调整,公共地图宽度调整 2020-01-06 18:39:44 +08:00
fan
2554ed1135 代码调整 2020-01-06 14:43:08 +08:00
zyy
28e0617c87 删除注释,信号机流程完成 2020-01-03 16:01:57 +08:00
zyy
c13963f793 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 15:50:32 +08:00
zyy
4f2fb97477 调整宁波线右键菜单显示 2020-01-03 15:50:26 +08:00
fan
1695bb1d21 恢复退出仿真 2020-01-03 14:57:26 +08:00
zyy
496a00c8fe 调整道岔区段坐标点bug 2020-01-02 14:30:03 +08:00
zyy
764f7c479e 调整右键菜单获取 2020-01-02 11:08:01 +08:00
zyy
5db5bb40f8 Merge branch 'dev_cmd' into dev 2020-01-02 10:47:08 +08:00
fan
21c18e8de4 获取每日运行图接口 2020-01-02 09:22:44 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +08:00
fan
ce5c87608a 调整考试提交返回再次进入时未获取到mapId的问题&&题目框自动收取的问题 2019-12-31 16:57:35 +08:00
fan
7dde1958f5 皮肤实例化调整 2019-12-31 15:36:49 +08:00
fan
4ce64c614b 问题调整 2019-12-31 14:30:23 +08:00
fan
eb8f64af27 课程系统左侧栏 2019-12-31 13:15:28 +08:00
joylink_cuiweidong
ca6ca0ecc4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-30 18:45:17 +08:00
joylink_cuiweidong
cad56a82e9 Merge branch 'dev_prd' into dev
# Conflicts:
#	src/views/demonstration/detail/index.vue
2019-12-30 18:45:05 +08:00
joylink_cuiweidong
cbac3d2b9d 权限分发管理,创建权限 打包 接口调整 2019-12-30 17:13:21 +08:00
zyy
4a06c92ea1 修改鼠标静止隐藏移动显示逻辑 2019-12-30 14:06:42 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
fan
e5997a5856 修复: 信号机接近区段检索后台无数据是清空之前的数据 2019-12-27 17:32:22 +08:00
fan
a285d28cb3 整理代码 2019-12-27 15:23:42 +08:00
fan
d29bc62dda Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-27 09:41:02 +08:00
fan
573bf83ea8 整理代码 2019-12-27 09:40:52 +08:00
zyy
72ecdae535 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 18:07:29 +08:00
zyy
82cbae08ec 调整新旧地图加载方式 2019-12-26 18:07:23 +08:00
fan
dafd6d42cd Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 16:54:38 +08:00
fan
2a11b8d697 信号机增加名字旋转标识,区段关联关系增加校验,进路列表增加编码展示列 2019-12-26 16:54:24 +08:00
zyy
6c37fe6bdf 调整点击计轴区段显示高亮,调整区段高亮颜色 2019-12-26 16:38:44 +08:00
zyy
9123a794f0 道岔显示关联区段 2019-12-26 16:06:33 +08:00
fan
45e78f4b67 区段赋值前,清除所有数据 2019-12-26 15:38:33 +08:00
fan
78b28f118b 信号机参数名调整,旋转限制调整 2019-12-26 15:14:17 +08:00
fan
65475abf6f 进路赋值前清除延续保护表单 2019-12-26 14:06:42 +08:00
fan
d327e50a44 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 11:04:57 +08:00
fan
8431ff8cc4 增加非空校验 2019-12-26 11:04:21 +08:00
zyy
8d5fce7250 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 11:02:00 +08:00
zyy
6e3424e355 调整实训平台新旧地图显示逻辑 2019-12-26 11:01:54 +08:00
fan
6ff30c5b63 增加非空校验 2019-12-26 10:47:40 +08:00
fan
d79d2af32c 区段赋值时清除逻辑区段code列表 2019-12-26 10:44:08 +08:00
zyy
1c04b8d215 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-25 18:45:53 +08:00
zyy
74f0b12e3c 修改运行图显示,调整进路列表展示 2019-12-25 18:45:48 +08:00
joylink_cuiweidong
8b27475499 站台修改对应的车站时,同时修改所属集中站 2019-12-25 17:33:57 +08:00
fan
df7f13d411 延续保护区段预览详情合并rowspan 2019-12-25 10:58:58 +08:00
fan
432b268675 延续保护区段,进路物理区段,信号机接近区段激活状态下,点击已选中的区段删除列表中的该区段 2019-12-25 10:31:42 +08:00