Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
L
laravelzh
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
冯超鹏
laravelzh
Commits
ac49bb84
Commit
ac49bb84
authored
Dec 15, 2020
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
处理bug
parent
56331e95
Pipeline
#189
failed with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
215 additions
and
1 deletion
+215
-1
lineMarker.vue
resources/js/components/Charts/lineMarker.vue
+214
-0
api.php
routes/api.php
+1
-1
No files found.
resources/js/components/Charts/lineMarker.vue
0 → 100644
View file @
ac49bb84
<
template
>
<div
:id=
"id"
:class=
"className"
:style=
"
{height:height,width:width}" />
</
template
>
<
script
>
import
echarts
from
'echarts'
;
import
resize
from
'./mixins/resize'
;
import
{
userdevicemonthcount
}
from
'@/api/homepage'
;
export
default
{
mixins
:
[
resize
],
props
:
{
className
:
{
type
:
String
,
default
:
'chart'
,
},
id
:
{
type
:
String
,
default
:
'chart'
,
},
width
:
{
type
:
String
,
default
:
'200px'
,
},
height
:
{
type
:
String
,
default
:
'200px'
,
},
},
data
()
{
return
{
chart
:
null
,
userdevicepolice
:
[],
userdevicecount
:
[],
};
},
created
()
{
this
.
UserStatistics
();
},
beforeDestroy
()
{
if
(
!
this
.
chart
)
{
return
;
}
this
.
chart
.
dispose
();
this
.
chart
=
null
;
},
methods
:
{
initChart
()
{
const
xData
=
(
function
()
{
const
data
=
[];
const
date
=
new
Date
();
for
(
let
i
=
1
;
i
<
date
.
getMonth
()
+
1
+
1
;
i
++
)
{
data
.
push
(
i
+
'月'
);
}
return
data
;
}());
this
.
chart
=
echarts
.
init
(
document
.
getElementById
(
this
.
id
));
this
.
chart
.
setOption
({
backgroundColor
:
'#394056'
,
title
:
{
top
:
20
,
text
:
'设备统计'
,
textStyle
:
{
fontWeight
:
'normal'
,
fontSize
:
16
,
color
:
'#F1F1F3'
,
},
left
:
'1%'
,
},
tooltip
:
{
trigger
:
'axis'
,
axisPointer
:
{
lineStyle
:
{
color
:
'#57617B'
,
},
},
},
legend
:
{
top
:
20
,
icon
:
'rect'
,
itemWidth
:
14
,
itemHeight
:
5
,
itemGap
:
13
,
data
:
[
'设备数量'
,
'报警数量'
],
right
:
'4%'
,
textStyle
:
{
fontSize
:
12
,
color
:
'#F1F1F3'
,
},
},
grid
:
{
top
:
100
,
left
:
'2%'
,
right
:
'2%'
,
bottom
:
'2%'
,
containLabel
:
true
,
},
xAxis
:
[{
type
:
'category'
,
boundaryGap
:
false
,
axisLine
:
{
lineStyle
:
{
color
:
'#57617B'
,
},
},
data
:
xData
,
}],
yAxis
:
[{
type
:
'value'
,
name
:
'(%)'
,
axisTick
:
{
show
:
false
,
},
axisLine
:
{
lineStyle
:
{
color
:
'#57617B'
,
},
},
axisLabel
:
{
margin
:
10
,
textStyle
:
{
fontSize
:
14
,
},
},
splitLine
:
{
lineStyle
:
{
color
:
'#57617B'
,
},
},
}],
series
:
[{
name
:
'设备数量'
,
type
:
'line'
,
smooth
:
true
,
symbol
:
'circle'
,
symbolSize
:
5
,
showSymbol
:
false
,
lineStyle
:
{
normal
:
{
width
:
1
,
},
},
areaStyle
:
{
normal
:
{
color
:
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
0
,
1
,
[{
offset
:
0
,
color
:
'rgba(0, 136, 212, 0.3)'
,
},
{
offset
:
0.8
,
color
:
'rgba(0, 136, 212, 0)'
,
}],
false
),
shadowColor
:
'rgba(0, 0, 0, 0.1)'
,
shadowBlur
:
10
,
},
},
itemStyle
:
{
normal
:
{
color
:
'rgb(0,136,212)'
,
borderColor
:
'rgba(0,136,212,0.2)'
,
borderWidth
:
12
,
},
},
data
:
this
.
userdevicecount
,
},
{
name
:
'报警数量'
,
type
:
'line'
,
smooth
:
true
,
symbol
:
'circle'
,
symbolSize
:
5
,
showSymbol
:
false
,
lineStyle
:
{
normal
:
{
width
:
1
,
},
},
areaStyle
:
{
normal
:
{
color
:
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
0
,
1
,
[{
offset
:
0
,
color
:
'rgba(219, 50, 51, 0.3)'
,
},
{
offset
:
0.8
,
color
:
'rgba(219, 50, 51, 0)'
,
}],
false
),
shadowColor
:
'rgba(0, 0, 0, 0.1)'
,
shadowBlur
:
10
,
},
},
itemStyle
:
{
normal
:
{
color
:
'rgb(219,50,51)'
,
borderColor
:
'rgba(219,50,51,0.2)'
,
borderWidth
:
12
,
},
},
data
:
this
.
userdevicepolice
,
}],
});
},
UserStatistics
()
{
userdevicemonthcount
()
.
then
(
response
=>
{
if
(
response
.
code
===
200
)
{
this
.
userdevicecount
=
response
.
data
.
devicedata
;
this
.
userdevicepolice
=
response
.
data
.
devicepolice
;
this
.
initChart
();
}
})
.
catch
(
err
=>
{
console
.
log
(
err
);
});
},
},
};
</
script
>
routes/api.php
View file @
ac49bb84
...
@@ -113,7 +113,7 @@ Route::group(['middleware'=>'auth:api'],function (){
...
@@ -113,7 +113,7 @@ Route::group(['middleware'=>'auth:api'],function (){
Route
::
get
(
'devices/device_info/{id}'
,
'DevicesController@device_info'
);
//返回设备地图详情信息
Route
::
get
(
'devices/device_info/{id}'
,
'DevicesController@device_info'
);
//返回设备地图详情信息
Route
::
get
(
'devices/devicepolice'
,
'DevicesController@devicepolice'
);
//设备消警
Route
::
get
(
'devices/devicepolice'
,
'DevicesController@devicepolice'
);
//设备消警
Route
::
get
(
'devices/devicepoliceinfo'
,
'DevicesController@devicepoliceinfo'
);
//设备报警弹窗详情
Route
::
get
(
'devices/devicepoliceinfo'
,
'DevicesController@devicepoliceinfo'
);
//设备报警弹窗详情
Route
::
get
(
'
login
/history_device_type'
,
'DevicesController@history_device_type'
);
//报警数据搜索所需数据
Route
::
get
(
'
devices
/history_device_type'
,
'DevicesController@history_device_type'
);
//报警数据搜索所需数据
Route
::
get
(
'devices/companyuser'
,
'DevicesController@companyuser'
);
//用户获取自定义公司名称
Route
::
get
(
'devices/companyuser'
,
'DevicesController@companyuser'
);
//用户获取自定义公司名称
// 设备型号
// 设备型号
Route
::
get
(
'device/models'
,
'ModelNumberController@index'
);
Route
::
get
(
'device/models'
,
'ModelNumberController@index'
);
...
...
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