diff --git a/src/views/index.vue b/src/views/index.vue
index 5e1b8ac..81b62e8 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -402,211 +402,22 @@ export default {
           guzhang:'2020/9/14 12:20'
         },
       ],
-      popTableData1:[
-        {
-          xianqu:'亭湖区',
-          yongdianliang:'13',
-          tanpaifang:'1',
-          qiyeshuliang:'12'
-        },
-        {
-          xianqu:'东台市',
-          yongdianliang:'13',
-          tanpaifang:'1',
-          qiyeshuliang:'12'
-        },
-        {
-          xianqu:'响水县',
-          yongdianliang:'13',
-          tanpaifang:'1',
-          qiyeshuliang:'12'
-        },
-      ],
+      popTableData1:[],
       popTableData2:[],
       popTableData3:[],
       popTableData4:[],
-      popTableData5:[
-      ],
-      popTableData6:[
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'光伏',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'在运'
-        },
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'光伏',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'在建'
-        },
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'光伏',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'退运'
-        },
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'光伏',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'在运'
-        },
-      ],
-      popTableData7:[
-      ],
-      popTableData8:[
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'火电',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'在运'
-        },
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'火电',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'在建'
-        },
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'火电',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'退运'
-        },
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'火电',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'在运'
-        },
-      ],
-      popTableData9:[
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'水电',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'在运'
-        },
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'水电',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'在建'
-        },
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'水电',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'退运'
-        },
-        {
-          fadianchang:'毛竹沙风电',
-          zhuangji:'300',
-          fengdian:'水电',
-          zuigao:'500kv',
-          date:'2021-11-26 00:00:00',
-          status:'在运'
-        },
-      ],
-      popTableData10:[
-        {
-          fadianchang:'大唐大丰光伏电厂上网电量',
-          shangwang:'1.1764',
-        },
-        {
-          fadianchang:'阜宁光伏发电厂上网电量',
-          shangwang:'1.1764',
-        },
-        {
-          fadianchang:'大唐大丰光伏电厂上网电量',
-          shangwang:'1.1764',
-        },
-        {
-          fadianchang:'阜宁光伏发电厂上网电量',
-          shangwang:'1.1764',
-        },
-      ],
-      popTableData11:[
-        {
-          fadianchang:'滨海盐海光伏',
-          shangwang:'2.065',
-        },
-        {
-          fadianchang:'滨海盐海光伏',
-          shangwang:'2.065',
-        },
-        {
-          fadianchang:'滨海盐海光伏',
-          shangwang:'2.065',
-        },
-        {
-          fadianchang:'滨海盐海光伏',
-          shangwang:'2.065',
-        },
-      ],
-      popTableData12:[
-        {
-          fadianchang:'国华弶港风电上网电量',
-          shangwang:'34.2434',
-        },
-        {
-          fadianchang:'国华弶港风电上网电量',
-          shangwang:'34.2434',
-        },
-        {
-          fadianchang:'国华弶港风电上网电量',
-          shangwang:'34.2434',
-        },
-        {
-          fadianchang:'国华弶港风电上网电量',
-          shangwang:'34.2434',
-        },
-      ],
-      popTableData13:[
-        {
-          fadianchang:'陈家港上网电量',
-          shangwang:'1.1764',
-        },
-        {
-          fadianchang:'陈家港上网电量',
-          shangwang:'1.1764',
-        },
-        {
-          fadianchang:'陈家港上网电量',
-          shangwang:'1.1764',
-        },
-        {
-          fadianchang:'陈家港上网电量',
-          shangwang:'1.1764',
-        },
-      ]
+      popTableData5:[],
+      popTableData6:[],
+      popTableData7:[],
+      popTableData8:[],
+      popTableData9:[],
+      popTableData10:[],
+      popTableData11:[],
+      popTableData12:[],
+      popTableData13:[]
     }
   },
   mounted(){
-    this.echartsSix();
     this.echartsSeven();
     this.echartsMap();
     this.echartsEight();
@@ -640,6 +451,7 @@ export default {
     ).then((res)=>{
       let contaminatedData = [];
       contaminatedData = res.data.data
+      this.popTableData1 = contaminatedData
       this.echartsOne(contaminatedData);
     })
     //查询当日上网电量
@@ -652,7 +464,6 @@ export default {
       let powerData = []
       powerData = res.data.data
       this.echartsFive(powerData);
-      
     })
     //查询盐城装机容量
     getData(
@@ -692,6 +503,14 @@ export default {
       this.popTableData3 = res.data.data
       this.echartsFour(this.popTableData3);
     })
+    //查询非统调光伏电站装机容量
+    getData({
+           action:'one',
+           key:'非统调光伏电站装机容量'
+         }).then((res)=>{
+           this.popTableData4 = res.data.data
+           this.echartsSix(this.popTableData4);
+         })
   },
   methods:{
     cityChange(val){
@@ -735,26 +554,33 @@ export default {
       this.popTableShow = 0
       this.powerTypeAction = val
       if (val == 0) {
-        this.modelOthers = true
-         this.componentShow = 'pop';
          this.popName = '光伏发电';
-         this.popTableShow = 6
       }else if (val == 1) {
-        this.modelOthers = true
-         this.componentShow = 'pop';
          this.popName = '风力发电';
-         this.popTableShow = 6
       }else if (val == 2) {
-        this.modelOthers = true
-         this.componentShow = 'pop';
          this.popName = '余电上网光伏';
-         this.popTableShow = 6
       }else if (val == 3) {
+         this.popName = '电厂';
+      }
+      getData(
+        {
+          action:'one',
+          key:'当日上网电量' + this.popName
+        }
+      ).then((res)=>{
         this.modelOthers = true
          this.componentShow = 'pop';
-         this.popName = '电厂';
-         this.popTableShow = 6
-      }
+         this.popTableShow = 6;
+         if (this.popName == '光伏发电') {
+           this.popTableData10 = res.data.data
+         }else if (this.popName == '风力发电') {
+           this.popTableData11 = res.data.data
+         }else if (this.popName == '余电上网光伏') {
+           this.popTableData12 = res.data.data
+         }else if (this.popName == '电厂') {
+           this.popTableData13 = res.data.data
+         }
+      })
     },
     mapCityChange(val){
       this.mapCityAction = val
@@ -1649,7 +1475,11 @@ export default {
         };
         myChart.setOption(option)
     },
-    echartsSix(){
+    echartsSix(capacity){
+      let powerCapacity = [];
+      powerCapacity = Object.keys(capacity).map((item,index)=>{
+        return {name:capacity[index].地区,value:capacity[index].光伏实际总装机容量}
+      })
      var myChart = this.$echarts.init(document.getElementById("echartsSix"));
      var option ={
         tooltip: {
@@ -1685,12 +1515,7 @@ export default {
                       borderWidth: 1,
                       padding:[5,10,10,5],
                       // borderRadius: [0,0,14,0],
-                      formatter: function (param) {
-                        // return param.name + ': ' + (param.value - number) + ' ' + (((param.value - number) / sum) * 100)
-                        // 	.toFixed(2) + '%'
-                        return param.name + ':' + param.value + '%'
-                      },
-                     
+                      formatter: [ '{b}','{d}%'].join(':'),
                   },
                  
             },
@@ -1700,14 +1525,7 @@ export default {
             //   shadowOffsetX: 5,
             //   shadowOffsetY: 5
             // },
-            data:[{name:'东台市',value:71.03},
-                  {name:'阜宁县',value:12.66},
-                  {name:'盐都区',value:6.04},
-                  {name:'响水县',value:8.04},
-                  {name:'建湖县',value:8.04},
-                  {name:'大丰区',value:18.04},
-                  {name:'射阳县',value:9.04},
-              ]
+            data:powerCapacity
           },
         {
              name: "ring5",
@@ -4216,16 +4034,10 @@ export default {
          this.popName = '非统调电厂';
          this.popTableShow = val
        }else if (val == 4) {
-         getData({
-           action:'one',
-           key:'非统调光伏电站装机容量'
-         }).then((res)=>{
-            this.modelOthers = true
-            this.componentShow = 'pop';
-            this.popName = '非统调光伏电站装机容量分布';
-            this.popTableShow = val
-           this.popTableData4 = res.data.data
-         })
+          this.modelOthers = true
+          this.componentShow = 'pop';
+          this.popName = '非统调光伏电站装机容量分布';
+          this.popTableShow = val
        }
      }
   },
diff --git a/src/views/pop.vue b/src/views/pop.vue
index b9415e4..94996bc 100644
--- a/src/views/pop.vue
+++ b/src/views/pop.vue
@@ -18,22 +18,22 @@
                         </template>
                       </el-table-column>
                       <el-table-column
-                        prop="xianqu"
+                        prop="区县"
                         label="区县"
                         >
                       </el-table-column>
                       <el-table-column
-                        prop="yongdianliang"
+                        prop="用电量"
                         label="用电量(kwh)"
                         >
                       </el-table-column>
                       <el-table-column
-                        prop="tanpaifang"
+                        prop="碳排放量"
                         label="碳排放量(kg)"
                         >
                       </el-table-column>
                       <el-table-column
-                        prop="qiyeshuliang"
+                        prop="企业数量"
                         label="企业数量"
                        >
                       </el-table-column>
@@ -195,12 +195,12 @@
                         </template>
                       </el-table-column>
                       <el-table-column
-                        prop="fadianchang"
+                        prop="发电厂名称"
                         label="发电厂名称"
                         >
                       </el-table-column>
                       <el-table-column
-                        prop="shangwang"
+                        prop="上网电量"
                         label="上网电量(单位/万KWH)"
                         >
                       </el-table-column>