Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

柱线图无数据时显示，进度条的单位去掉引号，树结构增加忙时分析传递的值处理



See merge request !81

@@ -215,8 +215,9 @@ export default {
             }
             }
 
 
           }else{
           }else{
-            xAxisList=[]
-            series =  [{
+            xAxisList=[];
+            series=[];
+           /* series =  [{
               name: "使用量",
               name: "使用量",
               type:'bar',
               type:'bar',
               data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
               data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
@@ -228,13 +229,14 @@ export default {
               name: "使用率",
               name: "使用率",
               type:'line',
               type:'line',
               data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
               data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-            }];
+            }];*/
           }
           }
         }
         }
       }else{
       }else{
         // xAxisList=['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00']
         // xAxisList=['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00']
-        xAxisList=[]
-        series =  [{
+        xAxisList=[];
+        series=[];
+        /*series =  [{
           name: "使用量",
           name: "使用量",
           type:'bar',
           type:'bar',
           data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
           data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
@@ -246,7 +248,7 @@ export default {
           name: "使用率",
           name: "使用率",
           type:'line',
           type:'line',
           data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
           data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-        }];
+        }];*/
       }
       }
       ananysicData["xAxis"] = xAxisList;
       ananysicData["xAxis"] = xAxisList;
       ananysicData["series"] = series;
       ananysicData["series"] = series;

@@ -578,7 +578,7 @@ export default {
         }else if(this.buttonVal=='quarter'){
         }else if(this.buttonVal=='quarter'){
           this.options.xAxis.data=['1季度','2季度','3季度','4季度'];
           this.options.xAxis.data=['1季度','2季度','3季度','4季度'];
 
 
-        }else if(this.buttonVal=='month'){
+        }else if(this.buttonVal=='month' || this.buttonVal=='export'){
           this.options.xAxis.data=['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
           this.options.xAxis.data=['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
         }else{
         }else{
           this.options.xAxis.data=['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00']
           this.options.xAxis.data=['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00']

@@ -387,7 +387,7 @@ export default {
         }else if(this.buttonVal=='quarter'){
         }else if(this.buttonVal=='quarter'){
           xAxisList=['1季度','2季度','3季度','4季度'];
           xAxisList=['1季度','2季度','3季度','4季度'];
 
 
-        }else if(this.buttonVal=='month'){
+        }else if(this.buttonVal=='month' || this.buttonVal=='export'){
           xAxisList=['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
           xAxisList=['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
         }else{
         }else{
           xAxisList=['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00']
           xAxisList=['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00']

@@ -237,11 +237,15 @@ export default {
     buttonVal:{
     buttonVal:{
       handler(val){
       handler(val){
          // TODO 在存储页面中获取不到，暂时注释掉
          // TODO 在存储页面中获取不到，暂时注释掉
+        let time=val;
+        if(val=='export'){
+          time='month';
+        }
         //if(this.optionsSetup.isVuex){
         //if(this.optionsSetup.isVuex){
           let optionsData=this.optionsData;
           let optionsData=this.optionsData;
            if(this.optionsData.dataType=="dynamicData"){
            if(this.optionsData.dataType=="dynamicData"){
              //改变参数值-月季度年，重新加载动态数据
              //改变参数值-月季度年，重新加载动态数据
-             this.optionsData.dynamicData.contextData.dataScope=val;
+             this.optionsData.dynamicData.contextData.dataScope=time;
              // this.editorOptions();
              // this.editorOptions();
            }
            }
         //}
         //}

@@ -204,7 +204,9 @@ export default {
           let flagArr=[];
           let flagArr=[];
           let flagStr='';
           let flagStr='';
           this.progressData.map(item=>{
           this.progressData.map(item=>{
-            item.unit= item.unit.replace(/[""‘’“”]/ig, '')
+            if(item.unit){
+              item.unit= item.unit.replace(/[""‘’“”]/ig, '')
+            }
             flagArr.push(item.flag)
             flagArr.push(item.flag)
             item.rate=Number(item.rate)
             item.rate=Number(item.rate)
           })
           })

@@ -28,7 +28,7 @@ export default {
   data() {
   data() {
     return {
     return {
       selectVal:'',
       selectVal:'',
-      selectOption:[{value:1,label:'选项1',disabled:false},{value:2,label:'选项3',disabled:true}],
+      selectOption:[],
       options: {},
       options: {},
       optionsSetUp: {},
       optionsSetUp: {},
       optionsPosition:{},
       optionsPosition:{},
@@ -158,7 +158,6 @@ export default {
         : this.handlerDynamicData(resData.dynamicData, resData.refreshTime,resData.isRefresh);
         : this.handlerDynamicData(resData.dynamicData, resData.refreshTime,resData.isRefresh);
     },
     },
     handlerStaticData(data) {
     handlerStaticData(data) {
-      console.log("abcd",data)
         this.selectOption=data;
         this.selectOption=data;
         // this.pushAll();
         // this.pushAll();
     },
     },
@@ -176,7 +175,6 @@ export default {
     getEchartData(val) {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       const data = this.queryEchartsData(val);
       data.then(res => {
       data.then(res => {
-        console.log("abc",res)
         this.selectOption=res;
         this.selectOption=res;
         this.pushAll();
         this.pushAll();
         this.hackResetFun();
         this.hackResetFun();

@@ -100,8 +100,12 @@ export default {
       let param = {
       let param = {
         type:e.data.type,
         type:e.data.type,
         data:{
         data:{
-          resId: e.data.data?e.data.data.resId:'',
-          resType: e.data.data?e.data.data.resType:''
+          resId: (e.data.data && e.data.data.resId)?e.data.data.resId:'',
+          resType: (e.data.data && e.data.data.resType)?e.data.data.resType:'',
+          kpiId:  (e.data.data && e.data.data.kpiId)?e.data.data.kpiId:'',
+          flag:  (e.data.data && e.data.data.flag)?e.data.data.flag:'',
+          reportCode: (e.data.data && e.data.data.reportCode)?e.data.data.reportCode:'',
+          title: (e.data.data && e.data.data.title)?e.data.data.title:''
         }
         }
 
 
       }
       }
@@ -143,10 +147,11 @@ export default {
           srcName+=codeArr[0];
           srcName+=codeArr[0];
         }else if(data.propType=='resType'){
         }else if(data.propType=='resType'){
           srcName+=codeArr[1];
           srcName+=codeArr[1];
-        }else{
+        }else if(data.propType=='res'){
           srcName+=codeArr[2];
           srcName+=codeArr[2];
+        }else{
+          srcName+=codeArr[0];
         }
         }
-
       }else{
       }else{
         srcName+=codeArr[0];
         srcName+=codeArr[0];
       }
       }