sunzhenyu
|
9211396f99
|
修改state
|
2019-09-03 17:01:00 +08:00 |
|
sunzhenyu
|
1af9b755d7
|
t ：Merge branch 'test' into dev
|
2019-09-03 16:56:20 +08:00 |
|
sunzhenyu
|
2ea8521928
|
a
|
2019-09-03 16:53:50 +08:00 |
|
sunzhenyu
|
9ed0309629
|
pull
|
2019-09-03 16:50:41 +08:00 |
|
sunzhenyu
|
3d977cc124
|
pull
|
2019-09-03 16:50:15 +08:00 |
|
sunzhenyu
|
6fc5f991ef
|
区分cctv和正常镜头渲染，减少通信驱动的循环体，减少循环遍历的数据中内容，修改场景背景
|
2019-09-03 16:45:56 +08:00 |
|
fan
|
dafa95baed
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 16:14:13 +08:00 |
|
fan
|
ae853226d7
|
ibp调整
|
2019-09-03 16:14:00 +08:00 |
|
zyy
|
0372dd202d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 16:13:29 +08:00 |
|
zyy
|
40b67b8cf3
|
desc: 调整修改权限逻辑
|
2019-09-03 16:13:23 +08:00 |
|
ival
|
b8d2f43ebd
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 15:46:31 +08:00 |
|
ival
|
dfcdb5628f
|
优化IBP盘代码
|
2019-09-03 15:46:16 +08:00 |
|
zyy
|
10ab09451b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 15:22:58 +08:00 |
|
zyy
|
27f05bdd0d
|
desc: 增加缓存列表
|
2019-09-03 15:22:50 +08:00 |
|
ival
|
6eb0ac89b8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 14:40:02 +08:00 |
|
ival
|
c433cb5045
|
添加加载脚本失败后，提示后台错误
|
2019-09-03 14:39:50 +08:00 |
|
zyy
|
8c69b7afd0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 14:38:11 +08:00 |
|
zyy
|
7fbadc2bd3
|
desc: 修改权限编辑
|
2019-09-03 14:38:05 +08:00 |
|
fan
|
d843dd042e
|
后卫寨线条长度调整
|
2019-09-03 14:10:09 +08:00 |
|
fan
|
b3b71cdf76
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 14:05:35 +08:00 |
|
fan
|
6d6eb54f04
|
后卫寨背景高度调整为1300
|
2019-09-03 14:05:22 +08:00 |
|
ival
|
c239e98ae8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 14:04:39 +08:00 |
|
ival
|
ca1b07595e
|
修改IBP界面尺寸的问题
|
2019-09-03 14:04:25 +08:00 |
|
fan
|
8718df9dc6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 13:47:38 +08:00 |
|
fan
|
cb1d6cc4ff
|
ibp调整
|
2019-09-03 13:46:59 +08:00 |
|
ival
|
c954305440
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 13:22:34 +08:00 |
|
ival
|
310b3fca21
|
精简角色分配后删除角色的操作
|
2019-09-03 13:22:16 +08:00 |
|
zyy
|
8d06b98ba1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 13:15:53 +08:00 |
|
zyy
|
5591796596
|
desc: 调整socket重连问题
|
2019-09-03 13:15:47 +08:00 |
|
ival
|
a29bce2751
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 13:04:30 +08:00 |
|
ival
|
19634821ba
|
删除无用注释代码
|
2019-09-03 13:04:19 +08:00 |
|
zyy
|
24f21a09aa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 11:22:03 +08:00 |
|
zyy
|
82cfd670c6
|
desc: 修改弹窗显示title
|
2019-09-03 11:21:54 +08:00 |
|
ival
|
f1ab89a131
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 11:13:00 +08:00 |
|
ival
|
d60c989405
|
增加IBP盘操作
|
2019-09-03 11:12:48 +08:00 |
|
zyy
|
0938be08f5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 10:46:04 +08:00 |
|
zyy
|
870a4de01b
|
desc: 修改socekt断连逻辑, 调整权限显示及细节，样式问题
|
2019-09-03 10:45:58 +08:00 |
|
fan
|
1ee0aeb785
|
ibp布局调整
|
2019-09-03 10:10:09 +08:00 |
|
fan
|
24a7a0204a
|
代码调整
|
2019-09-03 09:54:05 +08:00 |
|
fan
|
f08d2236dd
|
ibp 监听仿真开始状态
|
2019-09-03 09:50:14 +08:00 |
|
ival
|
2e10b39892
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/ibp/index.vue
|
2019-09-03 09:36:10 +08:00 |
|
ival
|
41111ebab2
|
修改IPB盘尺寸问题
|
2019-09-03 09:34:21 +08:00 |
|
fan
|
914c9dc168
|
删除ibp按钮
|
2019-09-03 09:18:21 +08:00 |
|
fan
|
e86c1b025c
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/router/index.js
# src/views/ibp/index.vue
|
2019-09-03 09:03:00 +08:00 |
|
fan
|
cc4a60687a
|
ibp盘调整
|
2019-09-03 08:56:14 +08:00 |
|
zyy
|
d53661e6ed
|
desc: 增加权限一键生成接口,调整显示位置，字段内容
|
2019-09-02 18:43:05 +08:00 |
|
zyy
|
95e6008c50
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-02 17:34:40 +08:00 |
|
zyy
|
f73d7f4b9f
|
desc: 打包权限列表展示
|
2019-09-02 17:34:34 +08:00 |
|
ival
|
827bb6e870
|
修改支付页面和订单页面高度错误问题
|
2019-09-02 17:24:42 +08:00 |
|
ival
|
cc17426731
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-02 17:11:31 +08:00 |
|