joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
2,972 Commits 20 Branches 0 Tags 448 MiB
0f93d8f203
Commit Graph

2894 Commits

Author SHA1 Message Date
fan
a4ebf22bab 成都一号线菜单调整 2020-01-09 17:48:25 +08:00
zyy
41329739dc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 16:24:10 +08:00
zyy
a4e3e30c78 增加成都一号线请求堆栈 2020-01-09 16:24:01 +08:00
fan
7f54b99883 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 13:03:02 +08:00
fan
ab64e6858e 成都一号线marbar菜单调整 2020-01-09 13:02:40 +08:00
sunzhenyu
c191afd2b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-01-09 11:19:10 +08:00
sunzhenyu
0fdc84330c 修改三维自动section逻辑 2020-01-09 11:19:02 +08:00
zyy
ed3df55457 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:54:40 +08:00
zyy
197d75342c 调整宁波一号线批量扣车逻辑 2020-01-09 09:54:34 +08:00
fan
6e90989ece 成都一号线右键菜单调整 2020-01-09 09:28:20 +08:00
fan
09b27a8d62 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:02:22 +08:00
fan
2b4aa891eb 成都一号线右键菜单调整 2020-01-09 09:02:02 +08:00
joylink_cuiweidong
54a5ff38a1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 18:26:20 +08:00
joylink_cuiweidong
82bef6ed4d 北京一号线新版 右键菜单指令调整 2020-01-08 18:26:07 +08:00
zyy
2e042b9fee Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 17:50:22 +08:00
zyy
fa513a1e8f 调整宁波一号线控制权右键条件 2020-01-08 17:50:16 +08:00
joylink_cuiweidong
b45b59599d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 17:42:39 +08:00
joylink_cuiweidong
88d4ccf8d9 北京一号线新版 区段道岔指令调整 2020-01-08 17:42:28 +08:00
zyy
d79641e0e4 调整指令字典中条件参数 2020-01-08 17:21:17 +08:00
joylink_cuiweidong
c29033177d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 16:24:24 +08:00
joylink_cuiweidong
4dde67b582 北京一号线新版信号机操作调整 2020-01-08 16:23:45 +08:00
zyy
b345594605 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 14:59:33 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
joylink_cuiweidong
387746a69b 北京一号线新版 站台指令操作调整 2020-01-08 14:49:20 +08:00
fan
bf49c52c3e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 09:56:44 +08:00
zyy
9bbc497488 调整宁波一号线批量扣车key 2020-01-08 09:48:24 +08:00
fan
b84f86916f Merge remote-tracking branch 'origin/dev' into test 2020-01-08 09:42:36 +08:00
fan
83a37a1b28 成都一号线右键菜单调整 2020-01-08 09:41:55 +08:00
zyy
02af288233 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 18:03:56 +08:00
zyy
2310fec6ef 兼容老板地图状态，调整宁波线批量扣车数据 2020-01-07 18:03:49 +08:00
joylink_cuiweidong
91d1f98f69 北京一号线新版站台区段车站右键菜单调整 2020-01-07 17:40:24 +08:00
joylink_cuiweidong
7fd885a1c2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/jmapNew/theme/beijing_01/planConvert.js
 2020-01-07 15:22:50 +08:00
joylink_cuiweidong
ce98244b44 北京一号线新版 道岔和信号机的右键菜单代码调整 2020-01-07 15:19:18 +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
1a2ab7018c 设备管理-配置编辑 提示文字修改 2020-01-07 13:20:47 +08:00
fan
9a2d5f4602 Merge remote-tracking branch 'origin/dev' into test 2020-01-07 13:11:57 +08:00
fan
f4c8832133 设备管理-配置编辑 信号机配置调整 2020-01-07 13:11:13 +08:00
fan
e4678d6f1a Merge remote-tracking branch 'origin/dev' into test 2020-01-07 13:06:16 +08:00
fan
5dc3eb83f8 设备管理-配置编辑 信号机配置调整 2020-01-07 13:05:06 +08:00
fan
2d8d16c0e7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 10:59:38 +08:00
zyy
3ebebd7e13 Merge branch 'dev' into test 2020-01-07 10:53:32 +08:00
zyy
5eb56d0a96 调整旧版地图右键菜单操作 2020-01-07 10:52:44 +08:00
sunzhenyu
7acd86d332 修改继电器显示逻辑 2020-01-07 10:51:19 +08:00
sunzhenyu
60e1750611 增加继电器数量 2020-01-07 10:41:21 +08:00
fan
c09021067a 设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数 2020-01-07 09:36:19 +08:00
sunzhenyu
b66b80b2b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-01-07 09:28:10 +08:00
fan
b24b27f477 Merge remote-tracking branch 'origin/dev' into test 2020-01-07 09:28:13 +08:00
fan
9944bdef33 设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数 2020-01-07 09:27:49 +08:00
sunzhenyu
f1f21006fe 修改继电器通信，修改新数据三维化部分操作 2020-01-07 09:27:41 +08:00
zyy
ea528dacef Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 09:23:11 +08:00
zyy
0330e08f89 调整车站状态显示，调整右键菜单显示，设置默认状态 2020-01-07 09:23:04 +08:00
fan
2d78605468 Merge remote-tracking branch 'origin/dev' into test 2020-01-07 09:20:10 +08:00
fan
cf34d61746 设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数 2020-01-07 09:18:06 +08:00
fan
f2b62f281e 指令调整，公共地图宽度调整 2020-01-06 18:39:44 +08:00
fan
4d912022d5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-06 14:46:22 +08:00
fan
287eab2431 代码调整 2020-01-06 14:46:03 +08:00
fan
2554ed1135 代码调整 2020-01-06 14:43:08 +08:00
zyy
cabf30ed49 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-06 14:42:37 +08:00
zyy
3d8fcd305a 调整宁波一号线右键菜单流程 2020-01-06 14:42:28 +08:00
fan
68a7171495 国际化调整 2020-01-06 11:25:07 +08:00
sunzhenyu
505e9a0da4 修改区段数值匹配 2020-01-03 19:01:34 +08:00
fan
79aaba36da 连接真实设备添加连接状态 2020-01-03 18:42:08 +08:00
fan
100b852a9c 修复：顶掉用户，再次登录未获取新用户信息 2020-01-03 18:17:40 +08:00
fan
cd04327fa9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 17:01:12 +08:00
fan
673df154b4 国际化和连接真实设备调整 2020-01-03 17:00:33 +08:00
sunzhenyu
9cd76ee143 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-01-03 16:56:44 +08:00
sunzhenyu
71cadb56e8 修改编辑器轨道匹配逻辑 2020-01-03 16:56:36 +08:00
zyy
9d205b7a2b Merge branch 'dev' into test 2020-01-03 16:44:39 +08:00
zyy
6e0ab142f7 创建试卷过滤控制，避免其他错误 2020-01-03 16:43:07 +08:00
zyy
f813906f03 Merge branch 'dev' into test 2020-01-03 16:18:21 +08:00
zyy
ad9d14e842 调整站台右键显示 2020-01-03 16:17:40 +08:00
zyy
28e0617c87 删除注释，信号机流程完成 2020-01-03 16:01:57 +08:00
zyy
308f82c14e 提交请求进路接口 2020-01-03 15:52:51 +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
766a169282 指令调整参数 2020-01-03 15:03:45 +08:00
fan
1695bb1d21 恢复退出仿真 2020-01-03 14:57:26 +08:00
fan
cb0f21a183 网关字地址可以为0，所有数据不可为小数 2020-01-03 13:49:40 +08:00
fan
b43d04a238 取消真实设备接口写死 2020-01-03 11:32:27 +08:00
fan
a384a8da19 Merge remote-tracking branch 'origin/dev' into test 2020-01-03 11:20:44 +08:00
fan
dd57e3e85c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 11:18:36 +08:00
fan
e022b00a00 项目设备综合演练调整 2020-01-03 11:18:18 +08:00
zyy
2c01e8ace1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-02 18:40:36 +08:00
zyy
59e5c5fef7 调整相关用户的列表 名称变昵称显示 2020-01-02 18:40:30 +08:00
joylink_cuiweidong
e1d979e89a 代码调整 2020-01-02 17:06:35 +08:00
fan
c8a6e0d8ec Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-02 17:01:23 +08:00
fan
65b766e27f 项目设备管理 2020-01-02 17:01:11 +08:00
zyy
0b3e3311f0 删除控制模式 2020-01-02 14:57:13 +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
zyy
e750406484 Merge branch 'dev_cmd' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_cmd 2020-01-02 10:46:17 +08:00
zyy
7c5352ce7c 调整宁波一号线站台操作 2020-01-02 10:46:09 +08:00
fan
8466bcb059 成都三指令调整 2020-01-02 09:49:41 +08:00
fan
57e38a37a5 成都三指令调整 2020-01-02 09:29:23 +08:00
fan
21c18e8de4 获取每日运行图接口 2020-01-02 09:22:44 +08:00
fan
396e901a4d 添加/ 2020-01-02 09:06:03 +08:00
zyy
8b2158294e 调整指令参数 2019-12-31 18:50:43 +08:00
sunzhenyu
33966b5a33 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-31 18:21:34 +08:00
sunzhenyu
432aff42a3 修改仿真驾驶换车错位 2019-12-31 18:20:53 +08:00
zyy
cf370249eb 调整指令 2019-12-31 18:10:49 +08:00
zyy
760225549e 兼容新旧两种发送机制 2019-12-31 17:20:04 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +08:00
fan
ce5c87608a 调整考试提交返回再次进入时未获取到mapId的问题&&题目框自动收取的问题 2019-12-31 16:57:35 +08:00
zyy
e03a4d12e0 调整宁波一号线 2019-12-31 16:24:22 +08:00
zyy
3044da2ea4 调整福州使用新版指令方式发送 2019-12-31 16:11:09 +08:00
fan
e6421dbeb6 Merge remote-tracking branch 'origin/dev' into test 2019-12-31 15:57:09 +08:00
fan
ef1f301292 菜单置灰调整 2019-12-31 15:53:55 +08:00
fan
7dde1958f5 皮肤实例化调整 2019-12-31 15:36:49 +08:00
sunzhenyu
e2e9bc7be3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-31 15:13:36 +08:00
sunzhenyu
465520368b 修改新数据读取逻辑 2019-12-31 15:13:29 +08:00
joylink_cuiweidong
48e6318a24 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-31 15:04:28 +08:00
joylink_cuiweidong
9f2ad62c8f 浏览器地址栏输入根目录 跳转到实训平台登陆页面 
实训平台权限代码调整
 2019-12-31 15:02:58 +08:00
joylink_cuiweidong
ac51cf72ae Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-31 14:38:10 +08:00
fan
0504a2a2a6 迁移cmd分支 2019-12-31 14:32:04 +08:00
fan
4ce64c614b 问题调整 2019-12-31 14:30:23 +08:00
fan
eb8f64af27 课程系统左侧栏 2019-12-31 13:15:28 +08:00
joylink_cuiweidong
8f5a029467 权限分发<创建权限> 购买时长和购买总价加减代码调整 2019-12-31 10:22:58 +08:00
fan
efdd241d2c 初始路由跳转调整 2019-12-31 09:12:40 +08:00
joylink_cuiweidong
0caa944d0d Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-30 19:04:36 +08:00
fan
f8c7a46743 调整合并问题 2019-12-30 18:58:23 +08:00
joylink_cuiweidong
4ce7b8250a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-30 18:47:09 +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
fan
e4aa7a2ccf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_gzb 2019-12-30 18:25:22 +08:00
fan
bd8e3c0fc3 添加枚举 2019-12-30 18:25:01 +08:00
joylink_cuiweidong
dc9a059a7b 实训平台仿真权限代码调整 2019-12-30 18:14:52 +08:00
zyy
dbca771102 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-30 18:13:44 +08:00
zyy
b336e1844b 调整宁波一号线右键菜单操作及显示流程 2019-12-30 18:13:38 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
joylink_cuiweidong
cbac3d2b9d 权限分发管理，创建权限 打包 接口调整 2019-12-30 17:13:21 +08:00
zyy
4a06c92ea1 修改鼠标静止隐藏移动显示逻辑 2019-12-30 14:06:42 +08:00
zyy
ce44ec4429 调整宁波线 样式，显示宁波线右键操作 2019-12-30 13:24:40 +08:00
joylink_cuiweidong
23d14d6c8e 实训平台 教学详情和仿真详情 合计改为权限总数 2019-12-30 09:58:43 +08:00
fan
15f7aa656e 新版地图包加载仿真 2019-12-30 09:57:54 +08:00
joylink_cuiweidong
0c9843f233 代码调整 2019-12-30 09:36:35 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
joylink_cuiweidong
40bc4840e7 prdType 接口调整 2019-12-27 19:36:29 +08:00
joylink_cuiweidong
0486d0211b prdType对应接口修改 2019-12-27 18:48:56 +08:00
sunzhenyu
248075d338 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-27 18:10:22 +08:00
sunzhenyu
c387c3836f 修改数字沙盘行车逻辑bug，逻辑改为目的地link判断是否行使，修正初始列车坐标赋值 2019-12-27 18:10:14 +08:00
fan
e5997a5856 修复： 信号机接近区段检索后台无数据是清空之前的数据 2019-12-27 17:32:22 +08:00
joylink_cuiweidong
eefaf8aad9 实训平台教学 和 设计平台教学管理 prdtype对应接口调整 2019-12-27 17:09:56 +08:00
fan
a285d28cb3 整理代码 2019-12-27 15:23:42 +08:00
joylink_cuiweidong
59f4a8d253 仿真里面的prdtype调整 2019-12-27 14:20:29 +08:00
joylink_cuiweidong
493aab5409 删除与产品相关的接口 
修改仿真的prdtype接口代码
 2019-12-27 14:04:34 +08:00
joylink_cuiweidong
25ff5bdb6b 删除仿真里的回放 2019-12-27 11:30:49 +08:00
joylink_cuiweidong
1ad20fe522 删除实训平台 权限 权限打包 2019-12-27 11:11:38 +08:00
joylink_cuiweidong
f985a93c9e 设计平台 课程设计 实训管理 prdtype 接口调整 2019-12-27 10:47:07 +08:00
joylink_cuiweidong
e67d1fb279 删除maprd有关的接口 2019-12-27 10:24:14 +08:00
joylink_cuiweidong
d15eca77ea 删除系统管理产品编辑 
删除发布内容管理产品状态
 2019-12-27 10:04:09 +08:00
joylink_cuiweidong
9b3c41dbfb 设计平台，课程 创建章节 获取实训列表接口修改 2019-12-27 09:47:07 +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
joylink_cuiweidong
11de837332 设计平台课程设计实训管理 生成实训/删除实训/修改实训 调整 2019-12-26 19:58:34 +08:00
joylink_cuiweidong
044068d4a8 删除实训平台地图权限页面 打包详情按钮 
删除设计平台商品管理页面 添加按钮
 2019-12-26 19:15:48 +08:00
joylink_cuiweidong
d157dc0a88 删除权限管理的权限打包按钮 
删除权限分发管理的权限打包按钮
 2019-12-26 18:07:43 +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
joylink_cuiweidong
cd5e923c52 用户实训统计，用户仿真统计 产品类型修改 2019-12-26 16:32:03 +08:00
zyy
9123a794f0 道岔显示关联区段 2019-12-26 16:06:33 +08:00
zyy
70e72e3560 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 15:39:36 +08:00
zyy
e0e9bfc6a6 增加成都一号线运行图导入，增加成都一号线配置，删除成都四号线配置 2019-12-26 15:39:29 +08:00
fan
45e78f4b67 区段赋值前，清除所有数据 2019-12-26 15:38:33 +08:00
fan
0e2242ed39 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 15:14:36 +08:00
fan
78b28f118b 信号机参数名调整，旋转限制调整 2019-12-26 15:14:17 +08:00
zyy
e4e537483e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 14:48:21 +08:00
zyy
45f0a5a1c6 调整成都三，宁波一运行图显示备用车问题 2019-12-26 14:48:11 +08:00
fan
1540119022 Merge remote-tracking branch 'origin/dev' into test 2019-12-26 14:07:28 +08:00
fan
65475abf6f 进路赋值前清除延续保护表单 2019-12-26 14:06:42 +08:00
joylink_cuiweidong
8e82ceab27 权限打包页面接口调整（/api/lesson） 2019-12-26 13:12:23 +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
sunzhenyu
f9e32dc904 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-26 10:41:16 +08:00
sunzhenyu
76379f12cc 继电器通信，修改继电器逻辑，继电器模型动画更替，修改设备信号灯逻辑，修改设备道岔初始化bug 2019-12-26 10:41:07 +08:00
joylink_cuiweidong
4a30ced825 创建课程时，所属产品变为产品类型 2019-12-25 19:40:49 +08:00
joylink_cuiweidong
b70daac9bf 定制-产品名称改为产品类型 
展示页面产品名称改为产品类型
 2019-12-25 19:28:03 +08:00
joylink_cuiweidong
cb1ca75eb7 用户仿真统计 
新增-产品名称改为产品类型
前端维护一个产品类型枚举
 2019-12-25 18:56:25 +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
fan
7328b7adb6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-25 09:19:54 +08:00
fan
9331180684 调整：信号机接近区段中信号机选中变为黄色 2019-12-25 09:18:28 +08:00
zyy
f23da9be42 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
 2019-12-25 09:13:29 +08:00
zyy
741fccf609 删除多余字段 2019-12-25 09:12:22 +08:00
fan
fc4518b5a0 调整：延续保护区段和信号机接近区段可选逻辑区段 2019-12-25 08:58:50 +08:00
fan
d1cc62cd99 信号机接近区段信号机change，检索后台数据 2019-12-24 18:24:37 +08:00
fan
52eddbaa3d 调整logicSectionCodeList赋值增加校验 2019-12-24 18:05:56 +08:00
fan
6d82f466a6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-24 14:28:29 +08:00