Commit Graph

42 Commits

Author SHA1 Message Date
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
fan
007c3658c6 调整本地项目 2020-03-31 16:54:04 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
zyy
d5c9799189 删除路径单元模块 新增设置站间运行等级 2020-03-25 13:45:58 +08:00
zyy
dcead8d707 增加点击事件取消选中状态为全局混入,删除多余线路utils配置 2020-01-13 14:40:24 +08:00
ival
f26275e03c 修改代码 2019-11-18 18:47:02 +08:00
zyy
db24914ee7 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-14 14:10:26 +08:00
zyy
558f359c77 删除elementui 改用cdn方式加载 2019-11-14 14:10:20 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
zyy
2266f6d823 desc: 修改代码 2019-11-13 09:06:57 +08:00
zyy
0cb102186f desc: 修改echarts加载方式 2019-11-12 17:20:23 +08:00
ival
03c2317503 拆分指令 2019-10-18 15:17:33 +08:00
ival
55166e7aea 修改elementUi切换中英文不成功的问题 2019-08-30 18:20:07 +08:00
zyy
ecc9806d61 desc: 修改地图配置 2019-08-15 16:11:09 +08:00
ival
3bb449080f Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
#	src/i18n/langs/zh/tip.js
#	src/jlmap3d/jl3ddrive/jl3ddrive.js
#	src/views/components/pay/index.vue
#	src/views/demonstration/detail/index.vue
#	src/views/display/index.vue
#	src/views/exam/detail/courseDetail.vue
#	src/views/exam/detail/examDetail.vue
#	src/views/exam/detail/questionDetail.vue
#	src/views/jlmap3d/drive/jl3ddrive.vue
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
#	src/views/jointTraining/index.vue
#	src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
#	src/views/map/mapdraft/mapedit/mapoperate/link.vue
#	src/views/map/mapdraft/mapedit/mapoperate/section.vue
#	src/views/map/mapdraft/mapedit/mapoperate/signal.vue
#	src/views/map/mapdraft/mapedit/mapoperate/station.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
#	src/views/map/mapdraft/mapedit/mapoperate/switch.vue
#	src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
#	src/views/map/mapdraft/mapedit/routeoperate/detail.vue
#	src/views/map/mapdraft/mapedit/routeoperate/preview.vue
#	src/views/map/mapdraft/mapedit/routeoperate/related.vue
#	src/views/map/mapdraft/mapedit/routeoperate/route.vue
#	src/views/map/mapdraft/mapmanage/operateMenu.vue
#	src/views/map/product/draft.vue
#	src/views/map/product/list.vue
#	src/views/map/skinStyle/draft.vue
#	src/views/map/skinStyle/index.vue
#	src/views/planMonitor/detail.vue
#	src/views/planMonitor/editTool/index.vue
#	src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
#	src/views/planMonitor/editTool/schedule.vue
#	src/views/teach/detail/index.vue
#	src/views/teach/practical/index.vue
2019-08-14 15:57:52 +08:00
ival
25479392ff 修改配置 2019-08-14 10:12:51 +08:00
ival
0eaa4dbe1f 修改国际化配置 2019-08-13 11:10:55 +08:00
sunzhenyu
2cbf0f0452 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-12 14:12:16 +08:00
sunzhenyu
da5bc03838 修改错误引用 2019-08-12 14:12:12 +08:00
ival
be91b4f1c6 修改语言 2019-08-12 14:10:46 +08:00
sunzhenyu
46d776a642 pull 2019-08-12 13:43:40 +08:00
sunzhenyu
de7ee56d77 删除不用资源 2019-08-12 13:42:53 +08:00
ival
52e9b1f79f 增加国际化配置 2019-08-12 10:18:59 +08:00
ival
763cff0a7c 修改页面不刷新的问题 2019-08-09 18:29:08 +08:00
ival
bfddddf7e6 修改代码 2019-08-09 17:25:45 +08:00
ival
7af324ab1e 国际化配置 2019-08-09 15:10:13 +08:00
zyy
b20686c0fa desc: 修改 订阅综合演练房间号发送判断,修改代码格式 2019-08-08 18:34:35 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
sunzhenyu
f95b9eb1b7 merge 2019-08-08 14:20:00 +08:00
sunzhenyu
2aa7bfd759 修改js挂载 2019-08-08 14:19:03 +08:00
ival
b15a7feb23 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/main.js
2019-08-08 11:31:36 +08:00
ival
c66d72a049 增加i18n国际化配置 2019-08-08 11:29:03 +08:00
sunzhenyu
b326cbf73f push 2019-08-08 10:53:19 +08:00
sunzhenyu
6da9552dc7 pull 2019-08-08 10:52:43 +08:00
sunzhenyu
9f9236361a 修改threejs挂载 2019-08-08 10:52:06 +08:00
zyy
f231ffd6f1 desc: 增加成都四号线地图配置 2019-08-08 09:47:39 +08:00
sunzhenyu
c27aed050f 挂载threejs,添加静态文件插件 2019-08-06 14:10:21 +08:00
ival
e64a26f621 修改eventBus大小问题 2019-08-02 14:54:51 +08:00
ival
276f68e7bc 修改优化代码 2019-07-30 16:47:11 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00
zyy
d4191832fb desc: 修改eslint 配置 保存 2019-07-04 10:59:40 +08:00
ival
3780ebefad 增加nclient工程 2019-07-02 16:29:52 +08:00