2-23

src/router/index.js

@@ -50,7 +50,13 @@ const routes = [{
 	{
 		path: '/benchmark_Venue',
 		name: 'benchmark_Venue',
-		component: () => import('../views/Performance/NewPerformanceList.vue')
+		component: () => import('../views/BorderBenchmark/YardBenchmark.vue')
+	}
+	,
+	{
+		path: '/benchmark_International',
+		name: 'benchmark_International',
+		component: () => import('../views/BorderBenchmark/InternationalBenchmark.vue')
 	}
 ]
 

src/views/BorderBenchmark/YardBenchmark.vue

@@ -0,0 +1,55 @@
+<template>
+<el-container>
+  <el-header>Header</el-header>
+  <el-main>Main</el-main>
+  <el-footer>Footer</el-footer>
+</el-container>
+</template>
+<script>
+export default {
+    data(){
+
+    },
+    methods(){
+
+    },
+    mounted(){
+
+    },
+}
+</script>
+<style scoped>
+ .el-header, .el-footer {
+    background-color: #B3C0D1;
+    color: #333;
+    text-align: center;
+    line-height: 60px;
+  }
+  
+  .el-aside {
+    background-color: #D3DCE6;
+    color: #333;
+    text-align: center;
+    line-height: 200px;
+  }
+  
+  .el-main {
+    background-color: #E9EEF3;
+    color: #333;
+    text-align: center;
+    line-height: 160px;
+  }
+  
+  body > .el-container {
+    margin-bottom: 40px;
+  }
+  
+  .el-container:nth-child(5) .el-aside,
+  .el-container:nth-child(6) .el-aside {
+    line-height: 260px;
+  }
+  
+  .el-container:nth-child(7) .el-aside {
+    line-height: 320px;
+  }
+</style>

src/views/Performance/NewPerformanceList.vue

@@ -114,7 +114,7 @@
                 style="width: 58%"
                 id="moban"
               >
-                <el-table id="fc_table" :data="fc_date" style="width: 100%;font-size:1px" :max-height="tableHeight">
+                <el-table id="fc_table" :data="fc_date" style="width: 100%;font-size:1px" :max-height="tableHeight_fc">
                   <el-table-column label="项目列表">
                     <el-table-column fixed type="index" width="41">
                     </el-table-column>
@@ -281,7 +281,7 @@
                   id="pj_table"
                   :data="pj_date"
                   style="width: 100%;font-size:1px;margin-bottom:10px"
-                  :max-height="tableHeight"
+                  :max-height="tableHeight_pj"
                 >
                   <el-table-column label="项目列表">
                        <el-table-column fixed type="index" width="41">
@@ -451,7 +451,7 @@
                   id="xl_table"
                   :data="xl_date"
                   style="width: 100%;font-size:1px;margin-bottom:10px"
-                  :max-height="tableHeight"
+                  :max-height="tableHeight_xl"
                   
                 >
                   <el-table-column label="项目列表">
@@ -651,6 +651,7 @@ export default {
         qxjclssdl: [],
         llfdl: [],
       },
+      tableHeight_xl:1200,
       fc_date: [],
       pj_date: [],
       xl_date: [],
@@ -922,6 +923,9 @@ export default {
             } else if (this.tableid === "xl") {
               that.xl_date = queryAll_table;
             }
+            this.tableHeight_fc = this.autoHeight_fc-20;
+            this.tableHeight_pj = this.autoHeight_pj-20;
+            this.tableHeight_xl = this.autoHeight_xl-20;
           });
       }
     },
@@ -1668,7 +1672,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-                this.tableHeight = window.innerHeight + (this.len /10 ) * (this.len /10 ) * 100; 
+                 
             //后面的50：根据需求空出的高度，自行调整
         });
     this.query_wpid();

src/views/Performance/PerformanceList.vue

@@ -132,7 +132,7 @@
                   id="fc_table"
                   :data="fc_date"
                   style="width: 100%; font-size: 1px"
-                  :max-height="tableHeight"
+                  :max-height="tableHeight_fc"
                 >
                   <el-table-column label="项目列表">
                     <el-table-column fixed type="index" width="40">
@@ -257,7 +257,7 @@
                   id="pj_table"
                   :data="pj_date"
                   style="width: 100%; font-size: 1px"
-                  :max-height="tableHeight"
+                  :max-height="tableHeight_pj"
                 >
                   <el-table-column label="项目列表">
                     <el-table-column fixed type="index" width="40">
@@ -377,8 +377,8 @@
                 <el-table
                   id="xl_table"
                   :data="xl_date"
-                  style="width: 100%; font-size: 1px"
-                  :max-height="tableHeight"
+                  style="width: 100%; font-size: 1px;margin-bottom:10px"
+                  :max-height="tableHeight_xl"
                 >
                   <el-table-column label="项目列表">
                     <el-table-column fixed type="index" width="40">
@@ -502,6 +502,7 @@ export default {
       fc_date: [],
       pj_date: [],
       xl_date: [],
+      tableHeight_xl:1200,
       beginDate: "2021-01-01",
       endDate: "2021-01-02",
       activeName: "first",
@@ -677,6 +678,7 @@ export default {
             let that = this;
             let queryAll = res.data.data;
             this.len = Object.keys(queryAll.names).length;
+
             if(this.len <= 10){that.autoHeight_fc = 575; that.styleObject_fc.height = '700px' }
             else if(this.len > 10 && this.len <=20){that.autoHeight_fc = 775; that.styleObject_fc.height = '800px';that.autoHeight_pj = 775; that.styleObject_pj.height = '800px';that.autoHeight_xl = 775; that.styleObject_xl.height = '800px' }
             else if(this.len > 20 && this.len <=30){that.autoHeight_fc = 975; that.styleObject_fc.height = '1000px';that.autoHeight_pj = 975; that.styleObject_pj.height = '1000px';that.autoHeight_xl = 975; that.styleObject_xl.height = '1000px' }
@@ -686,6 +688,7 @@ export default {
             else if(this.len > 60 && this.len <=70){that.autoHeight_fc = 1775; that.styleObject_fc.height = '1800px';that.autoHeight_pj = 1775; that.styleObject_pj.height = '1800px';that.autoHeight_xl = 1775; that.styleObject_xl.height = '1800px' }
             else if(this.len > 70 && this.len <=80){that.autoHeight_fc = 1975; that.styleObject_fc.height = '2000px';that.autoHeight_pj = 1975; that.styleObject_pj.height = '2000px';that.autoHeight_xl = 1975; that.styleObject_xl.height = '2000px' }
             else{that.autoHeight_fc = 2175; that.styleObject_fc.height = '2200px';that.autoHeight_pj = 2175; that.styleObject_pj.height = '2200px';that.autoHeight_xl = 2175; that.styleObject_xl.height = '2200px' }
+
             if (this.tableid === "fc") {
               that.drawhistogram_fc(queryAll);
             } else if (this.tableid === "pj") {
@@ -693,6 +696,9 @@ export default {
             } else if (this.tableid === "xl") {
               that.drawhistogram_xl(queryAll);
             }
+             this.tableHeight_fc = this.autoHeight_fc - 20; 
+             this.tableHeight_pj = this.autoHeight_pj - 20; 
+             this.tableHeight_xl = this.autoHeight_xl - 20; 
           });
         this.$http
           .get(
@@ -1243,7 +1249,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-                this.tableHeight = window.innerHeight + (this.len /10 ) * (this.len /10 ) * 100; 
+               
             //后面的50：根据需求空出的高度，自行调整
         });
     this.query_wpid();