Commit Graph

2910 Commits

Author SHA1 Message Date
joylink_cuiweidong
0a216685c2 添加案例展示 2019-11-27 13:43:08 +08:00
lVAL
e66ddd1b84 修改代码 2019-11-26 10:01:55 +08:00
lVAL
58e11bf90a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-26 09:44:47 +08:00
lVAL
5852ca6ebf 修改代码 2019-11-26 09:44:37 +08:00
joylink_cuiweidong
5d7739c947 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-11-26 09:23:29 +08:00
joylink_cuiweidong
c3642d67eb 代码调整 2019-11-26 09:21:26 +08:00
lVAL
fc2d35404b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-25 19:01:39 +08:00
lVAL
3a190f8fbf 修改 2019-11-25 19:01:31 +08:00
fan
c4079984d0 代码调整 2019-11-25 18:58:39 +08:00
lVAL
9eea637a70 修改 2019-11-25 18:57:17 +08:00
lVAL
aee030f01d Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	src/router/index.js
#	src/scripts/plugin/MenuContextHandler.js
2019-11-25 18:25:17 +08:00
lVAL
899f4a4216 修改跳转bug 2019-11-25 18:21:56 +08:00
lVAL
a5bb60cf68 删除跳转页面中无用的subSystem参数 2019-11-25 18:12:34 +08:00
joylink_cuiweidong
f04eb49964 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-25 15:57:23 +08:00
joylink_cuiweidong
84ad30ee6d 登陆问题调整 2019-11-25 15:57:11 +08:00
zyy
1317b182c5 调整权限生成延迟问题 2019-11-25 11:19:52 +08:00
zyy
93094cf623 desc: 屏蔽获取不到list 报错问题 2019-11-25 11:01:57 +08:00
zyy
811e919236 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-25 10:44:55 +08:00
zyy
1d82ce738f desc: 修改考试规则定义,调整更新商品更新样式 2019-11-25 10:44:48 +08:00
joylink_cuiweidong
e9009c0198 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-25 10:31:14 +08:00
joylink_cuiweidong
e2aedd9fe0 代码调整 2019-11-25 10:31:03 +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
joylink_cuiweidong
927f7afb88 设计平台首页轮播图片修改 2019-11-22 14:37:30 +08:00
1165524548 修改测试打包环境和websocket日志 2019-11-22 02:11:24 +08:00
joylink_cuiweidong
5ac012fc79 运行图代码调整 2019-11-21 09:34:55 +08:00
zyy
fa3d0cb099 desc: 调整代码书写逻辑 2019-11-20 16:31:41 +08:00
zyy
1719292036 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-20 10:51:21 +08:00
zyy
9c24d43a7c 修改代码 2019-11-20 10:51:02 +08:00
ival
6b23ca6f0d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-20 10:39:58 +08:00
ival
0c6d17647a 修改代码 2019-11-20 10:39:46 +08:00
joylink_cuiweidong
c264b61f65 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-20 10:39:14 +08:00
joylink_cuiweidong
58d151f9ea 代码调整 2019-11-20 10:39:00 +08:00
ival
898135a61b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 18:35:49 +08:00
ival
cd6e2ea224 修改代码 2019-11-19 18:35:31 +08:00
zyy
32dbcee7d0 调整绘图宽度 2019-11-19 18:01:49 +08:00
joylink_cuiweidong
998fcf7146 代码提交 2019-11-19 17:57:13 +08:00
joylink_cuiweidong
bb296a7238 代码调整 2019-11-19 17:55:27 +08:00
zyy
ff50a2c4f5 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 17:48:43 +08:00
joylink_cuiweidong
096a848024 代码调整 2019-11-19 17:48:33 +08:00
zyy
f3798aa2c9 desc: 增加屏蔽门list 2019-11-19 17:48:32 +08:00
joylink_cuiweidong
5fca43650b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/scripts/plugin/CommandHandler.js
2019-11-19 17:44:18 +08:00
joylink_cuiweidong
bd2744f567 代码调整 2019-11-19 17:42:36 +08:00
joylink_cuiweidong
fb81b69471 右键菜单显示代码调整 2019-11-19 17:19:44 +08:00
joylink_cuiweidong
4a7e0285a8 Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
#	src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue
#	src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue
2019-11-19 17:08:57 +08:00
joylink_cuiweidong
13a5df8571 代码调整 2019-11-19 17:06:13 +08:00
ival
d3ddfeadc8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 16:41:37 +08:00
ival
09af7d91b4 修改代码 2019-11-19 16:41:21 +08:00
zyy
6ab6f83ae8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-19 16:39:35 +08:00
zyy
00877ac164 修改代码 调整绘图逻辑 2019-11-19 16:39:24 +08:00