12
0

Merge pull request ''数据分析bug修改2次'' (#27) from fzq into develop
Alle Prüfungen waren erfolgreich
continuous-integration/drone/push Build is passing

Reviewed-on: #27
Dieser Commit ist enthalten in:
高天泽 2023-03-27 10:59:39 +08:00
Commit 65b489d37c
5 geänderte Dateien mit 55 neuen und 21 gelöschten Zeilen

Datei anzeigen

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

Datei anzeigen

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

Datei anzeigen

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

Datei anzeigen

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

Datei anzeigen

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