Commit Graph

23 Commits

Author SHA1 Message Date
zyy
c22d97b944 desc: 教学系统国际化 2019-08-21 13:46:36 +08:00
ival
adc6828060 修改跳转路由后,页面不加载的问题 2019-08-20 10:34:41 +08:00
fan
c91a4efdcc 修改:国际化调整 2019-08-19 16:35:27 +08:00
ival
4da9dc977b 修改右键菜单,文字颜色 2019-08-19 11:16:29 +08:00
ival
25e3cb19a4 删除运行图创建 2019-08-16 16:42:26 +08:00
fan
951fdd9719 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/i18n/langs/zh/map.js
#	src/i18n/langs/zh/tip.js
#	src/views/map/product/draft.vue
#	src/views/map/product/list.vue
#	src/views/map/skinStyle/draft.vue
#	src/views/map/skinStyle/index.vue
2019-08-15 10:34:31 +08:00
fan
414000331e 调整:国际化 2019-08-15 09:45:31 +08:00
ival
87e35cb38d 同步master代码以及修改交路的问题 2019-08-14 16:37:17 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
ival
e0d76d03c5 修改运行图右键菜单 2019-08-13 18:26:36 +08:00
ival
45417f0072 修改代码 2019-08-13 18:14:19 +08:00
ival
b84f1fe553 运行图修改接口 2019-08-13 17:46:59 +08:00
ival
32a75526ee 修改导入 2019-08-09 15:23:01 +08:00
zyy
f231ffd6f1 desc: 增加成都四号线地图配置 2019-08-08 09:47:39 +08:00
zyy
0b93d7ef16 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/config/deviceStyle.js
#	src/utils/baseUrl.js
#	src/views/map/runplan/manage/operateMenu.vue
2019-08-02 14:32:42 +08:00
zyy
4cf032df11 desc: 增加区段折返箭头代码 2019-08-02 14:31:29 +08:00
ival
dd5218dae5 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/views/jlmap/index.vue
#	src/views/map/runplan/manage/operateMenu.vue
2019-08-02 14:19:06 +08:00
ival
60aa181598 修改皮肤配置 2019-08-02 14:17:43 +08:00
zyy
a010f71252 调整运行图加载, eventbus代码调整 2019-08-02 10:58:28 +08:00
zyy
04e13a7a73 调整代码 2019-08-02 10:36:17 +08:00
ival
276f68e7bc 修改优化代码 2019-07-30 16:47:11 +08:00
ival
05c90f1079 修改代码 2019-07-29 16:03:14 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00