Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhongtong-avi-web
Project
Project
Details
Activity
Releases
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
中通客车项目
zhongtong-avi-web
Commits
43b014f4
Commit
43b014f4
authored
Oct 18, 2019
by
李志鸣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fea(登录页): 修改登录按钮错别字
parent
022889af
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
190 additions
and
3 deletions
+190
-3
MachineStateTrend.vue
src/views/CenterControl/components/MachineStateTrend.vue
+183
-0
MachineUtilizationRate.vue
...views/CenterControl/components/MachineUtilizationRate.vue
+1
-1
index.vue
src/views/CenterControl/index.vue
+5
-1
index.vue
src/views/Login/index.vue
+1
-1
No files found.
src/views/CenterControl/components/MachineStateTrend.vue
0 → 100644
View file @
43b014f4
<
template
>
<div
class=
"machine-state-trend"
>
<div
class=
"search-pack"
>
<el-date-picker
style=
"width: 135px;"
class=
"date-picker-reset"
v-model=
"startTime"
type=
"date"
placeholder=
"开始时间"
>
</el-date-picker>
<span
class=
"middle-text"
>
至
</span>
<el-date-picker
style=
"width: 135px;"
class=
"date-picker-reset"
v-model=
"endTime"
type=
"date"
placeholder=
"结束时间"
>
</el-date-picker>
<el-button
type=
"primary"
size=
"small"
>
确定
</el-button>
</div>
<div
id=
"stateTrendChart"
></div>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
// 开始时间
startTime
:
''
,
// 结束时间
endTime
:
''
}
},
methods
:
{
// 渲染echarts图表
renderEcharts
()
{
let
echart
=
echarts
.
init
(
document
.
getElementById
(
'stateTrendChart'
))
echart
.
setOption
({
tooltip
:
{
trigger
:
'axis'
},
grid
:
{
left
:
60
,
right
:
110
,
top
:
30
,
bottom
:
30
},
color
:
[
'#ee295c'
,
'#15e067'
,
'#7460ee'
],
legend
:
{
orient
:
'vertical'
,
top
:
'center'
,
left
:
'85%'
,
data
:
[
'故障'
,
'运行'
,
'待机'
],
itemGap
:
10
,
itemWidth
:
15
,
itemHeight
:
12
,
textStyle
:
{
color
:
'#00b4ff'
,
fontSize
:
14
}
},
xAxis
:
[{
name
:
''
,
type
:
'category'
,
axisTick
:
{
'alignWithLabel'
:
true
},
axisLabel
:
{
color
:
'#00b4ff'
},
axisLine
:
{
lineStyle
:
{
color
:
'#3569fd'
}
},
data
:
[
'201705'
,
'201706'
,
'201707'
,
'201708'
,
'201709'
,
'201710'
]
}],
yAxis
:
[{
type
:
'value'
,
min
:
0
,
max
:
100
,
axisLabel
:
{
color
:
'#00b4ff'
,
formatter
:
'{value}%'
},
splitLine
:
{
lineStyle
:
{
color
:
'#234eb6'
}
},
axisLine
:
{
lineStyle
:
{
color
:
'#3569fd'
}
},
name
:
''
}],
series
:
[{
data
:
[
50
,
22
,
50
,
70
,
50
,
60
],
name
:
'故障'
,
stack
:
'one'
,
type
:
'bar'
// label: {
// show: true
// }
},
{
data
:
[
20
,
58
,
10
,
20
,
30
,
30
],
name
:
'运行'
,
stack
:
'one'
,
type
:
'bar'
// label: {
// show: true
// }
},
{
data
:
[
30
,
30
,
40
,
10
,
20
,
10
],
name
:
'待机'
,
stack
:
'one'
,
type
:
'bar'
// label: {
// show: true
// }
}]
})
}
},
mounted
()
{
setTimeout
(()
=>
{
// 渲染echarts图表
this
.
renderEcharts
()
},
0
)
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.machine-state-trend
{
width
:
607px
;
height
:
414px
;
position
:
absolute
;
overflow
:
hidden
;
top
:
632px
;
left
:
1302px
;
.search-pack
{
width
:
607px
;
height
:
60px
;
margin-top
:
30px
;
text-align
:
center
;
line-height
:
60px
;
.middle-text
{
font-size
:
18px
;
padding
:
0
10px
;
color
:
#00b4ff
;
}
/
deep
/
.date-picker-reset
{
.el-input__inner
{
background-color
:
#102040
;
color
:
#00b4ff
;
border
:
1px
solid
#2563ca
;
}
input
:
:-
webkit-input-placeholder
{
color
:
#00b4ff
;
}
.el-input__prefix
{
.el-input__icon.el-icon-date
{
color
:
#00b4ff
;
}
}
}
}
#stateTrendChart
{
height
:
300px
;
width
:
607px
;
}
}
</
style
>
\ No newline at end of file
src/views/CenterControl/components/MachineUtilizationRate.vue
View file @
43b014f4
...
...
@@ -65,7 +65,7 @@
color
:
[[
0
,
'#0ea418'
],
[
1
,
'#02fb66'
]]
}
},
data
:
[{
value
:
32
,
name
:
''
}]
data
:
[{
value
:
32
}]
}
]
})
...
...
src/views/CenterControl/index.vue
View file @
43b014f4
...
...
@@ -11,6 +11,8 @@
<MachineFailureTrend></MachineFailureTrend>
<!-- 设备运行状态 -->
<MachineOperatingStatus></MachineOperatingStatus>
<!-- 设备状态趋势图 -->
<MachineStateTrend></MachineStateTrend>
</div>
</div>
</
template
>
...
...
@@ -21,6 +23,7 @@
import
MachineUtilizationTrend
from
'./components/MachineUtilizationTrend'
import
MachineFailureTrend
from
'./components/MachineFailureTrend'
import
MachineOperatingStatus
from
'./components/MachineOperatingStatus'
import
MachineStateTrend
from
'./components/MachineStateTrend'
export
default
{
components
:
{
...
...
@@ -28,7 +31,8 @@
MachineFailureRate
,
MachineUtilizationTrend
,
MachineFailureTrend
,
MachineOperatingStatus
MachineOperatingStatus
,
MachineStateTrend
},
data
()
{
return
{}
...
...
src/views/Login/index.vue
View file @
43b014f4
...
...
@@ -31,7 +31,7 @@
v-else
@
click=
"loginClick"
type=
"primary"
>
登
陆
登
录
</el-button>
</div>
</div>
...
...
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