zyy
|
8e06abcad9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 11:28:36 +08:00 |
|
zyy
|
b96701aceb
|
desc: 调整运行图加载
|
2019-09-04 11:28:24 +08:00 |
|
joylink_cuiweidong
|
67f925ef7f
|
代码调整
|
2019-09-04 11:05:57 +08:00 |
|
joylink_cuiweidong
|
969fe6ac5a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/background.js
|
2019-09-04 11:02:02 +08:00 |
|
joylink_cuiweidong
|
3a196ffac4
|
ibp 拖拽事件处理
|
2019-09-04 11:00:01 +08:00 |
|
fan
|
eb26f87560
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 10:57:14 +08:00 |
|
fan
|
743fa388c4
|
代码调整
|
2019-09-04 10:56:44 +08:00 |
|
ival
|
d7fb121c2b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 10:13:42 +08:00 |
|
ival
|
df839856d9
|
修改IBP盘角色修改
|
2019-09-04 10:13:26 +08:00 |
|
zyy
|
51274a044b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 18:59:52 +08:00 |
|
zyy
|
abec58b726
|
desc: 修改弹窗点击蒙层不取消
|
2019-09-03 18:59:46 +08:00 |
|
fan
|
cb7d08bc93
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 18:45:39 +08:00 |
|
fan
|
ce5d0424d5
|
ibp代码调整
|
2019-09-03 18:45:02 +08:00 |
|
sunzhenyu
|
172fa87ca7
|
Merge branch 'test'
|
2019-09-03 18:42:32 +08:00 |
|
sunzhenyu
|
126a65d370
|
pull
|
2019-09-03 18:42:09 +08:00 |
|
sunzhenyu
|
cf099782ca
|
pull
|
2019-09-03 18:41:50 +08:00 |
|
sunzhenyu
|
b7bffeb467
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-09-03 18:40:37 +08:00 |
|
sunzhenyu
|
58541f0654
|
mmi显示补漏
|
2019-09-03 18:40:24 +08:00 |
|
ival
|
f12b521da4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-03 18:38:15 +08:00 |
|
ival
|
0879aef961
|
增加派班计划loading
|
2019-09-03 18:37:00 +08:00 |
|
ival
|
790ce4551a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-03 17:58:43 +08:00 |
|
ival
|
c1af062bbd
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-03 17:36:01 +08:00 |
|
ival
|
c97996fceb
|
设置冲突列颜色
|
2019-09-03 17:35:23 +08:00 |
|
zyy
|
0af24a4306
|
Merge branch 'dev' into test
|
2019-09-03 17:03:42 +08:00 |
|
zyy
|
bd494599a6
|
desc: 修改显示权限title
|
2019-09-03 17:03:05 +08:00 |
|
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 |
|