Commit Graph

52 Commits

Author SHA1 Message Date
ival
b39bb21854 修改代码 2019-11-06 18:40:23 +08:00
zyy
10565fdd6b desc: 调整地图绘制高度问题 2019-10-30 18:25:13 +08:00
joylink_cuiweidong
e3dccd58c8 地图设计样式调整 2019-10-29 15:48:38 +08:00
zyy
60c58fe290 desc: 调整个人地图绘制 允许滚轮事件, 地图绘制区段坐标关联 2019-10-28 18:42:31 +08:00
joylink_cuiweidong
6df1eecfc3 代码调整 2019-10-25 16:33:35 +08:00
zyy
033c6f40fa desc: 调整高度 2019-10-24 18:28:06 +08:00
zyy
dd89b94e64 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/layout/components/Logout.vue
2019-10-24 09:47:57 +08:00
zyy
f24259c76d desc: 个人信息修改 2019-10-24 09:46:58 +08:00
joylink_cuiweidong
a1761fd2fc 添加copyRight 2019-10-23 19:15:02 +08:00
fan
a24603aedf 综合仿真页面跳转调整 2019-10-12 11:03:15 +08:00
ival
02fc21e544 增加仿真的大屏角色以及IBP角色 2019-09-04 19:00:22 +08:00
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
sunzhenyu
d7efef41e4 pull 2019-08-29 17:16:33 +08:00
ival
6fad38621b 修改运行图编辑因为家在地图数据而报错的问题 2019-08-09 16:57:07 +08:00
ival
7af324ab1e 国际化配置 2019-08-09 15:10:13 +08:00
ival
3adc1aafb1 修改界面菜单栏加载后出发 缩放按钮重新调整位置
删除代码中的无用代码
2019-08-08 16:37:15 +08:00
zyy
d70953a130 desc: 增加成都四号线模型, 修改地图删除逻辑 2019-08-07 16:23:04 +08:00
zyy
d45c154fe0 修改代码 2019-08-05 15:12:06 +08:00
ival
e64a26f621 修改eventBus大小问题 2019-08-02 14:54:51 +08:00
ival
60aa181598 修改皮肤配置 2019-08-02 14:17:43 +08:00
ival
871a9fbbe2 修改代码 2019-07-31 15:54:20 +08:00
ival
3042cf229d 修改代码 2019-07-31 14:59:38 +08:00
ival
0157f32fc0 修改加载代码 2019-07-31 09:13:37 +08:00
ival
66b2406d91 修改回拉设置bug 2019-07-30 12:44:51 +08:00
ival
c4a6b076da 修改菜单处理 2019-07-29 17:57:00 +08:00
zyy
00dc541830 调整配置代码 2019-07-29 15:23:55 +08:00
ival
21fd4ec516 修改区段状态变化 2019-07-29 09:27:33 +08:00
ival
02bd1e9d40 调试跑车 2019-07-26 18:54:42 +08:00
ival
8f2712e3d8 修改代码 2019-07-26 17:35:58 +08:00
ival
ab86340524 修改列车跑车计算 2019-07-26 17:18:27 +08:00
zyy
7be6ca66fc Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/views/map/mapdraft/mapedit/mapoperate/link.vue
2019-07-26 16:01:18 +08:00
zyy
1305046304 修改代码 2019-07-26 15:59:31 +08:00
ival
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +08:00
zyy
797f31f142 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/views/jlmap/index.vue
2019-07-26 12:18:40 +08:00
zyy
e04e0f1c67 desc: 修改代码 2019-07-26 12:17:53 +08:00
ival
2a0aea6bfe 修改页面点击事件 2019-07-26 10:38:57 +08:00
ival
58911eef1a 修改代码 2019-07-25 18:25:04 +08:00
ival
06f45dd0cb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-25 15:53:55 +08:00
zyy
601d0e2d91 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-25 15:48:58 +08:00
zyy
e32ab592a4 desc: 修改代码 2019-07-25 15:48:51 +08:00
ival
f28f5fc1cd 修改代码 2019-07-25 15:44:23 +08:00
ival
9acdab0b5b Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-25 14:20:03 +08:00
ival
5d6a7fd637 修改代码 2019-07-25 14:19:55 +08:00
zyy
3afd5f8e61 修改代码 2019-07-25 14:03:26 +08:00
zyy
61564dfdbf Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/views/jlmap/index.vue
2019-07-25 13:35:58 +08:00
zyy
d22823bccc 修改代码 2019-07-25 13:26:20 +08:00
ival
a95bf7c338 修改代码 2019-07-25 13:24:40 +08:00
ival
83c6fccfc9 修改代码 2019-07-25 11:07:32 +08:00
ival
a3c6e75448 修改代码 2019-07-25 10:58:17 +08:00
ival
8b46424116 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/router/index.js
#	src/store/index.js
#	src/store/modules/config.js
#	src/views/components/progressBar/index.vue
#	src/views/jlmap/index.vue
#	src/views/jlmap/zoom/zoom.vue
#	src/views/mapsystem/common/index.vue
#	src/views/mapsystem/index.vue
2019-07-25 10:35:10 +08:00