diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index d83cb6a..9d7e596 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -61,7 +61,8 @@ export default {
return {
loginname: '',
password: '',
- option: [{index: '1', label: '生产统计'}, {index: '2', label: '仓储监控'}, {index: '3', label: '设备监控'}],
+ // option: [{index: '1', label: '生产统计'}, {index: '2', label: '仓储监控'}, {index: '3', label: '设备监控'}],
+ option: [{index: '1', label: '工序生产-左'}, {index: '2', label: '工序生产-右'}],
index: this.$store.getters.equipId,
baseUrl: this.$store.getters.baseUrl,
setTime: this.$store.getters.setTime / 1000,
@@ -86,12 +87,17 @@ export default {
}
this.$store.dispatch('setConfig', obj)
if (this.index === '1') {
- this.$router.push('/prodcount')
+ this.$router.push('/homepageone')
} else if (this.index === '2') {
- this.$router.push('/storagemonitor')
- } else if (this.index === '3') {
- this.$router.push('/devicemonitor')
+ this.$router.push('/homepagetwo')
}
+ // if (this.index === '1') {
+ // this.$router.push('/prodcount')
+ // } else if (this.index === '2') {
+ // this.$router.push('/storagemonitor')
+ // } else if (this.index === '3') {
+ // this.$router.push('/devicemonitor')
+ // }
let element = document.documentElement
if (this.fullscreen) {
if (document.exitFullscreen) {
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index 00de183..f5a1a52 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -106,8 +106,10 @@ export default {
return {
finishRate1: 80,
finishRate2: 90,
- arrL2: [{date: '碾机1', elbow_qty: '15'}, {date: '碾机2', elbow_qty: '25'}, {date: '碾机3', elbow_qty: '8'}],
- echartData1: [{data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}],
+ echartData03: [{date: '碾机1', elbow_qty: '15'}, {date: '碾机2', elbow_qty: '25'}, {date: '碾机3', elbow_qty: '8'}],
+ echartData05: [{date: '碾机1', elbow_qty: '10'}, {date: '碾机2', elbow_qty: '20'}, {date: '碾机3', elbow_qty: '18'}],
+ echartData04: [{data1: '10', data2: '15', data3: '9', data4: '5', device: '压机1'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '压机2'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '压机3'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '压机4'}],
+ echartData06: [{data1: '30', data2: '20', data3: '9', data4: '5', device: '压机1'}, {data1: '20', data2: '15', data3: '9', data4: '5', device: '压机2'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '压机3'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '压机4'}],
myCharts01: '',
myCharts02: '',
myCharts03: '',
@@ -128,7 +130,7 @@ export default {
setEchart03 () {
let date = []
let data1 = []
- this.arrL2.map(e => {
+ this.echartData03.map(e => {
date.push(e.date)
data1.push(e.elbow_qty)
})
@@ -241,7 +243,7 @@ export default {
let data3 = []
let data4 = []
let device = []
- this.echartData1.map(e => {
+ this.echartData04.map(e => {
data1.push(e.data1)
data2.push(e.data2)
data3.push(e.data3)
@@ -266,7 +268,7 @@ export default {
itemGap: 30.86,
itemWidth: 14.16,
itemHeight: 7.38,
- data: [{name: '正常运行', itemStyle: {color: '#33CCCC'}}, {name: '故障', itemStyle: {color: '#EAAD24'}}, {name: '待机', itemStyle: {color: '#0E90FD'}}, {name: '关机', itemStyle: {color: '#c9c9c9'}}]
+ data: [{name: '合格数', itemStyle: {color: '#33CCCC'}}, {name: '不合格数', itemStyle: {color: '#EAAD24'}}]
},
xAxis: {
type: 'category',
@@ -315,7 +317,7 @@ export default {
},
series: [
{
- name: '正常运行',
+ name: '合格数',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -337,7 +339,7 @@ export default {
data: data1
},
{
- name: '故障',
+ name: '不合格数',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -357,50 +359,6 @@ export default {
}
},
data: data2
- },
- {
- name: '待机',
- type: 'bar',
- barWidth: '8',
- itemStyle: {
- normal: {
- color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 1,
- color: 'rgba(96,112,128,0.10)',
- opacity: 1
- },
- {
- offset: 0,
- color: '#0E90FD',
- opacity: 0.1
- }
- ])
- }
- },
- data: data3
- },
- {
- name: '关机',
- type: 'bar',
- barWidth: '8',
- itemStyle: {
- normal: {
- color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: '#c9c9c9',
- opacity: 1
- },
- {
- offset: 1,
- color: 'rgba(148,145,145,0.25)',
- opacity: 0.25
- }
- ])
- }
- },
- data: data4
}
]
}
@@ -419,7 +377,7 @@ export default {
setEchart05 () {
let date = []
let data1 = []
- this.arrL2.map(e => {
+ this.echartData05.map(e => {
date.push(e.date)
data1.push(e.elbow_qty)
})
@@ -532,7 +490,7 @@ export default {
let data3 = []
let data4 = []
let device = []
- this.echartData1.map(e => {
+ this.echartData06.map(e => {
data1.push(e.data1)
data2.push(e.data2)
data3.push(e.data3)
@@ -557,7 +515,7 @@ export default {
itemGap: 30.86,
itemWidth: 14.16,
itemHeight: 7.38,
- data: [{name: '正常运行', itemStyle: {color: '#33CCCC'}}, {name: '故障', itemStyle: {color: '#EAAD24'}}, {name: '待机', itemStyle: {color: '#0E90FD'}}, {name: '关机', itemStyle: {color: '#c9c9c9'}}]
+ data: [{name: '合格数', itemStyle: {color: '#33CCCC'}}, {name: '不合格数', itemStyle: {color: '#EAAD24'}}]
},
xAxis: {
type: 'category',
@@ -606,7 +564,7 @@ export default {
},
series: [
{
- name: '正常运行',
+ name: '合格数',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -628,7 +586,7 @@ export default {
data: data1
},
{
- name: '故障',
+ name: '不合格数',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -648,50 +606,6 @@ export default {
}
},
data: data2
- },
- {
- name: '待机',
- type: 'bar',
- barWidth: '8',
- itemStyle: {
- normal: {
- color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 1,
- color: 'rgba(96,112,128,0.10)',
- opacity: 1
- },
- {
- offset: 0,
- color: '#0E90FD',
- opacity: 0.1
- }
- ])
- }
- },
- data: data3
- },
- {
- name: '关机',
- type: 'bar',
- barWidth: '8',
- itemStyle: {
- normal: {
- color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: '#c9c9c9',
- opacity: 1
- },
- {
- offset: 1,
- color: 'rgba(148,145,145,0.25)',
- opacity: 0.25
- }
- ])
- }
- },
- data: data4
}
]
}
@@ -713,7 +627,7 @@ export default {
let max = 0
// this.chartData2.map(el => {
// total.push(el.err_times)
- // names.push(el.device_name)
+ // names.push(el.devic_name)
// max = Math.max(max, Number(el.err_times))
// })
let option = {
@@ -1019,11 +933,24 @@ export default {
padding 40px 0 20px 54px
.n_body_container_wraper
_wh(100%, 100%)
+// .box1
+// // _wh(100%, 20%)
+// width 100%
+// _fj()
+// flex-direction row
+// .box2
+// clear both
+// _wh(100%, 37%)
+// _fj()
+// flex-direction row
+// margin-bottom 1%
.box1
// _wh(100%, 20%)
width 100%
+ height 23%
_fj()
flex-direction row
+ margin-bottom 1%
.box2
clear both
_wh(100%, 37%)
@@ -1193,8 +1120,14 @@ export default {
left 0
_wh(.15rem, .15rem)
background center center / 100% 100% url(../../..//images/screen1/dot_1.png) no-repeat
+// .item_content_3
+// _wh(100%, 100%)
+// padding-top .1rem
+// _fj(flex-start)
+// flex-direction column
.item_content_3
_wh(100%, 100%)
+ height calc(100% - .4rem)
padding-top .1rem
_fj(flex-start)
flex-direction column
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index 1553355..af82bfb 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -40,7 +40,7 @@
成品
@@ -104,9 +104,11 @@ export default {
},
data () {
return {
- finishRate: 80,
- arrL2: [{date: '碾机1', elbow_qty: '15'}, {date: '碾机2', elbow_qty: '25'}, {date: '碾机3', elbow_qty: '8'}],
- echartData1: [{data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}],
+ finishRate1: 80,
+ echartData03: [{data1: '5', data2: '15', data3: '9', data4: '5', device: '成品1'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品2'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品3'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品4'}],
+ echartData04: [{data1: '15', data2: '15', data3: '9', data4: '5', device: '成品1'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品2'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品3'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品4'}],
+ echartData05: [{data1: '19', data2: '10', data3: '9', data4: '5', device: '成品1'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品2'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品3'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品4'}],
+ echartData06: [{data1: '30', data2: '15', data3: '9', data4: '5', device: '成品1'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品2'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品3'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '成品4'}],
myCharts01: '',
myCharts02: '',
myCharts03: '',
@@ -125,122 +127,12 @@ export default {
},
methods: {
setEchart03 () {
- let date = []
- let data1 = []
- this.arrL2.map(e => {
- date.push(e.date)
- data1.push(e.elbow_qty)
- })
- let option = {
- grid: {
- top: 50,
- left: 0,
- right: 0,
- bottom: 0,
- containLabel: true
- },
- legend: {
- icon: 'rect',
- textStyle: {
- color: '#fff',
- fontSize: 14,
- lineHeight: 14
- },
- itemGap: 30.86,
- itemWidth: 14.16,
- itemHeight: 7.38,
- data: [{name: '产量（kg）', itemStyle: {color: '#0E90FD'}}]
- },
- xAxis: {
- type: 'category',
- axisTick: {
- show: false
- },
- axisLine: {
- show: true,
- lineStyle: {
- width: 2,
- color: '#8FABBF'
- }
- },
- axisLabel: {
- interval: 0,
- textStyle: {
- color: '#8FABBF',
- fontSize: 16
- },
- rotate: 50
- },
- data: date
- },
- yAxis: {
- type: 'value',
- axisLine: {
- show: false
- },
- splitNumber: 2,
- axisTick: {
- show: false
- },
- axisLabel: {
- textStyle: {
- color: '#8FABBF',
- fontSize: 14
- }
- },
- splitLine: {
- show: true,
- lineStyle: {
- type: [8, 4],
- dashOffset: 4,
- color: '#8FABBF'
- }
- }
- },
- series: [
- {
- name: '产量（kg）',
- type: 'bar',
- barWidth: '8',
- itemStyle: {
- normal: {
- color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 1,
- color: 'rgba(96,112,128,0.10)',
- opacity: 1
- },
- {
- offset: 0,
- color: '#0E90FD',
- opacity: 0.1
- }
- ])
- }
- },
- data: data1
- }
- ]
- }
- let echart = document.getElementById('echart_d03')
- if (this.myCharts03 !== '') {
- this.myCharts03.dispose()
- }
- if (echart !== null) {
- this.myCharts03 = this.$echarts.init(echart)
- this.myCharts03.setOption(option)
- window.addEventListener('resize', () => {
- this.myCharts03.resize()
- })
- }
- },
- setEchart04 () {
let data1 = []
let data2 = []
let data3 = []
let data4 = []
let device = []
- this.echartData1.map(e => {
+ this.echartData03.map(e => {
data1.push(e.data1)
data2.push(e.data2)
data3.push(e.data3)
@@ -265,7 +157,7 @@ export default {
itemGap: 30.86,
itemWidth: 14.16,
itemHeight: 7.38,
- data: [{name: '正常运行', itemStyle: {color: '#33CCCC'}}, {name: '故障', itemStyle: {color: '#EAAD24'}}, {name: '待机', itemStyle: {color: '#0E90FD'}}, {name: '关机', itemStyle: {color: '#c9c9c9'}}]
+ data: [{name: '合格数', itemStyle: {color: '#33CCCC'}}, {name: '不合格数', itemStyle: {color: '#EAAD24'}}]
},
xAxis: {
type: 'category',
@@ -314,7 +206,7 @@ export default {
},
series: [
{
- name: '正常运行',
+ name: '合格数',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -336,7 +228,144 @@ export default {
data: data1
},
{
- name: '故障',
+ name: '不合格数',
+ type: 'bar',
+ barWidth: '8',
+ itemStyle: {
+ normal: {
+ color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#B68845',
+ opacity: 1
+ },
+ {
+ offset: 1,
+ color: 'rgba(134,98,45,0.25)',
+ opacity: 0.25
+ }
+ ])
+ }
+ },
+ data: data2
+ }
+ ]
+ }
+ let echart = document.getElementById('echart_03')
+ // if (this.myCharts03 !== '') {
+ // this.myCharts03.dispose()
+ // }
+ if (echart !== null) {
+ this.myCharts03 = this.$echarts.init(echart)
+ this.myCharts03.setOption(option)
+ window.addEventListener('resize', () => {
+ this.myCharts03.resize()
+ })
+ }
+ },
+ setEchart04 () {
+ let data1 = []
+ let data2 = []
+ let data3 = []
+ let data4 = []
+ let device = []
+ this.echartData04.map(e => {
+ data1.push(e.data1)
+ data2.push(e.data2)
+ data3.push(e.data3)
+ data4.push(e.data4)
+ device.push(e.device)
+ })
+ let option = {
+ grid: {
+ top: 50,
+ left: 0,
+ right: 0,
+ bottom: 0,
+ containLabel: true
+ },
+ legend: {
+ icon: 'rect',
+ textStyle: {
+ color: '#fff',
+ fontSize: 14,
+ lineHeight: 14
+ },
+ itemGap: 30.86,
+ itemWidth: 14.16,
+ itemHeight: 7.38,
+ data: [{name: '入库数量', itemStyle: {color: '#33CCCC'}}, {name: '出库数量', itemStyle: {color: '#EAAD24'}}, {name: '库存数量', itemStyle: {color: '#0E90FD'}}]
+ },
+ xAxis: {
+ type: 'category',
+ axisTick: {
+ show: false
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {
+ width: 2,
+ color: '#8FABBF'
+ }
+ },
+ axisLabel: {
+ interval: 0,
+ textStyle: {
+ color: '#8FABBF',
+ fontSize: 16
+ }
+ },
+ data: device
+ },
+ yAxis: {
+ type: 'value',
+ axisLine: {
+ show: false
+ },
+ splitNumber: 2,
+ axisTick: {
+ show: false
+ },
+ axisLabel: {
+ textStyle: {
+ color: '#8FABBF',
+ fontSize: 14
+ }
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ type: [8, 4],
+ dashOffset: 4,
+ color: '#8FABBF'
+ }
+ }
+ },
+ series: [
+ {
+ name: '入库数量',
+ type: 'bar',
+ barWidth: '8',
+ itemStyle: {
+ normal: {
+ color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#33CCCC',
+ opacity: 1
+ },
+ {
+ offset: 1,
+ color: 'rgba(31,89,89,0.25)',
+ opacity: 0.25
+ }
+ ])
+ }
+ },
+ data: data1
+ },
+ {
+ name: '出库数量',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -358,7 +387,7 @@ export default {
data: data2
},
{
- name: '待机',
+ name: '库存数量',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -378,28 +407,6 @@ export default {
}
},
data: data3
- },
- {
- name: '关机',
- type: 'bar',
- barWidth: '8',
- itemStyle: {
- normal: {
- color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: '#c9c9c9',
- opacity: 1
- },
- {
- offset: 1,
- color: 'rgba(148,145,145,0.25)',
- opacity: 0.25
- }
- ])
- }
- },
- data: data4
}
]
}
@@ -416,122 +423,12 @@ export default {
}
},
setEchart05 () {
- let date = []
- let data1 = []
- this.arrL2.map(e => {
- date.push(e.date)
- data1.push(e.elbow_qty)
- })
- let option = {
- grid: {
- top: 50,
- left: 0,
- right: 0,
- bottom: 0,
- containLabel: true
- },
- legend: {
- icon: 'rect',
- textStyle: {
- color: '#fff',
- fontSize: 14,
- lineHeight: 14
- },
- itemGap: 30.86,
- itemWidth: 14.16,
- itemHeight: 7.38,
- data: [{name: '产量（kg）', itemStyle: {color: '#0E90FD'}}]
- },
- xAxis: {
- type: 'category',
- axisTick: {
- show: false
- },
- axisLine: {
- show: true,
- lineStyle: {
- width: 2,
- color: '#8FABBF'
- }
- },
- axisLabel: {
- interval: 0,
- textStyle: {
- color: '#8FABBF',
- fontSize: 16
- },
- rotate: 50
- },
- data: date
- },
- yAxis: {
- type: 'value',
- axisLine: {
- show: false
- },
- splitNumber: 2,
- axisTick: {
- show: false
- },
- axisLabel: {
- textStyle: {
- color: '#8FABBF',
- fontSize: 14
- }
- },
- splitLine: {
- show: true,
- lineStyle: {
- type: [8, 4],
- dashOffset: 4,
- color: '#8FABBF'
- }
- }
- },
- series: [
- {
- name: '产量（kg）',
- type: 'bar',
- barWidth: '8',
- itemStyle: {
- normal: {
- color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 1,
- color: 'rgba(96,112,128,0.10)',
- opacity: 1
- },
- {
- offset: 0,
- color: '#0E90FD',
- opacity: 0.1
- }
- ])
- }
- },
- data: data1
- }
- ]
- }
- let echart = document.getElementById('echart_d05')
- if (this.myCharts05 !== '') {
- this.myCharts05.dispose()
- }
- if (echart !== null) {
- this.myCharts05 = this.$echarts.init(echart)
- this.myCharts05.setOption(option)
- window.addEventListener('resize', () => {
- this.myCharts05.resize()
- })
- }
- },
- setEchart06 () {
let data1 = []
let data2 = []
let data3 = []
let data4 = []
let device = []
- this.echartData1.map(e => {
+ this.echartData05.map(e => {
data1.push(e.data1)
data2.push(e.data2)
data3.push(e.data3)
@@ -556,7 +453,7 @@ export default {
itemGap: 30.86,
itemWidth: 14.16,
itemHeight: 7.38,
- data: [{name: '正常运行', itemStyle: {color: '#33CCCC'}}, {name: '故障', itemStyle: {color: '#EAAD24'}}, {name: '待机', itemStyle: {color: '#0E90FD'}}, {name: '关机', itemStyle: {color: '#c9c9c9'}}]
+ data: [{name: '合格数', itemStyle: {color: '#33CCCC'}}, {name: '不合格数', itemStyle: {color: '#EAAD24'}}]
},
xAxis: {
type: 'category',
@@ -605,7 +502,7 @@ export default {
},
series: [
{
- name: '正常运行',
+ name: '合格数',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -627,7 +524,144 @@ export default {
data: data1
},
{
- name: '故障',
+ name: '不合格数',
+ type: 'bar',
+ barWidth: '8',
+ itemStyle: {
+ normal: {
+ color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#B68845',
+ opacity: 1
+ },
+ {
+ offset: 1,
+ color: 'rgba(134,98,45,0.25)',
+ opacity: 0.25
+ }
+ ])
+ }
+ },
+ data: data2
+ }
+ ]
+ }
+ let echart = document.getElementById('echart_05')
+ // if (this.myCharts05 !== '') {
+ // this.myCharts05.dispose()
+ // }
+ if (echart !== null) {
+ this.myCharts05 = this.$echarts.init(echart)
+ this.myCharts05.setOption(option)
+ window.addEventListener('resize', () => {
+ this.myCharts05.resize()
+ })
+ }
+ },
+ setEchart06 () {
+ let data1 = []
+ let data2 = []
+ let data3 = []
+ let data4 = []
+ let device = []
+ this.echartData06.map(e => {
+ data1.push(e.data1)
+ data2.push(e.data2)
+ data3.push(e.data3)
+ data4.push(e.data4)
+ device.push(e.device)
+ })
+ let option = {
+ grid: {
+ top: 50,
+ left: 0,
+ right: 0,
+ bottom: 0,
+ containLabel: true
+ },
+ legend: {
+ icon: 'rect',
+ textStyle: {
+ color: '#fff',
+ fontSize: 14,
+ lineHeight: 14
+ },
+ itemGap: 30.86,
+ itemWidth: 14.16,
+ itemHeight: 7.38,
+ data: [{name: '入库数量', itemStyle: {color: '#33CCCC'}}, {name: '出库数量', itemStyle: {color: '#EAAD24'}}, {name: '库存数量', itemStyle: {color: '#0E90FD'}}]
+ },
+ xAxis: {
+ type: 'category',
+ axisTick: {
+ show: false
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {
+ width: 2,
+ color: '#8FABBF'
+ }
+ },
+ axisLabel: {
+ interval: 0,
+ textStyle: {
+ color: '#8FABBF',
+ fontSize: 16
+ }
+ },
+ data: device
+ },
+ yAxis: {
+ type: 'value',
+ axisLine: {
+ show: false
+ },
+ splitNumber: 2,
+ axisTick: {
+ show: false
+ },
+ axisLabel: {
+ textStyle: {
+ color: '#8FABBF',
+ fontSize: 14
+ }
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ type: [8, 4],
+ dashOffset: 4,
+ color: '#8FABBF'
+ }
+ }
+ },
+ series: [
+ {
+ name: '入库数量',
+ type: 'bar',
+ barWidth: '8',
+ itemStyle: {
+ normal: {
+ color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#33CCCC',
+ opacity: 1
+ },
+ {
+ offset: 1,
+ color: 'rgba(31,89,89,0.25)',
+ opacity: 0.25
+ }
+ ])
+ }
+ },
+ data: data1
+ },
+ {
+ name: '出库数量',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -649,7 +683,7 @@ export default {
data: data2
},
{
- name: '待机',
+ name: '库存数量',
type: 'bar',
barWidth: '8',
itemStyle: {
@@ -669,28 +703,6 @@ export default {
}
},
data: data3
- },
- {
- name: '关机',
- type: 'bar',
- barWidth: '8',
- itemStyle: {
- normal: {
- color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: '#c9c9c9',
- opacity: 1
- },
- {
- offset: 1,
- color: 'rgba(148,145,145,0.25)',
- opacity: 0.25
- }
- ])
- }
- },
- data: data4
}
]
}
@@ -823,7 +835,7 @@ export default {
})
},
setEchart01 () {
- let value = Number(this.finishRate)
+ let value = Number(this.finishRate1)
let title = '%'
let text = '完成率'
let option = {
@@ -1092,7 +1104,7 @@ export default {
},
],
};
- let echart = document.getElementById('echart_d02')
+ let echart = document.getElementById('echart_02')
// if (this.myCharts02 !== '') {
// this.myCharts02.dispose()
// }
@@ -1129,8 +1141,10 @@ export default {
.box1
// _wh(100%, 20%)
width 100%
+ height 23%
_fj()
flex-direction row
+ margin-bottom 1%
.box2
clear both
_wh(100%, 37%)
@@ -1302,6 +1316,7 @@ export default {
background center center / 100% 100% url(../../..//images/screen1/dot_1.png) no-repeat
.item_content_3
_wh(100%, 100%)
+ height calc(100% - .4rem)
padding-top .1rem
_fj(flex-start)
flex-direction column