|
@@ -38,7 +38,7 @@ export function chartRender(data,renderId){
|
|
|
}
|
|
|
obj={...obj,...chartOpt}
|
|
|
|
|
|
- console.log(obj);
|
|
|
+ // console.log(obj);
|
|
|
|
|
|
//stock不支持线形图只支持时间图 某些用chart
|
|
|
let is_linear = chartOpt.series
|
|
@@ -79,12 +79,12 @@ function getSeasonPredictParams (timestamp){
|
|
|
function xTimeDiffer(minTime,maxTime){
|
|
|
//年限差
|
|
|
let year_differ=moment(maxTime).diff(moment(minTime),'years',true)
|
|
|
- console.log('年限差',year_differ)
|
|
|
+ // console.log('年限差',year_differ)
|
|
|
if (year_differ<=1) {
|
|
|
- console.log('true');
|
|
|
+ // console.log('true');
|
|
|
return true;
|
|
|
} else {
|
|
|
- console.log('false');
|
|
|
+ // console.log('false');
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
@@ -364,7 +364,7 @@ function setSeasonOpt(e){
|
|
|
// 农历
|
|
|
if(calendarType.value==='农历'){
|
|
|
let filterArr=data.DataList.List&&data.DataList.List.slice(1,data.DataList.List.length)||[]
|
|
|
- console.log('aaa',filterArr);
|
|
|
+ // console.log('aaa',filterArr);
|
|
|
filterArr.forEach((item,index)=>{
|
|
|
//预测指标配置
|
|
|
let predict_params = data.EdbInfoCategoryType === 1 ? getSeasonPredictParams(item.CuttingDataTimestamp) : {};
|
|
@@ -825,7 +825,7 @@ function setBarChart (){
|
|
|
}
|
|
|
|
|
|
const { leftMin,leftMax } = axisLimitData;
|
|
|
- console.log(leftMin,leftMax)
|
|
|
+ // console.log(leftMin,leftMax)
|
|
|
//y轴
|
|
|
let yAxis = {
|
|
|
...basicYAxis,
|
|
@@ -882,7 +882,7 @@ function initBarData(data){
|
|
|
const { XEdbIdValue,YDataList,EdbInfoList,ChartInfo } = data;
|
|
|
|
|
|
let xData = XEdbIdValue.map(_ => EdbInfoList.find(edb => edb.EdbInfoId===_).EdbAliasName)
|
|
|
- console.log(xData)
|
|
|
+ // console.log(xData)
|
|
|
|
|
|
barDateList.value = YDataList;
|
|
|
barXData.value = xData;
|
|
@@ -984,7 +984,7 @@ const setCommodityChart = (leftMin,leftMax) => {
|
|
|
},
|
|
|
shared: true
|
|
|
}
|
|
|
- console.log(seriesData);
|
|
|
+ // console.log(seriesData);
|
|
|
return {
|
|
|
title: {
|
|
|
text:''
|
|
@@ -1001,8 +1001,8 @@ function filterInvalidData(item){
|
|
|
|
|
|
let first_index = item.XEdbInfoIdList.findIndex(_ => _ === validateArr[0]);
|
|
|
let last_index = item.XEdbInfoIdList.findIndex(_ => _ === validateArr[validateArr.length-1]);
|
|
|
- console.log('first_index',first_index)
|
|
|
- console.log('last_index',last_index)
|
|
|
+ // console.log('first_index',first_index)
|
|
|
+ // console.log('last_index',last_index)
|
|
|
|
|
|
let arr = item.Value.map((item,index) => {
|
|
|
if(index < first_index || index > last_index) {
|