 guozhongbo
|
fc4326301b
|
Merge commit '843fa7cab0f3d0f584c26d56b85eb71d1a691de2' into gzb
|
8 months ago |
|
guozhongbo
|
9c9dec8191
|
应用管理
|
8 months ago |
 wangzhonglu
|
843fa7cab0
|
学校-应用策略
|
8 months ago |
|
wangzhonglu
|
85fe0eb8b0
|
Merge remote-tracking branch 'origin/gzb' into wzl
# Conflicts:
# src/views/layout.vue
|
8 months ago |
|
wangzhonglu
|
c9bc024e45
|
学校-应用策略
|
8 months ago |
|
guozhongbo
|
f4b6d27fe0
|
区域接口增加统一参数
|
8 months ago |
|
wangzhonglu
|
6e88ad292a
|
学校-应用策略
|
8 months ago |
|
wangzhonglu
|
4b6cc9b610
|
Merge remote-tracking branch 'origin/gzb' into wzl
|
8 months ago |
|
guozhongbo
|
64e59e9b15
|
策略
|
8 months ago |
|
wangzhonglu
|
75909373c9
|
Merge remote-tracking branch 'origin/gzb' into wzl
|
8 months ago |
|
wangzhonglu
|
bee8a54650
|
路由根据权限跳转传参
|
8 months ago |
|
guozhongbo
|
43a8851968
|
用户管理
|
8 months ago |
|
guozhongbo
|
3583cef761
|
Merge commit 'eee9780ecb7ec319c88b2c6fb6b147e98a518cfc' into gzb
# Conflicts:
# public/iconfont/demo_index.html
# public/iconfont/iconfont.css
# public/iconfont/iconfont.ttf
# public/iconfont/iconfont.woff
# public/iconfont/iconfont.woff2
|
9 months ago |
|
guozhongbo
|
59cb502511
|
添加模版
|
9 months ago |
|
wangzhonglu
|
eee9780ecb
|
Merge remote-tracking branch 'origin/gzb' into wzl
|
9 months ago |
|
wangzhonglu
|
67076bfb14
|
学校-设备管理、违规设备
|
9 months ago |
|
guozhongbo
|
de8c7b3017
|
添加用户
|
9 months ago |
|
wangzhonglu
|
f398ab3611
|
设备导出
|
9 months ago |
|
wangzhonglu
|
f616e30f1c
|
替换icon
|
9 months ago |
|
wangzhonglu
|
56db052f98
|
Merge remote-tracking branch 'origin/gzb' into wzl
|
9 months ago |
|
guozhongbo
|
0c1d5600f6
|
用户管理
|
9 months ago |
|
wangzhonglu
|
225fd03e79
|
学校日志导出
|
9 months ago |
|
wangzhonglu
|
d498192d7c
|
学校-在线设备、解除管控
|
9 months ago |
|
wangzhonglu
|
b3370990bf
|
学校-违规、脱管
|
9 months ago |
|
wangzhonglu
|
6518a7cd75
|
Merge remote-tracking branch 'origin/gzb' into wzl
|
9 months ago |
|
wangzhonglu
|
baf987fc1f
|
学校-设备管理
|
9 months ago |
|
guozhongbo
|
ac02ad3c98
|
应用管理
|
9 months ago |
|
wangzhonglu
|
72b3bae6fc
|
Merge remote-tracking branch 'origin/gzb' into wzl
|
9 months ago |
|
wangzhonglu
|
206921acda
|
设备导出
|
9 months ago |
|
guozhongbo
|
4e52b92f56
|
学校管理
|
9 months ago |
|
wangzhonglu
|
2591fc5bff
|
Merge remote-tracking branch 'origin/gzb' into wzl
|
9 months ago |
|
wangzhonglu
|
ac13ec3604
|
导出表格
|
9 months ago |
|
guozhongbo
|
019be6124b
|
搜索
|
9 months ago |
|
wangzhonglu
|
39c72df883
|
Merge remote-tracking branch 'origin/gzb' into wzl
# Conflicts:
# src/api/setting.js
|
9 months ago |
|
wangzhonglu
|
cee0aea51f
|
学校-设备设置
|
9 months ago |
|
guozhongbo
|
4f5522b3df
|
应用管理添加更换字段
|
9 months ago |
|
guozhongbo
|
f3af303be7
|
日志 公告
|
9 months ago |
|
guozhongbo
|
ac6f815cd5
|
设置
|
9 months ago |
|
wangzhonglu
|
b91899bad9
|
学校-LOGO
|
9 months ago |
|
wangzhonglu
|
3f695995c2
|
Merge remote-tracking branch 'origin/gzb' into wzl
|
9 months ago |
|
wangzhonglu
|
d45a634e16
|
密码格式不正确提示
|
9 months ago |
|
guozhongbo
|
b9c96964aa
|
Merge commit 'a0b4b2a4e2435559131f3b2bdf974f2e1a364052' into gzb
|
9 months ago |
|
guozhongbo
|
fdd25c4ed7
|
区域白名单
|
9 months ago |
|
wangzhonglu
|
a0b4b2a4e2
|
学校壁纸
|
9 months ago |
|
wangzhonglu
|
07e8a43929
|
Merge remote-tracking branch 'origin/gzb' into wzl
|
9 months ago |
|
wangzhonglu
|
b8e4517642
|
学校-壁纸
|
9 months ago |
|
guozhongbo
|
744d5fa8c6
|
白名单
|
9 months ago |
|
guozhongbo
|
a337f2f3ab
|
应用管理编辑
|
9 months ago |
|
wangzhonglu
|
a0c8715d51
|
学校-策略模板列表
|
9 months ago |
|
guozhongbo
|
e4674e0c42
|
Merge commit 'cbad52afbc77dcde53751d3b940e58a13a5287be' into gzb
|
9 months ago |
