Skip to content

I
IT-monitor
Commit 08854bc7 authored by 张伯涛's avatar 张伯涛
Browse files
Options

修改

parent 2f06fd2a
Show whitespace changes
Inline Side-by-side
Showing with 171 additions and 32 deletions
src/styles/sidebar.scss
View file @ 08854bc7
......@@ -275,8 +275,8 @@
.nest-menu {
.el-submenu__title {
background-color: #fff !important;
color: #000000 !important;
background-color: #1A2137 !important;
color: #46bcf2 !important;
.el-submenu__icon-arrow {
color: #46bcf2 !important;
......
src/views/login/login.vue
View file @ 08854bc7
......@@ -141,7 +141,7 @@ export default {
// window.location.href = `${this.reLocation}/#/`
// this.$router.push({ path: `http://main.court.com${this.redirect || "/"}` });
this.loading = false
this.$router.push('/welcome')
this.$router.push('/overView/dashboard/equipment')
})
.catch(() => {
this.loading = false
......
src/views/overView/dashboard/equipment.vue
View file @ 08854bc7
......@@ -115,30 +115,12 @@
<el-card class="box-card">
<div style="display: flex;margin-top: 10px">
<el-divider direction="vertical" />
<div class="cardTitle">全网信息统计</div>
<div class="cardTitle">故障统计折线图</div>
</div>
<el-row style="margin-top: 20px">
<el-col :span="8">
<div class="cardChild">
<img :src="equipmentIcon" class="sidebar-logo">
<div class="cardFont">设备总数</div>
<div class="cardNum">104</div>
<div id="echarts-enterFirst" class="span_1">
<div id="dataCharts_enterFirst" ref="chart_enter" style="height: 25vh" />
</div>
</el-col>
<el-col :span="8">
<div class="cardChild">
<img :src="monitorIcon" class="sidebar-logo">
<div class="cardFont">监控总数</div>
<div class="cardNum">2143</div>
</div>
</el-col>
<el-col :span="8">
<div class="cardChild">
<img :src="warnIcon" class="sidebar-logo">
<div class="cardFont">警告数</div>
<div class="cardNum">22</div>
</div>
</el-col>
</el-row>
</el-card>
<el-card class="box-card">
......@@ -153,16 +135,15 @@
</el-row>
</el-card>
<el-card class="box-card">
<div style="display: flex;margin-top: 10px;margin-bottom: 10px">
<div style="display: flex;margin-top: 10px">
<el-divider direction="vertical" />
<div class="cardTitle">未处理警告</div>
</div>
<div v-for="(item, index) in messageList" :key="index" class="warnMessage">
<div>
<span>{{ item.label }}</span>
<span>{{ item.time }}</span>
<div class="cardTitle">故障统计折线图</div>
</div>
<el-row style="margin-top: 20px">
<div id="echarts-enterThird" class="span_1">
<div id="dataCharts_enterThird" ref="chart_enter" style="height: 25vh" />
</div>
</el-row>
</el-card>
</div>
</el-col>
......@@ -206,6 +187,9 @@ export default {
mounted() {
this.getDataTime()
this.genderStatistics()
this.genderRightFifst()
this.genderrightSecond()
this.genderRightThird()
this.getProLineMonitor()
this.getMonitorPoint()
// 通过监听内容部分的宽度让图表resize
......@@ -223,6 +207,39 @@ export default {
echarts.init(document.getElementById('dataCharts_enter')).resize()
})
})
erd.listenTo(document.getElementById('echarts-enterFirst'), function(element) {
var width = element.offsetWidth
var height = element.offsetHeight
self.tableHeight = height // 将监听到的宽高进行赋值
self.tableWidth = width
that.$nextTick(function() {
console.log('Size: ' + width + 'x' + height)
// 使echarts尺寸重置
echarts.init(document.getElementById('dataCharts_enterFirst')).resize()
})
})
erd.listenTo(document.getElementById('echarts-enterThird'), function(element) {
var width = element.offsetWidth
var height = element.offsetHeight
self.tableHeight = height // 将监听到的宽高进行赋值
self.tableWidth = width
that.$nextTick(function() {
console.log('Size: ' + width + 'x' + height)
// 使echarts尺寸重置
echarts.init(document.getElementById('dataCharts_enterThird')).resize()
})
})
erd.listenTo(document.getElementById('echarts-enters'), function(element) {
var width = element.offsetWidth
var height = element.offsetHeight
self.tableHeight = height // 将监听到的宽高进行赋值
self.tableWidth = width
that.$nextTick(function() {
console.log('Size: ' + width + 'x' + height)
// 使echarts尺寸重置
echarts.init(document.getElementById('dataCharts_enters')).resize()
})
})
erd.listenTo(document.getElementById('echarts-proLineMonitor'), function(element) {
var width = element.offsetWidth
var height = element.offsetHeight
......@@ -311,6 +328,128 @@ export default {
}
myChartGender.setOption(optionEnter)
},
/** 右侧第一个图
* */
genderRightFifst() {
const myChartGender = echarts.init(document.getElementById('dataCharts_enterFirst'))
var optionEnterFirst = {
tooltip: {
trigger: 'axis'
},
// legend: {
// data: ['产线1', '产线2']
// },
grid: {
top: '3%',
left: '3%',
right: '4%',
containLabel: true
},
xAxis: {
type: 'category',
boundaryGap: false,
data: ['工序1', '工序2', '工序3', '工序4', '工序5']
},
yAxis: {
type: 'value'
},
series: [
{
name: '产线1',
type: 'line',
stack: 'Total',
smooth: true,
data: [12, 13, 11, 13, 9]
},
{
name: '产线2',
type: 'line',
stack: 'Total',
smooth: true,
data: [22, 18, 11, 23, 19]
}
]
}
myChartGender.setOption(optionEnterFirst)
},
/** 右侧第二个图
* */
genderrightSecond() {
const myChartGender = echarts.init(document.getElementById('dataCharts_enters'))
var optionEnters = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
legend: {},
grid: {
top: '2%',
left: '5%',
right: '4%',
containLabel: true
},
xAxis: {
type: 'value'
},
yAxis: {
type: 'category',
data: ['其他', '物联网', '应用和业务', '服务器', '网络设备']
},
series: [
{
type: 'bar',
data: [0, 0, 1, 1, 7]
}
]
}
myChartGender.setOption(optionEnters)
},
/** 右侧第三个图
* */
genderRightThird() {
const myChartGender = echarts.init(document.getElementById('dataCharts_enterThird'))
var optionEnterThird = {
tooltip: {
trigger: 'axis'
},
// legend: {
// data: ['产线1', '产线2']
// },
grid: {
top: '3%',
left: '3%',
right: '4%',
containLabel: true
},
xAxis: {
type: 'category',
boundaryGap: false,
data: ['工序1', '工序2', '工序3', '工序4', '工序5']
},
yAxis: {
type: 'value'
},
series: [
{
name: '产线1',
type: 'line',
stack: 'Total',
smooth: true,
data: [12, 13, 11, 13, 9]
},
{
name: '产线2',
type: 'line',
stack: 'Total',
smooth: true,
data: [22, 18, 11, 23, 19]
}
]
}
myChartGender.setOption(optionEnterThird)
},
/** 设备*/
getProLineMonitor() {
const myChartAge = echarts.init(document.getElementById('dataCharts_proLineMonitor'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment