修改bug
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-15 10:49:13
|
||||
* @LastEditTime: 2024-07-02 16:33:59
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2024-07-04 09:28:31
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@@ -115,7 +115,7 @@ import moment from 'moment'
|
||||
import ButtonNav from '@/components/ButtonNav'
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import AddOrUpdate from './add-or-updata'
|
||||
import { factoryList, factoryArray, factoryArray1 } from "@/utils/constants";
|
||||
import { factoryList, factoryArray } from "@/utils/constants";
|
||||
|
||||
export default {
|
||||
components: { lineChart, ButtonNav, AddOrUpdate },
|
||||
@@ -124,7 +124,7 @@ export default {
|
||||
return {
|
||||
factoryList,
|
||||
factoryArray,
|
||||
factoryArray1,
|
||||
// factoryArray1,
|
||||
listQuery: {
|
||||
pageSize: 20,
|
||||
pageNo: 1,
|
||||
@@ -381,9 +381,24 @@ export default {
|
||||
this.seriesList = []
|
||||
// x轴数据
|
||||
xAxisData = Object.keys(data)
|
||||
let arr = []
|
||||
if (this.listQuery.factory.length === 0) {
|
||||
arr = this.factoryArray
|
||||
} else {
|
||||
this.listQuery.factory.forEach((ele, index) => {
|
||||
|
||||
let i = this.factoryArray.findIndex((item) => item.id == ele)
|
||||
if (i != -1) {
|
||||
arr.push({
|
||||
id: this.factoryArray[i].id,
|
||||
name: this.factoryArray[i].name
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// y轴数据
|
||||
this.factoryArray.forEach(fac => {
|
||||
arr.forEach(fac => {
|
||||
let i = 0
|
||||
while ( i < 3) {
|
||||
// 下标
|
||||
@@ -469,7 +484,7 @@ export default {
|
||||
}
|
||||
})
|
||||
console.log('你好', this.seriesList)
|
||||
this.$refs.lineChart.initChart(xAxisData, this.seriesList)
|
||||
this.$refs.lineChart.initChart(xAxisData, this.seriesList,arr)
|
||||
},
|
||||
buttonClick(val) {
|
||||
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
|
||||
|
||||
Reference in New Issue
Block a user