diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 3217524..ec8f5b1 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -181,3 +181,19 @@
 .page-data-dialog .el-pagination__jump {
   display: none !important;
 }
+/* .page-dialog-site .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 70%;
+}
+.page-dialog-site .el-dialog__body {
+  flex: 1;
+}
+.page-dialog-site .el-dialog__body #NFSHistoryData {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+.page-dialog-site .el-dialog__body #NFSHistoryData2 {
+  flex: 1;
+} */

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 3217524..ec8f5b1 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -181,3 +181,19 @@
 .page-data-dialog .el-pagination__jump {
   display: none !important;
 }
+/* .page-dialog-site .el-dialog {
+  display: flex;
+  flex-direction: column;
+  height: 70%;
+}
+.page-dialog-site .el-dialog__body {
+  flex: 1;
+}
+.page-dialog-site .el-dialog__body #NFSHistoryData {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+.page-dialog-site .el-dialog__body #NFSHistoryData2 {
+  flex: 1;
+} */
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 1591b2a..90a1832 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -371,6 +371,7 @@
             </div>
           </div>
           <el-dialog
+            class="page-dialog-site"
             title="历史数据表格"
             :visible.sync="dialogVisible"
             width="60%"
@@ -680,8 +681,7 @@
       this.map.getView().setZoom(5);
     },
     //计算中心点
-    getCenterFromArray(clusterData)
-    {
+    getCenterFromArray(clusterData) {
       var north = -90;
       var south = 90;
       var east = -180;
@@ -689,20 +689,16 @@
       var cell;
       for (var i = 0; i < clusterData.length; i++) {
         cell = clusterData[i];
-        if(cell.lat&&cell.lon)
-       {
-        //计算边框，用于切换项目定位中心点
-        north = Math.max(parseFloat(cell.lat), north);
-        south = Math.min(parseFloat(cell.lat), south);
-        east = Math.max(parseFloat(cell.lon), east);
-        west = Math.min(parseFloat(cell.lon), west);
-       }
-      
-    
+        if (cell.lat && cell.lon) {
+          //计算边框，用于切换项目定位中心点
+          north = Math.max(parseFloat(cell.lat), north);
+          south = Math.min(parseFloat(cell.lat), south);
+          east = Math.max(parseFloat(cell.lon), east);
+          west = Math.min(parseFloat(cell.lon), west);
+        }
       }
 
-      return [(east+west)/2,(north+south)/2]
-
+      return [(east + west) / 2, (north + south) / 2];
     },
 
     //根据当前项目后台坐标计算出的中心飞行到指定城市
@@ -738,8 +734,11 @@
     historyData(stCode) {
       console.log(stCode);
       this.currentSiteNo = stCode;
-      this.LoadGridTitleData();
       this.dialogVisible = true;
+      setTimeout(() => {
+        // this.LoadGridTitleData();
+        this.loadDataGridData();
+      }, 0);
     },
     // 获取所有平台
     LoadAllProject() {
@@ -1599,12 +1598,8 @@
       this.west = 180;
 
       for (var i = 0; i < clusterData.length; i++) {
-
         cell = clusterData[i];
 
-
-
-
         if (cell.lon != null && cell.lat != null) {
           resultwkt = "POINT(" + cell.lon + " " + cell.lat + ")";
         }
@@ -1810,15 +1805,17 @@
             //点击的是聚簇图标，展示统计信息
             else {
               /*   console.log("点击了聚簇"+e.coordinate) */
-              console.log(feature.values_.features)
-              var centerthis=this.getCenterFromArray(feature.values_.features)
-              
+              console.log(feature.values_.features);
+              var centerthis = this.getCenterFromArray(
+                feature.values_.features
+              );
+
               this.map.getView().setCenter([centerthis[0], centerthis[1]]);
               this.map.getView().setZoom(13);
             }
           } else {
             //点击的是vector图层的feature
-       
+
             console.log(feature);
             //开始展示属性
             this.showOlPanel(feature);
@@ -1836,7 +1833,7 @@
       //鼠标移动事件
       this.map.on("moveend", evt => {
         var zoom = this.map.getView().getZoom();
-        console.log("当前级别是："+zoom)
+        console.log("当前级别是：" + zoom);
         if (zoom >= 8 && this.currentZoom < 8) {
           /*  if(this.map.getView().getZoom()>10) */
           this.map.removeLayer(this.layer);
@@ -1855,8 +1852,6 @@
     },
     //openlayer属性框
     showOlPanel(feature) {
-             
-
       this.$http
         .post(this.nozzle.getTempData, {
           data: {
@@ -1878,10 +1873,9 @@
             "<div style='border-top: 1px solid #3F586F !important;border: none;margin-top: 6px;margin-bottom: 6px;'></div>";
 
           //添加html拼接---缩放至
-          
-     
+
           textContent +=
-            `<div style='color: #29818a;position:absolute;font-size:15px;line-height:30px;margin-left: 22px;margin-top: -44px;width:69px;cursor: pointer;text-decoration:underline' onclick='historyData("` +
+            `<div style='color: #fff;position:absolute;font-size:15px;line-height:30px;margin-left: 22px;margin-top: -44px;width:69px;cursor: pointer;text-decoration:underline' onclick='historyData("` +
             feature.stCode +
             `")'>` +
             "历史数据" +
@@ -2286,7 +2280,9 @@
     // 根据站点编号查询站点的表头数据
     LoadGridTitleData() {
       // 加载历史数据/在表头前面加载
-      this.loadDataGridData();
+      setTimeout(() => {
+        this.loadDataGridData();
+      }, 0);
 
       this.$http
         .get(this.nozzle.siteGetHeads + `?siteNo=${this.currentSiteNo}`)
@@ -2379,6 +2375,27 @@
           this.HistoryTableData = response.data.rows;
           // console.log(1111111, this.HistoryTableData);
           this.DatagridDataLength = response.data.total;
+          this.$http
+            .get(this.nozzle.siteGetHeads + `?siteNo=${this.currentSiteNo}`)
+            .then(response => {
+              // 加载表头
+              var headobj = response.data.data;
+              // console.log(headobj);
+              console.log(11111, this.HistoryTableData);
+              // let arr = [];
+              this.NFSNowDataTableHead = headobj.filter((item, index, obj) => {
+                for (let k in this.HistoryTableData[0]) {
+                  if (item.field === k) {
+                    return item;
+                  }
+                }
+              });
+              // console.log(8888, arr);
+              console.log(22222222, this.NFSNowDataTableHead);
+            })
+            .catch(response => {
+              message(response);
+            });
         })
         .catch(response => {
           message(response);
@@ -2687,10 +2704,12 @@
   height: 100%;
   position: relative;
 }
-.popup {
+#popup {
   background: url(./../../../static/img/tc_bg_img.png);
   background-size: cover;
-  width: 500px;
+  width: 460px;
+  z-index: 99999;
+  position: relative;
 }
 .earthmap {
   width: 100%;
@@ -3014,7 +3033,6 @@
   width: 100%;
   height: 40px;
   line-height: 0;
-  /* background: rgba(47, 53, 77, 0.5); */
 }
 .previewOfSiteStatusCentent3LiName {
   width: 90px;
@@ -3144,7 +3162,6 @@
 #previewOfSiteStatusCentent6 {
   width: 100%;
   height: 100%;
-  /* background: rgba(7, 13, 19, 0.38); */
   overflow: auto;
 }
 #GisRightCententBox2UL {
@@ -3271,4 +3288,15 @@
 .boxmainR {
   right: 0;
 }
+
+#TimeBox {
+  position: relative;
+  top: 0;
+  left: 0;
+}
+.ButtonImg {
+  position: absolute;
+  top: 0;
+  left: 420px;
+}
 </style>