Commit Graph

213 Commits

Author SHA1 Message Date
fan
21c18e8de4 获取每日运行图接口 2020-01-02 09:22:44 +08:00
zyy
8b2158294e 调整指令参数 2019-12-31 18:50:43 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +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
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
eefaf8aad9 实训平台教学 和 设计平台教学管理 prdtype对应接口调整 2019-12-27 17:09:56 +08:00
joylink_cuiweidong
493aab5409 删除与产品相关的接口
修改仿真的prdtype接口代码
2019-12-27 14:04:34 +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
zyy
bfe6c5a537 调整线路配置项流程,对接字段 2019-12-20 14:02:11 +08:00
zyy
3101af9948 增加线路皮肤配置,调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
fan
cc014d4ccc 自动折返设置优先级 2019-12-11 18:25:03 +08:00
fan
5fdbbe9295 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 13:57:06 +08:00
fan
cd15b3737c 自动折返,进路调整 2019-12-11 13:56:46 +08:00
joylink_cuiweidong
98c7e1105f 自动信号接口修改 2019-12-10 18:01:52 +08:00
fan
b6719793c9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 16:50:50 +08:00
fan
6afb5f35a8 高级延续保护调整 2019-12-10 16:50:38 +08:00
joylink_cuiweidong
fed85fe78e 订单列表代码调整 2019-12-10 10:44:18 +08:00
joylink_cuiweidong
9199d7bc64 权限分发代码调整 2019-12-10 10:27:29 +08:00
joylink_cuiweidong
b7fd5b7475 订单管理列表页面代码调整 2019-12-09 16:52:01 +08:00
zyy
94f3bce874 desc: 修改创建权限逻辑 2019-12-03 17:51:39 +08:00
zyy
c089ce1187 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 14:42:07 +08:00
zyy
68d0f374aa desc: 调整道岔生成逻辑 2019-12-03 14:42:00 +08:00
fan
5ca78f0ba7 调整绘图相关-(信号机调整,草稿地图列表接口调整) 2019-12-03 13:36:02 +08:00
zyy
d0a986e8bf 新版地图保存 2019-12-02 14:09:50 +08:00
zyy
0f9ce4c521 desc: 修改权限 2019-11-29 16:32:24 +08:00
lVAL
5852ca6ebf 修改代码 2019-11-26 09:44:37 +08:00
zyy
0880801c1f desc: 增加检测地图名称唯一性 2019-11-22 16:50:30 +08:00
zyy
44f9da4383 desc: 调整绘图进路数据,调整权限修改逻辑,调整设置link中心点BUG 2019-11-22 15:28:02 +08:00
ival
0186f25a2b Merge branch 'dev' into test
# Conflicts:
#	src/api/jlmap3d/load3ddata.js
#	src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
2019-11-19 11:00:13 +08:00
ival
5a4f6f5999 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-18 14:44:13 +08:00
ival
50e9a242e7 修改代码 2019-11-18 14:44:01 +08:00
zyy
8d05730dc4 desc: 修改代码 2019-11-18 14:29:43 +08:00
fan
1c75c8f0ef Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
#	src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
2019-11-15 16:42:32 +08:00
zyy
9bfad2fdeb desc: 修改代码 2019-11-15 16:31:48 +08:00
ival
6ce30aaee2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
#	src/permission.js
#	src/views/display/demon/chartView.vue
#	src/views/display/demon/chatBox.vue
#	src/views/exam/detail/courseDetail.vue
2019-11-14 14:03:41 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
fan
6bb95775b3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/layout/components/Navbar.vue
2019-11-13 14:31:56 +08:00
fan
bd2e82c0ea 权限分发转赠归属人查询 & 其他问题调整 2019-11-13 14:29:20 +08:00
joylink_cuiweidong
b690e1baed 无用的接口删除 2019-11-12 17:06:12 +08:00
zyy
e9ef8efa17 Merge branch 'dev' into test 2019-11-11 19:29:31 +08:00
zyy
db1681b54e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-11 19:24:39 +08:00
zyy
6e29cec983 desc: 修改代码 2019-11-11 19:24:30 +08:00
joylink_cuiweidong
e4dffd17af Merge remote-tracking branch 'remotes/origin/dev' into test 2019-11-11 18:45:09 +08:00
fan
90a45dc5bd Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-11 18:42:34 +08:00