diff --git a/src/components/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue index 0c65f1a..144e09b 100644 --- a/src/components/newFiber/NewFiberSearch.vue +++ b/src/components/newFiber/NewFiberSearch.vue @@ -199,7 +199,7 @@ src="../../../static/img/NFShuaXin.png" alt class="ButtonImg" - @click="LoadGridTitleData" + @click="LoadSiteDataNow" />
@@ -597,7 +597,7 @@ this.showCurrentSiteInfo = true; this.currentSiteNo = data.stCode; // console.log(this.currentSiteNo); - this.LoadGridTitleData(); + this.LoadSiteDataNow(); break; case "search": this.showCurrentSiteInfo = false; @@ -614,7 +614,7 @@ }, // 选择站点 站点下拉框点击事件 selectV(SiteNo) { - this.LoadGridTitleData(); + this.LoadSiteDataNow(); // 当前tab为echarts时重新加载echarts if (this.HistoryBox == "Charts") { this.loadSiteYinZiData(); @@ -667,6 +667,31 @@ } } this.NFSNowDataTableData = tablearr; + + this.$http + .get(this.nozzle.siteGetHeads + `?siteNo=${this.currentSiteNo}`) + .then(response => { + // 加载表头 + var headobj = response.data.data; + console.log(headobj); + console.log(11111, this.NFSNowDataTableData); + // let arr = []; + this.NFSNowDataTableHead = headobj.filter((item, index, obj) => { + for (let k in this.NFSNowDataTableData[0]) { + if (item.field === k) { + return item; + } + } + }); + // console.log(8888, arr); + console.log(22222222, this.NFSNowDataTableHead); + + // 加载历史数据 + this.loadDataGridData(); + }) + .catch(response => { + message(response); + }); }) .catch(response => { message(response); @@ -674,34 +699,10 @@ }); }, // 根据站点编号查询站点的表头数据 - LoadGridTitleData() { - // 加载实时数据//在表头前面加载 - this.LoadSiteDataNow(); - this.$http - .get(this.nozzle.siteGetHeads + `?siteNo=${this.currentSiteNo}`) - .then(response => { - // 加载表头 - var headobj = response.data.data; - // console.log(headobj); - console.log(11111, this.NFSNowDataTableData); - // let arr = []; - this.NFSNowDataTableHead = headobj.filter((item, index, obj) => { - for (let k in this.NFSNowDataTableData[0]) { - if (item.field === k) { - return item; - } - } - }); - // console.log(8888, arr); - console.log(22222222, this.NFSNowDataTableHead); - - // 加载历史数据 - this.loadDataGridData(); - }) - .catch(response => { - message(response); - }); - }, + // LoadGridTitleData() { + // // 加载实时数据//在表头前面加载 + // this.LoadSiteDataNow(); + // }, //tabs的点击事件 HistoryHandleClick(tab, event) {