Commit Graph

60 Commits

Author SHA1 Message Date
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
fan
df933b2b0d 调整本地项目本地启动 2020-04-01 09:25:46 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
2020-03-31 11:14:33 +08:00
fan
2db44747ee 生成线下用户 2020-03-30 17:41:27 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
fan
a697ab21d5 调整实训 2020-03-27 13:52:14 +08:00
fan
12dab4eea4 Merge remote-tracking branch 'origin/dev' into test 2020-01-20 10:06:48 +08:00
zyy
f42c48a0c4 调整iscs为新的系统 2020-01-19 18:36:17 +08:00
sunzhenyu
d32820e1b4 修改三维背景bug,修改继电器模型和显示,继电器地址,修改三维地图站台偏差 2020-01-16 17:04:16 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00
fan
376362d6c9 删除日志 2020-01-13 16:45:47 +08:00
fan
a6476ea5d9 添加登录页哈尔滨盈达科技 2020-01-13 13:56:03 +08:00
fan
662e38a22c 添加登录页哈尔滨盈达科技 2020-01-13 13:33:35 +08:00
joylink_cuiweidong
9f2ad62c8f 浏览器地址栏输入根目录 跳转到实训平台登陆页面
实训平台权限代码调整
2019-12-31 15:02:58 +08:00
fan
efdd241d2c 初始路由跳转调整 2019-12-31 09:12:40 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
sunzhenyu
bd1f12bd79 暂时将继电器放入白名单 2019-12-13 16:09:43 +08:00
fan
c4079984d0 代码调整 2019-11-25 18:58:39 +08:00
joylink_cuiweidong
84ad30ee6d 登陆问题调整 2019-11-25 15:57:11 +08:00
fan
f07144689b Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-14 16:23:28 +08:00
fan
d7df05f475 代码调整 2019-11-14 16:22:39 +08:00
joylink_cuiweidong
fe23a03e69 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/store/modules/permission.js
2019-11-14 15:59:32 +08:00
joylink_cuiweidong
595747be2a 代码调整 2019-11-14 15:54:58 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
zyy
71ca6e2cc4 修改代码 2019-11-13 10:15:40 +08:00
ival
8fb45d91a0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-12 17:28:44 +08:00
ival
8eb4ac80a6 修改刷新问题 2019-11-12 17:27:30 +08:00
zyy
0cb102186f desc: 修改echarts加载方式 2019-11-12 17:20:23 +08:00
joylink_cuiweidong
50e74a0372 代码调整 2019-10-31 14:06:00 +08:00
joylink_cuiweidong
681ac5e886 路由调整
接口调整
2019-10-31 13:56:42 +08:00
fan
a6b0caab34 西铁院调整 2019-10-29 15:06:15 +08:00
fan
42cdacbcd0 西铁院项目路由调整 2019-10-28 17:08:22 +08:00
fan
12d25d1643 运行图测试运行调整,西铁院登录页路由调整 2019-10-25 16:45:17 +08:00
fan
bfce5a2103 问题调整 2019-10-25 12:59:24 +08:00
fan
b6ffc55efd 登录页面整合 2019-10-24 14:03:19 +08:00
fan
62de921294 问题调整 2019-10-23 19:00:35 +08:00
joylink_cuiweidong
8320f57345 路由调整 2019-10-23 13:35:14 +08:00
fan
f8b149fa5a 同一个标签切换平台404问题 2019-10-23 10:43:29 +08:00
fan
089e45bf33 实训录制演示功能调整 2019-10-22 13:50:58 +08:00
fan
ee62ceb0e5 产品分化调整 2019-10-17 16:04:07 +08:00
fan
3fef2c1c9d 代码调整 2019-10-17 14:51:37 +08:00
fan
6e139bcdbb Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_merger
# Conflicts:
#	src/router/index.js
2019-10-17 14:39:08 +08:00
zyy
6ca619b71f desc: 修改格式化 2019-10-17 14:35:10 +08:00
fan
00c4415fcc 代码整合调整 2019-10-17 14:31:59 +08:00
fan
0118f94e6c 整合产品分化 2019-10-17 09:46:48 +08:00
fan
25c4cf957d 西铁院项目调整 2019-10-16 17:37:03 +08:00
fan
54b078792c 西铁院暂存 2019-10-16 16:58:40 +08:00
fan
126886e1ce 西铁院暂存 2019-10-16 15:28:29 +08:00
fan
729be7ec69 西铁院暂存 2019-10-15 09:39:01 +08:00
joylink_cuiweidong
059a4134d5 产品分化路由调整以及剧本发布样式调整 2019-10-10 14:08:23 +08:00