zc

src/views/components/facilityUtilizationRate.vue

@@ -40,12 +40,30 @@
         //学院统计数据
         newData: {
           deptName: ['暂无数据'],
-          list1: [0],
-          list2: [0],
-          list3: [0],
-          list4: [0],
-          list5: [0],
-          list6: [0]
+          data1:{
+            name:'',
+            list:[0]
+          },
+          data2:{
+            name:'',
+            list:[0]
+          },
+          data3:{
+            name:'',
+            list:[0]
+          },
+          data4:{
+            name:'',
+            list:[0]
+          },
+          data5:{
+            name:'',
+            list:[0]
+          },
+          data6:{
+            name:'',
+            list:[0]
+          },
         },
         newList:[],
         //eCharts数据
@@ -256,12 +274,30 @@
           }
           let newData = {
             deptName: [],
-            list1: [],
-            list2: [],
-            list3: [],
-            list4: [],
-            list5: [],
-            list6: [],
+            data1:{
+              name:'',
+              list:[]
+            },
+            data2:{
+              name:'',
+              list:[]
+            },
+            data3:{
+              name:'',
+              list:[]
+            },
+            data4:{
+              name:'',
+              list:[]
+            },
+            data5:{
+              name:'',
+              list:[]
+            },
+            data6:{
+              name:'',
+              list:[]
+            },
           }
           let list = [];
           for(let i=0;i<res.data.unitStats.length;i++){
@@ -275,33 +311,39 @@
                   if(dataList[o] == res.data.unitStats[i].types[x].type){
                     num++
                     if(o==0){
-                      newData.list1.push(res.data.unitStats[i].types[x].count);
+                      newData.data1.name = dataList[o];
+                      newData.data1.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==1){
-                      newData.list2.push(res.data.unitStats[i].types[x].count);
+                      newData.data2.name = dataList[o];
+                      newData.data2.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==2){
-                      newData.list3.push(res.data.unitStats[i].types[x].count);
+                      newData.data3.name = dataList[o];
+                      newData.data3.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==3){
-                      newData.list4.push(res.data.unitStats[i].types[x].count);
+                      newData.data4.name = dataList[o];
+                      newData.data4.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==4){
-                      newData.list5.push(res.data.unitStats[i].types[x].count);
+                      newData.data5.name = dataList[o];
+                      newData.data5.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==5){
-                      newData.list6.push(res.data.unitStats[i].types[x].count);
+                      newData.data6.name = dataList[o];
+                      newData.data6.list.push(res.data.unitStats[i].types[x].count);
                     }
                   }
                 }
                 if(num == 0){
                   if(o==0){
-                    newData.list1.push(0);
+                    newData.data1.list.push(0);
                   }else if(o==1){
-                    newData.list2.push(0);
+                    newData.data2.list.push(0);
                   }else if(o==2){
-                    newData.list3.push(0);
+                    newData.data3.list.push(0);
                   }else if(o==3){
-                    newData.list4.push(0);
+                    newData.data4.list.push(0);
                   }else if(o==4){
-                    newData.list5.push(0);
+                    newData.data5.list.push(0);
                   }else if(o==5){
-                    newData.list6.push(0);
+                    newData.data6.list.push(0);
                   }
                 }
               }
@@ -313,33 +355,39 @@
                   if(dataList[o] == res.data.unitStats[i].types[x].type){
                     num++
                     if(o==0){
-                      newData.list1.push(res.data.unitStats[i].types[x].count);
+                      newData.data1.name = dataList[o];
+                      newData.data1.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==1){
-                      newData.list2.push(res.data.unitStats[i].types[x].count);
+                      newData.data2.name = dataList[o];
+                      newData.data2.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==2){
-                      newData.list3.push(res.data.unitStats[i].types[x].count);
+                      newData.data3.name = dataList[o];
+                      newData.data3.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==3){
-                      newData.list4.push(res.data.unitStats[i].types[x].count);
+                      newData.data4.name = dataList[o];
+                      newData.data4.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==4){
-                      newData.list5.push(res.data.unitStats[i].types[x].count);
+                      newData.data5.name = dataList[o];
+                      newData.data5.list.push(res.data.unitStats[i].types[x].count);
                     }else if(o==5){
-                      newData.list6.push(res.data.unitStats[i].types[x].count);
+                      newData.data6.name = dataList[o];
+                      newData.data6.list.push(res.data.unitStats[i].types[x].count);
                     }
                   }
                 }
                 if(num == 0){
                   if(o==0){
-                    newData.list1.push(0);
+                    newData.data1.list.push(0);
                   }else if(o==1){
-                    newData.list2.push(0);
+                    newData.data2.list.push(0);
                   }else if(o==2){
-                    newData.list3.push(0);
+                    newData.data3.list.push(0);
                   }else if(o==3){
-                    newData.list4.push(0);
+                    newData.data4.list.push(0);
                   }else if(o==4){
-                    newData.list5.push(0);
+                    newData.data5.list.push(0);
                   }else if(o==5){
-                    newData.list6.push(0);
+                    newData.data6.list.push(0);
                   }
                 }
               }
@@ -354,6 +402,7 @@
           }
           this.$set(this,'newList',list);
           this.$set(this,'newData',list[0]);
+          console.log('newList',list);
           this.eChartsListMethod()
         })
       },
@@ -544,6 +593,7 @@
             },
             // 自定义提示框内容
             formatter: (data) => {
+              console.log('data',data)
               let str = '<div style="color:#ffffff;font-size: 18px;margin-bottom: 5px;">' + data[0].axisValue + '</br></div>'
               data.reverse().forEach(item => {
                 str = str +
@@ -610,7 +660,7 @@
           series: [
             //温室
             {
-              name: '温室',
+              name: this.newData.data1.name,
               type: 'bar',
               stack: 'total',
               label: {
@@ -622,11 +672,11 @@
                 focus: 'series'
               },
               barWidth: 16,
-              data: this.newData.list1
+              data: this.newData.data1.list
             },
             //温室附属房
             {
-              name: '温室附属房',
+              name: this.newData.data2.name,
               type: 'bar',
               stack: 'total',
               label: {
@@ -638,11 +688,11 @@
                 focus: 'series'
               },
               barWidth: 16,
-              data: this.newData.list2
+              data: this.newData.data2.list
             },
             //顶置光型人工气候室
             {
-              name: '顶置光型人工气候室',
+              name: this.newData.data3.name,
               type: 'bar',
               stack: 'total',
               label: {
@@ -654,11 +704,11 @@
                 focus: 'series'
               },
               barWidth: 16,
-              data: this.newData.list3
+              data: this.newData.data3.list
             },
             //冷库
             {
-              name: '冷库',
+              name: this.newData.data4.name,
               type: 'bar',
               stack: 'total',
               label: {
@@ -670,11 +720,11 @@
                 focus: 'series'
               },
               barWidth: 16,
-              data: this.newData.list4
+              data: this.newData.data4.list
             },
             //种质资源库
             {
-              name: '种质资源库',
+              name: this.newData.data5.name,
               type: 'bar',
               stack: 'total',
               label: {
@@ -686,11 +736,11 @@
                 focus: 'series'
               },
               barWidth: 16,
-              data: this.newData.list5
+              data: this.newData.data5.list
             },
             //培养架型人工气候室
             {
-              name: '培养架型人工气候室',
+              name: this.newData.data6.name,
               type: 'bar',
               stack: 'total',
               label: {
@@ -702,7 +752,7 @@
                 focus: 'series'
               },
               barWidth: 16,
-              data: this.newData.list6
+              data: this.newData.data6.list
             }
           ]
         }