Commit Graph

44 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
b7cb2a36db 产品分化 剧本接口调整 2019-10-09 10:14:30 +08:00
joylink_cuiweidong
2d1f13299e 产品分化运行图接口调整 2019-10-08 18:35:02 +08:00
joylink_cuiweidong
873fbcd686 超时登出处理 2019-10-08 09:51:13 +08:00
joylink_cuiweidong
a46f94f85e 产品分化 设计系统调整 2019-09-30 17:31:40 +08:00
fan
0fac6ce22e 产品分化调整 2019-09-25 18:56:30 +08:00
joylink_cuiweidong
823eb02b90 产品分化菜单栏调整 2019-09-24 10:51:41 +08:00
joylink_cuiweidong
5ba93805c1 菜单栏调整 2019-09-23 17:47:54 +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