|
@@ -221,10 +221,17 @@ export default {
|
|
|
// 折线
|
|
// 折线
|
|
|
var wormsArr = [];
|
|
var wormsArr = [];
|
|
|
var html = '';
|
|
var html = '';
|
|
|
|
|
+ var kind=kind.filter(function (item) {
|
|
|
|
|
+ return item!='0';
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
if (!kind.length) {
|
|
if (!kind.length) {
|
|
|
this.worms = [];
|
|
this.worms = [];
|
|
|
this.viewSwitch2 = ''
|
|
this.viewSwitch2 = ''
|
|
|
|
|
+ this.chartsShow = false;
|
|
|
|
|
+ this.chartsShowA = false;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
for (var z = 0; z < kind.length; z++) {
|
|
for (var z = 0; z < kind.length; z++) {
|
|
|
wormsArr.push({
|
|
wormsArr.push({
|
|
|
value:z,
|
|
value:z,
|
|
@@ -247,6 +254,9 @@ export default {
|
|
|
if (i == data.dat1.length - 1) {
|
|
if (i == data.dat1.length - 1) {
|
|
|
if (data.dat.length) {
|
|
if (data.dat.length) {
|
|
|
for (var j = 0; j < data.dat.length; j++) {
|
|
for (var j = 0; j < data.dat.length; j++) {
|
|
|
|
|
+ if(data.dat[j].result == '0'){
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
var secondArr = [];
|
|
var secondArr = [];
|
|
|
var currTime = this.returnTime(data.dat[j].time)
|
|
var currTime = this.returnTime(data.dat[j].time)
|
|
|
var resultArr = data.dat[j].result.split('#');
|
|
var resultArr = data.dat[j].result.split('#');
|
|
@@ -276,6 +286,9 @@ export default {
|
|
|
// 饼状图
|
|
// 饼状图
|
|
|
for (var ss = 0; ss < worm.length; ss++) {
|
|
for (var ss = 0; ss < worm.length; ss++) {
|
|
|
var currWormTotal = 0;
|
|
var currWormTotal = 0;
|
|
|
|
|
+ console.log(ss)
|
|
|
|
|
+ console.log(worm)
|
|
|
|
|
+ console.log(worm[ss])
|
|
|
for (var sss = 0; sss < worm[ss].length; sss++) {
|
|
for (var sss = 0; sss < worm[ss].length; sss++) {
|
|
|
currWormTotal += worm[ss][sss][1];
|
|
currWormTotal += worm[ss][sss][1];
|
|
|
if (sss == worm[ss].length - 1) {
|
|
if (sss == worm[ss].length - 1) {
|
|
@@ -499,6 +512,9 @@ export default {
|
|
|
for(var i = 0;i<dat.length;i++){
|
|
for(var i = 0;i<dat.length;i++){
|
|
|
var result = dat[i].result.split('#');
|
|
var result = dat[i].result.split('#');
|
|
|
for(var j = 0;j<result.length;j++){
|
|
for(var j = 0;j<result.length;j++){
|
|
|
|
|
+ if(result[j] == '0'){
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
var resultItem = result[j].split(',');
|
|
var resultItem = result[j].split(',');
|
|
|
arr.push({
|
|
arr.push({
|
|
|
name:this.allPest[resultItem[1]],
|
|
name:this.allPest[resultItem[1]],
|