Commit Graph

1899 Commits

Author SHA1 Message Date
joylink_cuiweidong
521a50ccb6 代码调整 2019-11-06 18:38:28 +08:00
zyy
9f1f02bf0e desc: 增加绘图撤销,重做 2019-11-06 18:37:32 +08:00
joylink_cuiweidong
9424dfb001 权限分发调整 2019-11-06 13:41:02 +08:00
fan
7753e82fa9 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-06 10:49:42 +08:00
fan
42d9e1e7a1 浏览器图标调整
# Conflicts:
#	src/App.vue
2019-11-06 10:49:32 +08:00
joylink_cuiweidong
568e335a59 代码调整 2019-11-06 10:42:53 +08:00
fan
7ff1878389 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-06 09:33:08 +08:00
fan
24f313045b 国际化修正 2019-11-06 08:57:35 +08:00
joylink_cuiweidong
5b4f9084d2 代码调整 2019-11-05 19:22:21 +08:00
joylink_cuiweidong
6a2a0b0b5e 代码调整
权限分发国际化调整
2019-11-05 19:03:20 +08:00
joylink_cuiweidong
2228b1f089 权限转增接口调整 2019-11-05 17:21:05 +08:00
joylink_cuiweidong
47da2feb36 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-05 16:53:58 +08:00
joylink_cuiweidong
f8298400f1 代码优化
权限分发转赠接口调整
2019-11-05 16:53:39 +08:00
fan
8f8caba6a3 系统通知样式调整 2019-11-05 16:45:09 +08:00
fan
1b3fc52f98 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-05 16:40:55 +08:00
fan
ce7ca4b9d8 添加系统通知功能 2019-11-05 16:40:36 +08:00
ival
632784d376 修改代码 2019-11-05 15:32:27 +08:00
ival
e72c1b8b05 增加键盘监听 2019-11-05 14:17:19 +08:00
ival
5fc745b799 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-05 14:16:09 +08:00
ival
37fdeec4e3 修改代码 2019-11-05 14:15:55 +08:00
joylink_cuiweidong
1a13c9ad2c 权限分发接口调整 2019-11-05 13:20:27 +08:00
fan
7921c9fde4 登录页样式调整 2019-11-05 13:15:59 +08:00
fan
d54ed0329b Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-04 18:42:07 +08:00
fan
1bd3debbde 西铁院登录页样式调整,测试问题调整 2019-11-04 18:41:58 +08:00
joylink_cuiweidong
cf69d44833 代码优化
系统管理用户实训统计接口调整
2019-11-04 14:05:55 +08:00
fan
347e49f55c 调整接口 2019-11-04 13:29:51 +08:00
fan
b87fa71979 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-04 11:29:46 +08:00
fan
d381ed6a88 西铁院title、logo修改,综合演练房间角色调整后,角色顺序不再变化 2019-11-04 11:29:35 +08:00
zyy
cf754056a8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-04 11:12:15 +08:00
zyy
7c69263701 desc: 修改代码 2019-11-04 11:12:08 +08:00
joylink_cuiweidong
075cdf5fd9 页面样式调整
代码优化
2019-11-04 10:59:50 +08:00
zyy
1c373822ee desc: 修改代码 2019-11-04 10:33:45 +08:00
zyy
92b06df4b4 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 18:08:12 +08:00
zyy
bc332c1a9d desc: 调整国际化,高度问题 2019-11-01 18:08:05 +08:00
joylink_cuiweidong
c361b639ad 国际化调整 2019-11-01 17:30:06 +08:00
joylink_cuiweidong
96452b8dde 代码调整 2019-11-01 17:08:28 +08:00
zyy
a43f1bd2c9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 15:19:22 +08:00
zyy
a133abc1d4 desc: 修改代码 2019-11-01 15:19:15 +08:00
joylink_cuiweidong
f3298cdb83 页面调整 2019-11-01 15:12:00 +08:00
zyy
3bcb637d1c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 13:51:08 +08:00
zyy
aaa0eeedd8 desc: 调整国际化 2019-11-01 13:51:00 +08:00
joylink_cuiweidong
0c938f5928 接口调整 2019-11-01 13:36:14 +08:00
joylink_cuiweidong
ccd71601d1 接口调整 2019-11-01 11:28:10 +08:00
joylink_cuiweidong
444d60ce2a 接口调整 2019-11-01 10:28:15 +08:00
joylink_cuiweidong
76e904455a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 10:07:00 +08:00
joylink_cuiweidong
d0608dd29e 接口调整
文件位置调整
2019-11-01 10:06:47 +08:00
zyy
dd23ca545d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 18:43:19 +08:00
zyy
53d4483081 desc: 修改代码 2019-10-31 18:43:05 +08:00
joylink_cuiweidong
8035833c1c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 17:45:28 +08:00
joylink_cuiweidong
cfdea6ea12 接口调整 2019-10-31 17:45:15 +08:00