fix:修复切换panel 报错

This commit is contained in:
wangwenrui
2020-09-22 11:54:25 +08:00
parent 0bf073ccc1
commit e5a5a540aa
2 changed files with 22 additions and 17 deletions

View File

@@ -325,7 +325,6 @@
}
},
clickLegend(legendName,index){
console.log('cur index',index,legendName)
//点击图表某一个legend图表只显示当前点击的曲线或柱状图其它隐藏再次点击已选中的legend ,显示全部
let curIsGrey=this.isGrey[index];
if(this.echartStore){
@@ -461,7 +460,6 @@
if ( chartInfo.type === 4) {//line,bar
this.chartType = 'line';
}
console.log('chartData',chartInfo,legend,dataArg)
let minTime = null;
let maxTime = null
if(dataArg.length>0 && dataArg[0].data
@@ -909,7 +907,6 @@
//console.log("11____00",sumHeight,divHeight,legendDiv)
self.$refs.screenShowArea.style.height = `${sumHeight - divHeight - self.screenTitleHeight}px`;
self.echartModalStore.resize({height: (sumHeight - divHeight - self.screenTitleHeight)});//图表的高度
console.log(self.seriesItemScreen,self.seriesItemArrScreen);
self.echartModalStore.off('finished');
})
}, 100);
@@ -1217,7 +1214,6 @@
}
let step = bus.getStep(startTime,endTime);
if (type === 'list') { // 普通模式,主控台使用
console.info(this.data);
axiosArr = this.data.elements.map((ele) => {
const filterItem = ele;
let query = encodeURIComponent(filterItem.expression);
@@ -1482,7 +1478,7 @@
})
},
findLegendOptions:function(){
if((!this.data.param.legendValue) || Object.keys(this.data.param.legendValue)<1) return false;
if(!this.data.param||!this.data.param.legendValue || Object.keys(this.data.param.legendValue)<1) return false;
let legendOptions= this.data.param.legendValue;
let onVal=Object.keys(legendOptions).find(item=>{return legendOptions[item] == 'on'});

View File

@@ -85,6 +85,7 @@
size="small"
value-key="name"
v-if="!editChart.id"
@input="inputPanel"
popper-class="chart-box-autocomplete no-style-class"
>
</el-autocomplete>
@@ -376,6 +377,7 @@
// 是否为编辑已有信息
isedit: false,
//productId: 0,//不需要这个参数,可以删除
isInputPanel:false,
panelId: 0,
panelName: '',
selectFirstPanel: false,
@@ -1103,19 +1105,26 @@
this.legends = [];
this.elementIds = [];
},
inputPanel:function(){
this.isInputPanel=true;
},
/*panel搜索建议*/
panelSuggestion(queryString, callback) {
let data = [];
if (!queryString) {
data = this.panelData;
} else {
for (let i = 0; i < this.panelData.length; i++) {
if (this.panelData[i].name.toLowerCase().indexOf(queryString.toLowerCase()) != -1) {
data.push(this.panelData[i]);
}
}
}
callback(data);
if(!this.isInputPanel){
callback(JSON.parse(JSON.stringify(this.panelData)));
}else{
let data = [];
if (!queryString) {
data = this.panelData;
} else {
for (let i = 0; i < this.panelData.length; i++) {
if (this.panelData[i].name.toLowerCase().indexOf(queryString.toLowerCase()) != -1) {
data.push(this.panelData[i]);
}
}
}
callback(data);
}
},
//preview -start
@@ -1272,7 +1281,7 @@
deep: true,
immediate: true,
handler(n) {
console.info((JSON.parse(JSON.stringify(n))))
// console.info((JSON.parse(JSON.stringify(n))))
let panel = this.panelData.find(p => {
return p.name == n.panelName;
});