|
@@ -695,8 +695,9 @@
|
|
|
showkey = "";
|
|
|
this.headitemby ="";
|
|
|
});
|
|
|
- }
|
|
|
+ }
|
|
|
this.myChart.clear();
|
|
|
+ //
|
|
|
var timelist = []
|
|
|
for (var i in getData) {
|
|
|
if (this.type_head == 1) {
|
|
@@ -723,13 +724,16 @@
|
|
|
if (this.type_head == 1) {
|
|
|
|
|
|
ap.symbolSize = 3;
|
|
|
- }
|
|
|
+ }
|
|
|
+
|
|
|
for (var i in getData) {
|
|
|
//var time=this.queryDate.replace("-","/").replace("-","/")
|
|
|
//time+' '+i
|
|
|
- var obj = getData[i][sz2[j]];
|
|
|
+ var obj = getData[i][sz2[j]];
|
|
|
+
|
|
|
//'todayAmount', 'todayProfit', 'todayEQNum'
|
|
|
- if (getData[i].todayAmount == 0 && getData[i].todayProfit == 0 && getData[i].todayEQNum == 0) {
|
|
|
+ if (getData[i].todayAmount == 0 && getData[i].todayProfit == 0 ) {
|
|
|
+ //&& &&getData[i].todayEQNum == 0
|
|
|
continue;
|
|
|
}
|
|
|
var time = i
|
|
@@ -738,7 +742,10 @@
|
|
|
} else {
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+ if(j!=2){
|
|
|
+ obj=obj.toFixed(2)
|
|
|
+ }
|
|
|
+
|
|
|
ap.data.push([time, obj]);
|
|
|
}
|
|
|
list.push(ap)
|
|
@@ -793,7 +800,7 @@
|
|
|
},
|
|
|
|
|
|
xAxis: {
|
|
|
-
|
|
|
+ //type: 'value',
|
|
|
type: 'category',
|
|
|
splitNumber: 4,
|
|
|
boundaryGap: false,
|
|
@@ -839,7 +846,8 @@
|
|
|
},
|
|
|
},
|
|
|
yAxis: {
|
|
|
- type: 'value',
|
|
|
+
|
|
|
+ type: 'log',
|
|
|
// name: '单位('+this.typeN+')',
|
|
|
axisLabel: {
|
|
|
|
|
@@ -870,11 +878,13 @@
|
|
|
}
|
|
|
]
|
|
|
|
|
|
- if (this.type_head == 1) {
|
|
|
+ if (this.type_head == 1) {
|
|
|
+
|
|
|
} else {
|
|
|
//timelist.push(i)
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
// 使用刚指定的配置项和数据显示图表。
|
|
|
this.myChart.setOption(option);
|
|
|
|