diff --git a/src/config/mork2.js b/src/config/mork2.js index 662422b..28d5f8e 100644 --- a/src/config/mork2.js +++ b/src/config/mork2.js @@ -316,43 +316,43 @@ export const homepageDataRight = () => { }, 'top10Of30Days': [ { - 'deviceName': '压机1', + 'device_name': '压机1', 'count': 10 }, { - 'deviceName': '压机2', + 'device_name': '压机2', 'count': 9 }, { - 'deviceName': '混料机1', + 'device_name': '混料机1', 'count': 8 }, { - 'deviceName': '窑1', + 'device_name': '窑1', 'count': 7 }, { - 'deviceName': '分拣拆垛机械手1', + 'device_name': '分拣拆垛机械手1', 'count': 6 }, { - 'deviceName': '压机7', + 'device_name': '压机7', 'count': 5 }, { - 'deviceName': '码垛机械手1', + 'device_name': '码垛机械手1', 'count': 4 }, { - 'deviceName': '窑前桁架1', + 'device_name': '窑前桁架1', 'count': 3 }, { - 'deviceName': '拆盘机1', + 'device_name': '拆盘机1', 'count': 2 }, { - 'deviceName': '覆膜机1', + 'device_name': '覆膜机1', 'count': 1 } ], diff --git a/src/pages/modules/home/left/left.vue b/src/pages/modules/home/left/left.vue index b097c1e..1e0fe3d 100644 --- a/src/pages/modules/home/left/left.vue +++ b/src/pages/modules/home/left/left.vue @@ -371,7 +371,13 @@ export default { }, yAxis: { type: 'value', - // name: '单位:块', + name: '单位:吨', + nameTextStyle: { + color: '#B5C5D4', + fontSize: 14, + fontFamily: 'SourceHanSansCN-Regular', + padding: [0, 10, 0, 10] + }, axisLine: { show: false }, @@ -777,11 +783,11 @@ export default { if (bu > seriesData.length - 1) { bu = 0 } - echart.dispatchAction({ - type: 'select', - seriesIndex: 0, - dataIndex: bu - }) + // echart.dispatchAction({ + // type: 'select', + // seriesIndex: 0, + // dataIndex: bu + // }) echart.dispatchAction({ type: 'legendScroll', seriesIndex: 0, diff --git a/src/pages/modules/home/right/right.vue b/src/pages/modules/home/right/right.vue index ac6199a..69bda79 100644 --- a/src/pages/modules/home/right/right.vue +++ b/src/pages/modules/home/right/right.vue @@ -116,7 +116,7 @@ export default { capacityRate: [], // 设备产能利用 stateStatistics: {}, // 设备运行统计 deviceWorkOrder: [], // 设备工单生产 - areaDeviceStatus: [{process: '混料'}, {process: '压制'}, {process: '干燃'}, {process: '包装'}], // 工序设备状态 + areaDeviceStatus: [{process: '混料'}, {process: '压制'}, {process: '干燥'}, {process: '包装'}], // 工序设备状态 top10Of30Days: [] // 30天故障top10 } }, @@ -201,7 +201,7 @@ export default { let img = {pointerImg: pointerImg} let cdata = [] this.capacityRate.map(el => { - cdata.push({name: el.device_name, data: el.numerical.toFixed(0)}) + cdata.push({name: el.device_name, data: Number(el.numerical).toFixed(0)}) }) let centerArr = [['25%', '38%'], ['75%', '38%'], ['25%', '89%'], ['75%', '89%']] let topArr = ['39%', '39%', '90%', '90%'] @@ -403,18 +403,18 @@ export default { this.$echarts.dispose(document.getElementById('new_home_echart_7')) let echart = this.$echarts.init(document.getElementById('new_home_echart_7')) echart.setOption(option) - let bu = 0 - this.chart7Timer = setInterval(() => { - if (bu > seriesData.length - 1) { - bu = 0 - } - echart.dispatchAction({ - type: 'select', // 默认显示江苏的提示框 - seriesIndex: 0, // 这行不能省 - dataIndex: bu - }) - bu++ - }, 2000) + // let bu = 0 + // this.chart7Timer = setInterval(() => { + // if (bu > seriesData.length - 1) { + // bu = 0 + // } + // echart.dispatchAction({ + // type: 'select', // 默认显示江苏的提示框 + // seriesIndex: 0, // 这行不能省 + // dataIndex: bu + // }) + // bu++ + // }, 2000) window.addEventListener('resize', () => { echart.resize() }) @@ -907,17 +907,17 @@ export default { &:nth-child(1) width 5% &:nth-child(2) - width 8% + width 12% &:nth-child(3) width 14% &:nth-child(4) - width 8% + width 7% &:nth-child(5) width 12% &:nth-child(7) width 19% &:nth-child(9) - width 14% + width 11% .state display block _wh(20px, 14px) @@ -950,17 +950,17 @@ export default { &:nth-child(1) width 5% &:nth-child(2) - width 8% + width 12% &:nth-child(3) width 14% &:nth-child(4) - width 8% + width 7% &:nth-child(5) width 12% &:nth-child(7) width 19% &:nth-child(9) - width 14% + width 11% .state display block _wh(20px, 14px)