fan
|
ca736a93f3
|
登录过期不显示获取子系统信息失败
|
2019-10-25 13:16:07 +08:00 |
|
fan
|
2e49c6499f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-25 13:00:04 +08:00 |
|
fan
|
bfce5a2103
|
问题调整
|
2019-10-25 12:59:24 +08:00 |
|
joylink_cuiweidong
|
da7564402c
|
代码调整
|
2019-10-25 10:39:41 +08:00 |
|
zyy
|
6f4c8e02ba
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-24 18:28:15 +08:00 |
|
zyy
|
033c6f40fa
|
desc: 调整高度
|
2019-10-24 18:28:06 +08:00 |
|
fan
|
0c67d2a077
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 18:19:28 +08:00 |
|
fan
|
6fa98a6585
|
代码调整
|
2019-10-24 18:19:06 +08:00 |
|
joylink_cuiweidong
|
7530489fa5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-24 18:12:10 +08:00 |
|
joylink_cuiweidong
|
f597ce530f
|
已发布地图 地图预览
管理员 课程设计可见
|
2019-10-24 18:11:58 +08:00 |
|
fan
|
237d821f33
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 16:46:49 +08:00 |
|
fan
|
2c729abb01
|
网页title和图标调整
|
2019-10-24 16:46:34 +08:00 |
|
zyy
|
08067bb4e8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Entry.vue
|
2019-10-24 15:32:40 +08:00 |
|
zyy
|
68560f0d37
|
desc: 增加修改个人信息弹窗
|
2019-10-24 15:31:29 +08:00 |
|
fan
|
62541373f1
|
导航栏右侧menu调整
|
2019-10-24 15:15:52 +08:00 |
|
joylink_cuiweidong
|
c0394657a8
|
代码调整
|
2019-10-24 14:13:20 +08:00 |
|
fan
|
4a0c04d98a
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 14:03:38 +08:00 |
|
fan
|
b6ffc55efd
|
登录页面整合
|
2019-10-24 14:03:19 +08:00 |
|
joylink_cuiweidong
|
6dc74ac5c8
|
代码优化
实训平台横向滚动条处理
实训平台和设计平台跳转文字调整
|
2019-10-24 11:20:00 +08:00 |
|
zyy
|
17626459f5
|
Merge branch 'dev' into test
|
2019-10-24 09:49:49 +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 |
|
joylink_cuiweidong
|
5e798387d7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-23 17:44:41 +08:00 |
|
fan
|
667b967c06
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 17:42:40 +08:00 |
|
fan
|
787580f964
|
路由调整调整
|
2019-10-23 17:41:50 +08:00 |
|
joylink_cuiweidong
|
f483a1c115
|
运行图审核接口调整
|
2019-10-23 17:41:24 +08:00 |
|
fan
|
a926ee4d64
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 17:20:45 +08:00 |
|
fan
|
c83e882f6a
|
国际化调整
|
2019-10-23 17:20:32 +08:00 |
|
joylink_cuiweidong
|
02ea111c61
|
路由处理
|
2019-10-23 16:43:28 +08:00 |
|
fan
|
0a39680f6c
|
综合演练真实设备调整
|
2019-10-23 16:39:16 +08:00 |
|
fan
|
16b2dbda05
|
综合演练真实设备调整
|
2019-10-23 16:33:23 +08:00 |
|
fan
|
dff5d96d4d
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-23 16:19:22 +08:00 |
|
fan
|
d6b677201e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 16:14:03 +08:00 |
|
fan
|
8710a6231a
|
综合演练房间调整
|
2019-10-23 16:13:36 +08:00 |
|
joylink_cuiweidong
|
1761fbdca8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-23 16:10:20 +08:00 |
|
joylink_cuiweidong
|
0b23a7f9a0
|
右上角用户昵称样式调整
|
2019-10-23 16:09:44 +08:00 |
|
fan
|
5abc54c522
|
合代码
|
2019-10-23 15:03:35 +08:00 |
|
fan
|
3119f4f308
|
设计平台课程设计调整
|
2019-10-23 15:01:25 +08:00 |
|
joylink_cuiweidong
|
b0c589cd2a
|
权限管理编辑权限样式调整
设计平台添加跳转实训平台的链接
|
2019-10-23 14:57:45 +08:00 |
|
zyy
|
15510a07cf
|
desc: 修改区段点击bug
|
2019-10-23 14:43:25 +08:00 |
|
joylink_cuiweidong
|
2fa5966055
|
剧本审核通过bug调整
登录全屏调整
|
2019-10-23 14:33:45 +08:00 |
|
fan
|
7a073334d5
|
去除添加plc真实设备限制
|
2019-10-23 13:50:04 +08:00 |
|
fan
|
abd4fbbf64
|
开放plc真实设备
|
2019-10-23 13:41:33 +08:00 |
|
joylink_cuiweidong
|
51bf37e9c7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-10-23 13:36:19 +08:00 |
|
fan
|
d55f740065
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 13:33:40 +08:00 |
|
fan
|
89d71ed661
|
发现问题调整
|
2019-10-23 13:33:09 +08:00 |
|
joylink_cuiweidong
|
1c38f16199
|
回车登录调整
|
2019-10-23 13:32:00 +08:00 |
|
joylink_cuiweidong
|
16d2b61d0f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-23 11:03:20 +08:00 |
|
joylink_cuiweidong
|
f5dc8818fe
|
登录页面添加键盘回车登录
|
2019-10-23 11:02:44 +08:00 |
|
fan
|
f8b149fa5a
|
同一个标签切换平台404问题
|
2019-10-23 10:43:29 +08:00 |
|
fan
|
cf5f902a45
|
代码调整
|
2019-10-23 10:18:28 +08:00 |
|
joylink_cuiweidong
|
bca8c68b65
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-10-23 10:05:41 +08:00 |
|
fan
|
c843e25094
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 09:59:39 +08:00 |
|
fan
|
43d900747a
|
增加地图发布仅管理员可见
|
2019-10-23 09:59:28 +08:00 |
|
joylink_cuiweidong
|
aa6cb458de
|
登录修改
|
2019-10-23 09:58:05 +08:00 |
|
joylink_cuiweidong
|
e854c32390
|
Merge branch 'dev' into test
|
2019-10-22 20:10:05 +08:00 |
|
joylink_cuiweidong
|
7550d82f2b
|
登录修改
|
2019-10-22 20:09:29 +08:00 |
|
fan
|
48fafacdc2
|
获取上次用户登录系统
|
2019-10-22 20:01:03 +08:00 |
|
fan
|
01cf337b63
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 19:49:59 +08:00 |
|
fan
|
21510d9464
|
创建章节修改
|
2019-10-22 19:49:37 +08:00 |
|
program-walker
|
6fa2b2e636
|
登陆逻辑修改
|
2019-10-22 19:47:36 +08:00 |
|
fan
|
5c5c2412fd
|
章节下添加创建章节
|
2019-10-22 19:23:01 +08:00 |
|
fan
|
ff37fe128e
|
问题调整
|
2019-10-22 18:49:46 +08:00 |
|
fan
|
4bd232bd67
|
地图系统结构调整
|
2019-10-22 18:34:05 +08:00 |
|
fan
|
4f14075072
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 18:20:10 +08:00 |
|
joylink_cuiweidong
|
2bd13ad075
|
实训tree 样式调整
|
2019-10-22 18:19:18 +08:00 |
|
fan
|
9134be8c19
|
问题调整
|
2019-10-22 18:18:21 +08:00 |
|
fan
|
6760cdc7e3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 17:24:51 +08:00 |
|
fan
|
0cafd0c7f3
|
设计平台课程系统调整
|
2019-10-22 17:24:41 +08:00 |
|
joylink_cuiweidong
|
bddddedbf2
|
Merge branch 'dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-22 16:13:13 +08:00 |
|
joylink_cuiweidong
|
2282f27239
|
设计系统运行图样式调整
|
2019-10-22 16:10:39 +08:00 |
|
fan
|
6f314ba150
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 16:06:20 +08:00 |
|
fan
|
0e23a62b39
|
调整代码
|
2019-10-22 16:05:58 +08:00 |
|
joylink_cuiweidong
|
c08064faa0
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-10-22 15:14:54 +08:00 |
|
joylink_cuiweidong
|
b26ab2fc15
|
删除地图系统接口调整以及西铁院系统tree接口调整
|
2019-10-22 15:13:58 +08:00 |
|
joylink_cuiweidong
|
df4113ff29
|
代码结构整理
修改 退出系统仍然自动登录的bug
子系统生成接口调整
|
2019-10-22 14:43:27 +08:00 |
|
fan
|
e89211a873
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 14:28:41 +08:00 |
|
fan
|
a49b195090
|
调整代码
|
2019-10-22 14:28:22 +08:00 |
|
zyy
|
a61f917f4a
|
desc: 调整站台扣车状态显示
|
2019-10-22 14:07:20 +08:00 |
|
zyy
|
ac0fafebc0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-22 13:41:29 +08:00 |
|
zyy
|
0c6de0e011
|
desc: 修改代码
|
2019-10-22 13:41:23 +08:00 |
|
fan
|
b7a16a9074
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 13:40:55 +08:00 |
|
fan
|
515a9a60ae
|
代码调整
|
2019-10-22 13:40:42 +08:00 |
|
joylink_cuiweidong
|
7785b9a9af
|
设计平台 系统管理 子系统 修改接口以及国际化
|
2019-10-22 11:20:43 +08:00 |
|
joylink_cuiweidong
|
c04abcc67a
|
设计平台 系统管理 子系统 创建子系统接口调整
|
2019-10-22 09:36:37 +08:00 |
|
joylink_cuiweidong
|
9fcdda5d60
|
设计平台 系统管理 子系统 创建子系统接口
|
2019-10-21 18:03:13 +08:00 |
|
joylink_cuiweidong
|
343372d83a
|
设计平台地图三维路径调整
|
2019-10-21 16:12:03 +08:00 |
|
fan
|
04bebc8201
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-21 16:08:07 +08:00 |
|
fan
|
81edd3c5c2
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-21 16:07:28 +08:00 |
|
fan
|
b68dd99bde
|
仿真路由调整
|
2019-10-21 16:07:15 +08:00 |
|
joylink_cuiweidong
|
1a046c2b7f
|
设计平台系统管理子系统生成页面调整
|
2019-10-21 15:50:15 +08:00 |
|
joylink_cuiweidong
|
c9ad0a8be5
|
自动登录页面处理
|
2019-10-21 14:14:22 +08:00 |
|
fan
|
36b0b048bd
|
仿真路由调整
|
2019-10-21 14:09:03 +08:00 |
|
fan
|
7e7fc2256c
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-21 13:17:30 +08:00 |
|
fan
|
4b41c9fd27
|
考试路由调整
|
2019-10-21 13:16:49 +08:00 |
|
fan
|
be2bbc67cd
|
接口参数调整
|
2019-10-21 11:15:15 +08:00 |
|
fan
|
9ed65095cc
|
接口参数调整
|
2019-10-21 10:50:31 +08:00 |
|
fan
|
9d072c4a6c
|
产品分化调整
|
2019-10-21 10:02:49 +08:00 |
|
fan
|
34a8cbf270
|
接口调整
|
2019-10-21 08:59:27 +08:00 |
|