Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/SIS_Web

src/views/BorderBenchmark/InnationBenchmark_particulars.vue

@@ -816,7 +816,6 @@ export default {
           goReturn(){
             this.$router.push('/benchmark_International')
           },
-          toExcel(){}
           }
 
 }

src/views/BorderBenchmark/YardBenchmark_particulars.vue

@@ -51,6 +51,7 @@
       <el-card>
         <el-table
           v-loading="loading"
+          id="fdcLineData"
           :data="fdcLineData"
           :row-style="{ height: '10px' }"
           :cell-style="{ textAlign: 'center' }"
@@ -682,7 +683,9 @@ export default {
     goReturn() {
       this.$router.push("/benchmark_Venue");
     },
-    toExcel() {},
+    toExcel() {
+      excelHelper.exportExcel("fdcLineData","损失率对标列表",".xls",true);
+    },
   },
 };
 </script>

src/views/Performance/NewPerformanceList.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-header>
+    <!-- <el-header>
       <el-row>
         <el-col :span="24">
           <el-card style="height: 30px">
@@ -10,7 +10,7 @@
           </el-card>
         </el-col>
       </el-row>
-    </el-header>
+    </el-header> -->
 
     <el-main>
       <el-card>

src/views/Performance/PerformanceList.vue

@@ -1,6 +1,6 @@
   <template>
   <el-container>
-    <el-header>
+    <!-- <el-header>
       <el-row>
         <el-col :span="24">
           <el-card style="height: 30px">
@@ -10,7 +10,7 @@
           </el-card>
         </el-col>
       </el-row>
-    </el-header>
+    </el-header> -->
 
     <el-main>
       <el-card>

src/views/ProjectBenchmark/ProjectBenchmark.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div class="searchBar">
-      <el-form :inline="true" class="demo-form-inline" style="margin-left:1%">
+      <el-form :inline="true" class="demo-form-inline" style="margin-left:33px">
         <el-row :gutter="1">
           <el-form-item label="风场">
               <el-select v-model="fc" clearable placeholder="请选择" @change="query_xml()">
@@ -288,13 +288,13 @@
         <el-col :span="12"
           ><div
             id="chartPie"
-            style="width: 800px; height: 400px; margin: auto"
+            style="width: 800px; height: 400px; margin-left: 99px"
           ></div>
         </el-col>
         <el-col :span="12">
           <div
             id="chartPieRight"
-            style="width: 800px; height: 400px; margin: auto"
+            style="width: 800px; height: 400px; margin-left: 99px"
           ></div
         ></el-col>
       </el-row>

src/views/PropertyBenchnark/PropertBenchmark_particulars.vue

@@ -1,18 +1,8 @@
 <template>
   <div class="box">
     <div class="searchBar">
-      <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin-left:1%">
+      <el-form :inline="true" class="demo-form-inline" style="margin-left:1%">
         <el-row :gutter="1">
-          <!-- <el-form-item label="风场一">
-              <el-select v-model="value"  multiple placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.name"
-                :label="item.name"
-                :value="item.id">
-              </el-option>
-            </el-select>
-            </el-form-item> -->
           <el-form-item label="风场一">
             <el-select
               v-model="fc"