浏览代码

站端数据查询nwp图表列表同一页面展示

xusl 6 月之前
父节点
当前提交
90185c4a48
共有 1 个文件被更改,包括 10 次插入18 次删除
  1. 10 18
      cpp-ui/src/views/stationDataQuery/nwpdata/index.vue

+ 10 - 18
cpp-ui/src/views/stationDataQuery/nwpdata/index.vue

@@ -29,8 +29,10 @@
     </div>
 
     <div style="padding-top: 10px">
-      <el-tabs type="card" v-model="activeName" @tab-click="tabClick">
-        <el-tab-pane label="列表" name="first">
+      <div style="display: flex">
+      <div style="float:left;width: 95%;height: 350px" id="fscharts" ></div>
+      </div>
+      <div>
           <vxe-table
             highlight-hover-row
             :keep-source="true"
@@ -76,11 +78,7 @@
             @page-change="handlePageChange"
           >
           </vxe-pager>
-        </el-tab-pane>
-        <el-tab-pane label="图表" name="second">
-          <div style="float:left;width: 95%;height: 550px" id="fscharts"></div>
-        </el-tab-pane>
-      </el-tabs>
+      </div>
     </div>
   </div>
 </template>
@@ -93,11 +91,10 @@ export default {
   data() {
     return {
       fsChart: null,
-      activeName: 'first',
       dateTime: new Date(new Date().toLocaleDateString()).getTime(),
       total: 0,
       sortOrder: 'asc',
-      pageSize: 10,
+      pageSize: 7,
       currentPage: 1,
       stationList: [],
       stationCode: [],
@@ -693,13 +690,6 @@ export default {
   },
   computed: {},
   methods: {
-    tabClick(tab) {
-      if (this.activeName == 'second') {
-        this.$nextTick(function () {
-          this.fsChart.resize();
-        })
-      }
-    },
     stationCodeFormat({cellValue, row, column}) {
       const item = this.stationList.find(item => item.value === cellValue)
       return item ? item.label : ''
@@ -791,6 +781,7 @@ export default {
           }
         },
         legend: {
+          left:'center',
           top: 20,
           icon: 'rect',
           itemWidth: 14,
@@ -809,7 +800,7 @@ export default {
           }
         },
         dataZoom: [{
-          show: true,
+          show: false,
           realtime: true,
           start: 0,
           end: 100,
@@ -956,6 +947,7 @@ export default {
           }
         },
         legend: {
+          left:'center',
           top: 20,
           width: '70%',
           icon: 'rect',
@@ -971,7 +963,7 @@ export default {
           selected: {}
         },
         dataZoom: [{
-          show: true,
+          show: false,
           realtime: true,
           start: 0,
           end: 100,