Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
workbiu-admin
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gxx
workbiu-admin
Commits
080ce554
Commit
080ce554
authored
Dec 13, 2017
by
gxx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了countfile方法中的bug
parent
aecfe4c6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
88 additions
and
11 deletions
+88
-11
FileController.php
app/Http/Controllers/FileController.php
+1
-1
GroupController.php
app/Http/Controllers/GroupController.php
+1
-1
FileService.php
app/Services/FileService.php
+5
-4
groupinformation.blade.php
resources/views/admin/group/groupinformation.blade.php
+81
-5
No files found.
app/Http/Controllers/FileController.php
View file @
080ce554
...
@@ -57,6 +57,6 @@ class FileController extends Controller
...
@@ -57,6 +57,6 @@ class FileController extends Controller
{
{
$group_id
=
$request
->
group_id
;
$group_id
=
$request
->
group_id
;
$result
=
$this
->
mFile
->
countFile
(
$group_id
);
$result
=
$this
->
mFile
->
countFile
(
$group_id
);
return
json_encode
(
$result
)
;
return
$result
;
}
}
}
}
app/Http/Controllers/GroupController.php
View file @
080ce554
...
@@ -35,7 +35,7 @@ class GroupController extends Controller
...
@@ -35,7 +35,7 @@ class GroupController extends Controller
{
{
$id
=
$request
->
id
;
$id
=
$request
->
id
;
$groups
=
$this
->
mGroup
->
get
(
$id
);
$groups
=
$this
->
mGroup
->
get
(
$id
);
$files
=
$this
->
mFile
->
getAll
(
120
);
$files
=
$this
->
mFile
->
getAll
(
$id
);
if
(
$groups
){
if
(
$groups
){
return
view
(
'admin/group/groupinformation'
,
compact
(
'groups'
,
'files'
,
'id'
));
return
view
(
'admin/group/groupinformation'
,
compact
(
'groups'
,
'files'
,
'id'
));
}
}
...
...
app/Services/FileService.php
View file @
080ce554
...
@@ -96,13 +96,14 @@ class FileService implements FileServiceContract
...
@@ -96,13 +96,14 @@ class FileService implements FileServiceContract
$files_keys
=
array_keys
(
$files
);
$files_keys
=
array_keys
(
$files
);
$result
=
array
();
$result
=
array
();
$i
=
0
;
$i
=
0
;
$a
=
null
;
foreach
(
$files
as
$type
){
foreach
(
$files
as
$type
){
$files_keys
[
$
i
]
=
count
(
$type
);
$files_keys
[
$
a
]
=
count
(
$type
);
$per
=
$files_keys
[
$
i
]
/
$count
;
$per
=
$files_keys
[
$
a
]
/
$count
;
$per
=
floor
(
$per
*
100
)
.
"%"
;
$per
=
floor
(
$per
*
100
);
$keyValue
=
array
(
"value"
=>
$per
,
"name"
=>
$files_keys
[
$i
]);
$keyValue
=
array
(
"value"
=>
$per
,
"name"
=>
$files_keys
[
$i
]);
array_push
(
$result
,
$keyValue
);
array_push
(
$result
,
$keyValue
);
$i
+
+
;
$i
+
=
1
;
}
}
return
$result
;
return
$result
;
}
}
...
...
resources/views/admin/group/groupinformation.blade.php
View file @
080ce554
...
@@ -128,14 +128,25 @@
...
@@ -128,14 +128,25 @@
@
endforeach
@
endforeach
@
endif
@
endif
</
table
>
</
table
>
{{
$files
->
links
()
}}
@
if
(
$files
==
null
)
@
else
{{
$files
->
links
()
}}
@
endif
</
div
>
</
div
>
<!--
/.
tab
-
pane
-->
<!--
/.
tab
-
pane
-->
<
div
class
=
"tab-pane"
id
=
"settings"
>
<
div
class
=
"tab-pane"
id
=
"settings"
>
<
div
id
=
"main"
style
=
"width: 600px;height:400px;"
></
div
>
<
div
style
=
"float: left"
>
<
input
type
=
"hidden"
value
=
"
{
{$id}
}
"
id
=
"id"
>
<
div
id
=
"main"
style
=
"width: 500px;height:400px;"
></
div
>
<
input
type
=
"hidden"
value
=
"
{
{$id}
}
"
id
=
"id"
>
</
div
>
<
div
style
=
"float: left"
>
<
div
id
=
"type"
style
=
"width: 500px;height:400px;"
></
div
>
</
div
>
</
div
>
</
div
>
<!--
/.
tab
-
pane
-->
<!--
/.
tab
-
pane
-->
</
div
>
</
div
>
...
@@ -158,6 +169,7 @@
...
@@ -158,6 +169,7 @@
// 基于准备好的dom,初始化echarts实例
// 基于准备好的dom,初始化echarts实例
var
myChart
=
echarts
.
init
(
document
.
getElementById
(
'main'
));
var
myChart
=
echarts
.
init
(
document
.
getElementById
(
'main'
));
var
myChartType
=
echarts
.
init
(
document
.
getElementById
(
'type'
));
// ------------------ ajax ---------------//
// ------------------ ajax ---------------//
...
@@ -171,6 +183,8 @@
...
@@ -171,6 +183,8 @@
url
:
'{{route('
file
.
groupSpace
')}}'
,
url
:
'{{route('
file
.
groupSpace
')}}'
,
data
:
{
group_id
:
id
},
data
:
{
group_id
:
id
},
success
:
function
(
data
){
success
:
function
(
data
){
option
[
'series'
][
0
][
'data'
]
=
data
;
option
[
'series'
][
0
][
'data'
]
=
data
;
myChart
.
setOption
(
option
);
myChart
.
setOption
(
option
);
},
},
...
@@ -181,6 +195,31 @@
...
@@ -181,6 +195,31 @@
}
}
fileType
();
function
fileType
(){
var
id
=
document
.
getElementById
(
'id'
)
.
value
;
$
.
ajax
({
type
:
'get'
,
url
:
'{{route('
file
.
countFile
')}}'
,
data
:
{
group_id
:
id
},
success
:
function
(
data
){
console
.
log
(
data
)
if
(
data
==
''
){
}
else
{
optionType
[
'series'
][
0
][
'data'
]
=
data
;
myChartType
.
setOption
(
optionType
);
}
},
error
:
function
(
data
){
console
.
log
(
'错误'
);
}
});
}
option
=
{
option
=
{
title
:
{
title
:
{
...
@@ -199,7 +238,7 @@
...
@@ -199,7 +238,7 @@
},
},
series
:
[
series
:
[
{
{
name
:
'
访问来源
'
,
name
:
'
空间使用
'
,
type
:
'pie'
,
type
:
'pie'
,
radius
:
'55%'
,
radius
:
'55%'
,
center
:
[
'50%'
,
'60%'
],
center
:
[
'50%'
,
'60%'
],
...
@@ -218,7 +257,44 @@
...
@@ -218,7 +257,44 @@
]
]
};
};
myChart
.
setOption
(
option
);
optionType
=
{
title
:
{
text
:
'文件类型占比情况'
,
subtext
:
'单位:百分比'
,
x
:
'center'
},
tooltip
:
{
trigger
:
'item'
,
formatter
:
"
{
a
}
<br/>
{
b
}
:
{
c
}
(
{
d
}
%)"
},
legend
:
{
orient
:
'vertical'
,
left
:
'left'
,
data
:
[
'全部空间'
,
'已经使用'
]
},
series
:
[
{
name
:
'文件类型'
,
type
:
'pie'
,
radius
:
'55%'
,
center
:
[
'50%'
,
'60%'
],
data
:
[
// {value:335, name:'全部空间'},
// {value:310, name:'已经使用'}
],
itemStyle
:
{
emphasis
:
{
shadowBlur
:
10
,
shadowOffsetX
:
0
,
shadowColor
:
'rgba(0, 0, 255, 0.5)'
}
}
}
]
};
//myChart.setOption(option);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment