Compare commits

..

No commits in common. "65b489d37ca6b042444100b658e243413c55ef22" and "67612107eae4f6e2b7bda9e4839b27a24a36095e" have entirely different histories.

5 changed files with 21 additions and 55 deletions

View File

@ -358,8 +358,7 @@ export default {
dialogEqList: [], dialogEqList: [],
count: 0, count: 0,
// 线线1 // 线线1
// lineIds: ['1'], lineIds: ['1'],
lineIds: [],
sectionIds: [], sectionIds: [],
lineList: [], lineList: [],
// tableConfigStatic, // tableConfigStatic,
@ -429,10 +428,10 @@ export default {
if (data && data.code === 0) { if (data && data.code === 0) {
this.lineList = data.data this.lineList = data.data
// console.log('线', this.lineList) // console.log('线', this.lineList)
/** set default 默认*/ /** set default */
// if (this.lineList.length) { if (this.lineList.length) {
// this.lineIds = [this.lineList[this.lineList.length - 1].id] this.lineIds = [this.lineList[this.lineList.length - 1].id]
// } }
} else { } else {
this.lineList = [] this.lineList = []
} }

View File

@ -135,10 +135,10 @@ export default {
}).then(({ data: res }) => { }).then(({ data: res }) => {
if (res && res.code === 0) { if (res && res.code === 0) {
this.productLineList = res.data this.productLineList = res.data
/** set default 默认*/ /** set default */
// if (this.productLineList.length) { if (this.productLineList.length) {
// this.dataForm.productlines = [this.productLineList[0].id] this.dataForm.productlines = [this.productLineList[0].id]
// } }
} else { } else {
this.productLineList = [] this.productLineList = []
this.dataForm.productlines = [] this.dataForm.productlines = []

View File

@ -270,10 +270,10 @@ export default {
}).then(({ data: res }) => { }).then(({ data: res }) => {
if (res && res.code === 0) { if (res && res.code === 0) {
this.productLineList = res.data this.productLineList = res.data
/** set default 默认*/ /** set default */
// if (this.productLineList.length) { if (this.productLineList.length) {
// this.dataForm.productlines = this.productLineList[0].id this.dataForm.productlines = this.productLineList[0].id
// } }
} else { } else {
this.productLineList = [] this.productLineList = []
} }

View File

@ -167,9 +167,7 @@ const FakeChart = {
show: true show: true
}, },
/** end */ /** end */
data: [] data: [this.$t('eq.line1'), this.$t('eq.line2'), this.$t('eq.line3'), this.$t('eq.line4')]
// selected:{'线1':(this.echartsData1 === [] ? false : true) , 'Line 1':(this.echartsData1 === [] ? false : true) ,
// '线2':(this.echartsData2 === [] ? false : true) , 'Line 2':(this.echartsData2 === [] ? false : true) }
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
@ -270,8 +268,8 @@ const FakeChart = {
typeList: { typeList: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
if (val && val !== oldVal) { if (val && val !== oldVal) {
// this.defaultOpts.legend.data.push(...val) this.defaultOpts.legend.data.push(...val)
this.defaultOpts.legend.data = val // this.defaultOpts.legend.data = val
} }
}, },
immediate: true immediate: true
@ -425,10 +423,10 @@ export default {
if (data && data.code === 0) { if (data && data.code === 0) {
this.lineList = data.data this.lineList = data.data
// console.log('线', this.lineList) // console.log('线', this.lineList)
/** set default 默认 */ /** set default */
// if (this.lineList.length) { if (this.lineList.length) {
// this.lineIds = [this.lineList[this.lineList.length - 1].id] this.lineIds = [this.lineList[this.lineList.length - 1].id]
// } }
} else { } else {
this.lineList = [] this.lineList = []
} }
@ -643,24 +641,6 @@ export default {
// { name: '11', type: 'bar', data: [/**线1*/ 2, /**线2*/ 3] }, // { name: '11', type: 'bar', data: [/**线1*/ 2, /**线2*/ 3] },
// { name: '222', type: 'bar', data: [1, 2, 3] } // { name: '222', type: 'bar', data: [1, 2, 3] }
// ] // ]
// 线legend
if (this.echartsData1.length !== 0) {
this.echartCheckTypes.push(this.$t('eq.line1'))
}
if (this.echartsData2.length !== 0) {
this.echartCheckTypes.push(this.$t('eq.line2'))
}
if (this.echartsData3.length !== 0) {
this.echartCheckTypes.push(this.$t('eq.line3'))
}
if (this.echartsData4.length !== 0) {
this.echartCheckTypes.push(this.$t('eq.line4'))
}
// console.log('this.echartCheckTypes', this.echartCheckTypes)
// console.log(this.echartsData1.length)
// console.log(this.echartsData2.length)
// console.log(this.echartsData3)
// console.log(this.echartsData4)
}, },
fetchList(startTime, endTime, lineIds) { fetchList(startTime, endTime, lineIds) {

View File

@ -151,7 +151,7 @@ const FakeChart = {
left: '5%', left: '5%',
right: '12%', right: '12%',
top: '20%', top: '20%',
bottom: '22%' bottom: '10%'
}, },
title: { title: {
text: i18n.t('eq.productQuality') text: i18n.t('eq.productQuality')
@ -318,19 +318,6 @@ const FakeChart = {
} }
} }
], ],
dataZoom: [
{
type: 'slider',
start: 0,
end: 100,
// 2%
// maxSpan: 2
},
{
start: 0,
end: 10
}
],
series: [ series: [
// dynamic // dynamic
{ {