From ab6c4e46c2bba02964e68dadee9553e489c7fba0 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Mon, 30 Aug 2021 19:52:48 +0800
Subject: [PATCH] 1

---
 web/src/x.min.js     | 12 +++++++-----
 web/srczip/common.js | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/web/src/x.min.js b/web/src/x.min.js
index 8aa3034..dc1897e 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -581,7 +581,8 @@ var X = window.X || {
         for(let i in data){
             if(data[i]['values'].length > 0 ){
                 titledata= $.extend(true,[],data[0]['date_range']);
-                titledata.unshift('指标','阶段总和');
+                titledata.unshift('指标');
+                // ,'阶段总和'
                 if(data[i]['groups']['length'] != 0){
 
                     for(let j in data[i]['values']){
@@ -590,19 +591,20 @@ var X = window.X || {
                         arr.unshift(data[i]['event_name'],data[i]['sum'][j]);
                         condata.push(arr);
                     }
-                    // condata.push(data[i].values[0]);
-                    // condata[i].unshift(data[i]['event_name'],data[i]['sum']);
-                    // console.log(condata);
+
                 }else {
                     var arr;
                     arr = $.extend(true,[],data[i].values[0])
-                    arr.unshift(data[i]['event_name'],data[i]['sum'][0]);
+                    arr.unshift(data[i]['event_name']);
+                    // ,data[i]['sum'][0]
                     condata.push(arr)
                 }    
             }else {
                 layer.msg('查询数据为空');
             }
         }
+        // console.log(condata);
+        // return;
         var dataArr = {
             titledata:titledata,
             condata:condata
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 9dde5a1..d320d2a 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -580,7 +580,8 @@ var X = window.X || {
         for(let i in data){
             if(data[i]['values'].length > 0 ){
                 titledata= $.extend(true,[],data[0]['date_range']);
-                titledata.unshift('指标','阶段总和');
+                titledata.unshift('指标');
+                // ,'阶段总和'
                 if(data[i]['groups']['length'] != 0){
 
                     for(let j in data[i]['values']){
@@ -589,19 +590,20 @@ var X = window.X || {
                         arr.unshift(data[i]['event_name'],data[i]['sum'][j]);
                         condata.push(arr);
                     }
-                    // condata.push(data[i].values[0]);
-                    // condata[i].unshift(data[i]['event_name'],data[i]['sum']);
-                    // console.log(condata);
+
                 }else {
                     var arr;
                     arr = $.extend(true,[],data[i].values[0])
-                    arr.unshift(data[i]['event_name'],data[i]['sum'][0]);
+                    arr.unshift(data[i]['event_name']);
+                    // ,data[i]['sum'][0]
                     condata.push(arr)
                 }    
             }else {
                 layer.msg('查询数据为空');
             }
         }
+        // console.log(condata);
+        // return;
         var dataArr = {
             titledata:titledata,
             condata:condata