'对标详情'

src/assets/styles/button.less

@@ -38,13 +38,54 @@
     align-items: center;
     justify-content: center;
     margin-right: 10px;
-    background: fade(@green, 50);
-    color: fade(@white, 50);
+    background: fade(@green, 70);
+    color: fade(@white, 90);
     position: relative;
     font-size: 12px;
     &.green1 {
       background: fade(@green, 80);
-      color: fade(@white, 80);
+      color: fade(@white, 90);
+    }
+
+    &.green1:before {
+      content: "";
+      width: 1px;
+      height: 7px;
+      background-color: #ffffff;
+      position: absolute;
+      left: 0;
+    }
+
+    &.green1:after {
+      content: "";
+      width: 1px;
+      height: 7px;
+      background-color: #ffffff;
+      position: absolute;
+      right: 0;
+    }
+  }
+}
+.tabCut2 {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin: 10px 0px 0px 20px;
+
+  .tabCut-item {
+    width: 110px;
+    height: 25px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    // margin-right: 10px;
+    background: fade(@green, 70);
+    color: fade(@white, 90);
+    position: relative;
+    font-size: 12px;
+    &.green1 {
+      background: fade(@green, 80);
+      color: fade(@white, 90);
     }
 
     &.green1:before {

src/assets/styles/form.less

@@ -155,14 +155,14 @@
       justify-content: flex-start;
     }
     // 带标签查询项
-    .station {
+    .station1 {
       display: flex;
       flex-direction: row;
       align-items: center;
       font-size: 14px;
       font-family: Microsoft YaHei;
       font-weight: 400;
-      color: #b3b3b3;
+      color: #6d6c6c;
       margin-right: 10px;
     }
     // 日期
@@ -173,7 +173,7 @@
       font-size: 14px;
       font-family: Microsoft YaHei;
       font-weight: 400;
-      color: #b3b3b3;
+      color: #6d6c6c;
       margin-right: 10px;
     }
 

src/assets/styles/theme/dark/dark-jsc.css

@@ -0,0 +1,175 @@
+#appBody.dark {
+  transition: 0.25s;
+}
+#appBody.dark .gray {
+  transition: 0.25s;
+}
+#appBody.dark .green {
+  transition: 0.25s;
+}
+#appBody.dark .white {
+  transition: 0.25s;
+}
+#appBody.dark #app {
+  transition: 0.25s;
+}
+#appBody.dark .panel-title {
+  transition: 0.25s;
+}
+#appBody.dark .panel-tools {
+  transition: 0.25s;
+}
+#appBody.dark .weather .other-info .text {
+  transition: 0.25s;
+}
+#appBody.dark .weather .other-info div.svg-icon svg use {
+  transition: 0.25s;
+}
+#appBody.dark .security-days .text {
+  transition: 0.25s;
+}
+#appBody.dark .security-days .num {
+  transition: 0.25s;
+}
+#appBody.dark .tab-box .tab-item span svg use {
+  transition: 0.25s;
+}
+#appBody.dark .header-body .header-title svg g:nth-child(1) path,
+#appBody.dark .header-body .header-title svg g:nth-child(1) polygon {
+  transition: 0.25s;
+}
+#appBody.dark .weather-info span svg use {
+  transition: 0.25s;
+}
+#appBody.dark .map .tab-box .tab-item.active {
+  transition: 0.25s;
+}
+#appBody.dark .map .tab-box .tab-item.active::after {
+  transition: 0.25s;
+}
+#appBody.dark .header-menu .header-menu-list .header-menu-item.active::after {
+  transition: 0.25s;
+}
+#appBody.dark .header-menu .header-menu-list .header-menu-item.active {
+  background: linear-gradient(to top, rgba(5, 187, 76, 0.5), rgba(5, 187, 76, 0));
+  border: 0.093vh solid #05bb4c;
+  transition: color 0.25s ease-in-out;
+}
+#appBody.dark .coulometric-analysis .card-1 .card-icon svg use {
+  transition: 0.25s;
+}
+#appBody.dark .map .compass svg g:nth-child(3) g g path {
+  transition: 0.25s;
+}
+#appBody.dark .map .compass svg g:nth-child(4) g g path {
+  transition: 0.25s;
+}
+#appBody.dark .map .compass::after {
+  transition: 0.25s;
+}
+#appBody.dark .name-box-period-label {
+  transition: 0.25s;
+}
+#appBody.dark .name-box-period-value {
+  transition: 0.25s;
+}
+#appBody.dark .svg-map-nx .item-label rect {
+  transition: 0.25s;
+}
+#appBody.dark .svg-map-nx .item-label .mapKey {
+  transition: 0.25s;
+}
+#appBody.dark .svg-map-nx .popup-layer-svg .mapKey {
+  transition: 0.25s;
+}
+#appBody.dark .svg-map-nx #popup-box-svg rect {
+  transition: 0.25s;
+}
+#appBody.dark .com-panel-3,
+#appBody.dark .com-panel,
+#appBody.dark .header-body {
+  transition: 0.25s;
+}
+#appBody.dark .com-panel-3 .dot,
+#appBody.dark .com-panel.line:before {
+  transition: 0.25s;
+}
+#appBody.dark .panel-header {
+  transition: 0.25s;
+}
+#appBody.dark .fengji-icon svg use {
+  transition: 0.25s;
+}
+#appBody.dark .modal.el-dialog {
+  transition: 0.25s;
+}
+#appBody.dark .modal.el-dialog .el-dialog__title {
+  transition: 0.25s;
+}
+#appBody.dark .situation-body .value span:nth-child(2) {
+  transition: 0.25s;
+}
+#appBody.dark .coulometric-analysis .card-title {
+  transition: 0.25s;
+}
+#appBody.dark .com-panel,
+#appBody.dark .panel-header,
+#appBody.dark .home .table-card,
+#appBody.dark .com-panel-3.situation,
+#appBody.dark .el-menu--collapse,
+#appBody.dark .el-sub-menu,
+#appBody.dark .el-sub-menu__title,
+#appBody.dark .el-menu--popup,
+#appBody.dark .el-menu-item {
+  transition: 0.25s;
+}
+#appBody.dark .com-panel.line::before {
+  transition: 0.25s;
+}
+#appBody.dark .lightMenu {
+  width: 0;
+  height: calc(100% - 71px);
+  position: absolute;
+  left: 0;
+  top: 57px;
+  z-index: 100;
+  border-radius: 20px;
+  border: 0;
+  overflow: hidden;
+  transition: 0.25s;
+}
+#appBody.dark .lightMenu.hidden {
+  width: 0;
+  transition: 0.25s;
+}
+#appBody.dark .main-body {
+  margin-left: 0;
+  transition: 0.25s;
+}
+#appBody.dark .dot.top-left {
+  transition: 0.25s;
+}
+#appBody.dark .dot.bottom-left {
+  transition: 0.25s;
+}
+#appBody.dark .dot.top-rignt {
+  transition: 0.25s;
+}
+#appBody.dark .dot.bottom-right {
+  transition: 0.25s;
+}
+#appBody.dark .lightMenu .el-menu--collapse {
+  transition: 0.25s;
+}
+#appBody.dark .lightMenu .el-menu--collapse {
+  height: 100%;
+}
+#appBody.dark .lightMenu .el-sub-menu__title {
+  transition: 0.25s;
+}
+#appBody.dark .lightMenu .el-sub-menu__title i {
+  transition: 0.25s;
+}
+.left {
+  margin-top: 5px;
+}

src/assets/styles/theme/dark/dark-jsc.less

@@ -1,5 +1,4 @@
 // 驾驶舱模块黑色主题样式
-
 @import "./setting.less";
 
 #appBody.dark {
@@ -276,4 +275,7 @@
     }
 
     transition: @transition;
+}
+.left{
+    margin-top: 5px;
 }

src/assets/styles/theme/light/light-jjyx.css

@@ -19,6 +19,9 @@
   color: #36348e;
   transition: 0.25s;
 }
+#appBody.light .com-panel {
+  background: #ffffff;
+}
 #appBody.light .static-items {
   background: #fff;
   margin-right: 4px;

src/assets/styles/theme/light/light-jjyx.less

@@ -28,7 +28,9 @@
             transition: @transition;
         }
     }
-
+.com-panel{
+    background: @white ;
+}
     .static-items {
         background   : #fff;
         margin-right : 4px;

src/assets/styles/theme/light/light-jsc.less

@@ -328,11 +328,13 @@
     .model .energy-title {
       color: #000000;
       background-color: rgba(83, 98, 104, 0.4);
+      // background: #fff;
     }
 
     .model1 .energy-title {
       color: #000000;
       background-color: rgba(83, 98, 104, 0.4);
+      // background: #fff;
     }
 
     .energy-content .num {
@@ -388,6 +390,7 @@
     color: @black;
     transition: @transition;
   }
+  
 
   .com-panel,
   .panel-header,

src/components/chart/pie/dual-pie-chart.vue

@@ -85,16 +85,14 @@ export default {
         ],
         tooltip: {
           trigger: "item",
-          backgroundColor:
-            this.$store.state.themeName === "dark"
+          backgroundColor: this.$store.state.themeName === "dark"
               ? "rgba(0,0,0,0.4)"
               : "rgba(255,255,255,0.5)",
-          borderColor:
-            this.$store.state.themeName === "dark"
+          borderColor: this.$store.state.themeName === "dark"
               ? partten.getColor("gray")
               : "#000",
           textStyle: {
-            color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
+            color: "#fff",
             fontSize: util.vh(16),
           },
         },
@@ -105,9 +103,9 @@ export default {
           bottom: 24,
         },
         // legend: {
-        //   // show: this.showLegend,
+        //   show: this.showLegend,
         //   orient: "vertical", //纵向图例
-        //   right: "0",
+        //   right: "16",
         //   bottom: 32,
         //   itemWidth: 15,
         //   itemHeight: 15,
@@ -145,7 +143,6 @@ export default {
           {
             name: "",
             type: "pie",
-            //  center: [this.paddingWidth, "50%"],
             center: ["50%", "50%"],
             radius: [0, "35%"],
             itemStyle: {
@@ -174,18 +171,14 @@ export default {
                 // length: 40,
                 // length2: 120,
                 lineStyle: {
-                  color:
-                    this.$store.state.themeName === "dark" ? "#fff" : "#000",
+                  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
                   fontSize: util.vh(14),
                 },
               },
             },
             itemStyle: {
               normal: {
-                borderWidth:
-                  this.$store.state.themeName === "dark"
-                    ? util.vh(14)
-                    : util.vh(8),
+                borderWidth:util.vh(4),
                 borderColor: "#071812",
               },
             },
@@ -196,14 +189,10 @@ export default {
                 },
                 padding: [0, 0, 0, 0],
                 rich: {
-                  color:
-                    this.$store.state.themeName === "dark" ? "#fff" : "#000",
+                  color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
                   percent: {
                     fontSize: util.vh(14),
-                    color:
-                      this.$store.state.themeName === "dark"
-                        ? "#FFFFFF"
-                        : "#000000",
+                    color: this.$store.state.themeName === "dark" ? "#FFFFFF" : "#000000" ,
                   },
                 },
               },

src/components/coms/table/table.vue

@@ -3,7 +3,7 @@
     <thead>
       <tr class="back">
         <th
-        class="nb"
+      
           v-for="(col, index) of data.column"
           :key="index"
           :class="{ light: col.is_light }"
@@ -277,15 +277,15 @@ export default {
   height: 100%;
   // color: rgb(211, 214, 218);
 }
-.nb{
-    background-color: rgba(83, 89, 104, 0.3) ;
-    border-right: 1px solid rgba(0, 0, 0, 0.8);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.8) ;
-}
+// .nb{
+//     background-color: rgba(83, 89, 104, 0.3) ;
+//     border-right: 1px solid rgba(0, 0, 0, 0.8);
+//     border-bottom: 1px solid rgba(0, 0, 0, 0.8) ;
+// }
 .dnb{
   height: 45px;
 }
-.back{
-background: rgba(83,89,104,0.4);
-}
+// .back{
+// background: rgba(83,89,104,0.4);
+// }
 </style>

src/views/Decision/Decision1.vue

@@ -2,7 +2,7 @@
   <div class="decision-page-1">
     <div class="query-form">
       <!-- mg-b-8-->
-      <div class="station">
+      <div class="station1">
         场站：
         <el-select
           size="mini"
@@ -21,7 +21,7 @@
           </el-option>
         </el-select>
       </div>
-      <div class="station">
+      <div class="station1">
         项目：
         <el-select
           size="mini"
@@ -41,7 +41,7 @@
           </el-option>
         </el-select>
       </div>
-      <div class="station">
+      <div class="station1">
         线路：
         <el-select
           size="mini"
@@ -95,13 +95,13 @@
         </div>
       </div>
       <div class="query-actions">
-        <el-button round size="mini" class="btn green" @click="AjaxCommon()"
+        <el-button round  class="btn green" @click="AjaxCommon()"
           >搜索</el-button
         >
-        <el-button round size="mini" class="btn" @click="mxClick()"
+        <el-button round  class="btn" @click="mxClick()"
           >明细信息</el-button
         >
-        <el-button round size="mini" class="btn" @click="exportExcel()"
+        <el-button round  class="btn" @click="exportExcel()"
           >导出</el-button
         >
       </div>
@@ -157,7 +157,7 @@
         >
           <el-table-column align="center" prop="" label="" width="900">
           </el-table-column>
-          <el-table-column align="center" type="index"> </el-table-column>
+          <!-- <el-table-column align="center" type="index"> </el-table-column> -->
           <el-table-column
             align="center"
             prop="name"
@@ -299,13 +299,13 @@ export default {
     return {
       tableData: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-            width: "50px",
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          //   width: "50px",
+          // },
           {
             name: "名称",
             field: "name",

src/views/Decision/Decision2.vue

@@ -1,14 +1,13 @@
 <template>
   <div class="decision-page-2">
-    <div class="title">
-      <div class="station">
+    <div class="query-form">
+      <div class="station1">
         场站：
         <el-select
-          class="nb"
           size="mini"
           v-model="value1"
           @change="ChangZhanChange(value1)"
-          multiple
+          clearable
           collapse-tags
           placeholder="请选择"
           popper-class="select"
@@ -23,14 +22,13 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="station1">
         项目：
         <el-select
-          class="nb"
           size="mini"
           v-model="value2"
           @change="XiangMuChange(value2)"
-          multiple
+          clearable
           collapse-tags
           placeholder="请选择"
           popper-class="select"
@@ -45,10 +43,9 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="station1">
         线路：
         <el-select
-          class="nb"
           size="mini"
           v-model="value3"
           @change="XianLuChange(value3)"
@@ -67,11 +64,11 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="dates">
         开始日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+            size="mini"
             v-model="value4"
             @change="BeginChange(value4)"
             type="date"
@@ -83,11 +80,11 @@
         </div>
       </div>
 
-      <div class="station">
+      <div class="dates">
         结束日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+            size="mini"
             v-model="value5"
             @change="EndChange(value5)"
             type="date"
@@ -104,27 +101,24 @@
 
       <div :class="detailShow == 2 ? 'query-actions1 ' : 'query-actions'">
         <div class="but">
-          <button
-            class="btn green"
-            :class="detailShow == 2 ? 'active' : ''"
-            @click="AjaxCommon()"
+          <el-button round class="btn green" @click="AjaxCommon()"
+            >搜索</el-button
           >
-            搜索
-          </button>
-          <button
-            class="btn"
-            :class="detailShow == 2 ? 'active' : ''"
-            @click="dbfx"
+          <el-button round class="btn" @click="dbfx"> 对标分析 </el-button>
+          <el-button round class="btn" @click="exportExcel()">导出</el-button>
+          <el-button round class="btn" v-show="detailShow == 2" @click="back"
+            >返回</el-button
           >
-            对标分析
-          </button>
-          <!-- <button class="buttons" size="mini"  @click="exportExcel()">导出</button> -->
-          <!-- <button class="buttons" size="mini" v-show="detailShow == 2" @click="back">返回</button> -->
         </div>
       </div>
     </div>
     <div v-show="detailShow == 1">
-      <toolbar-panel title="五项损失率" :showLine="false"></toolbar-panel>
+      <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>五项损失率</span>
+        </div>
+      </div>
+      <!-- <toolbar-panel title="五项损失率" :showLine="false"></toolbar-panel> -->
       <div class="mg-b-16">
         <div class="project-table">
           <Table
@@ -135,45 +129,50 @@
           ></Table>
         </div>
       </div>
-    </div>
 
-    <div class="echarts">
-      <div class="pie-echarts">
-        <div class="chart-name">
-          <div class="point left bottom"></div>
-          <div class="point right bottom"></div>
-          <!-- 损失电量分析 -->
+      <div class="echarts">
+        <div class="pie-echarts">
+          <div class="chart-name">
+             <div class="point left bottom"></div>
+            <div class="point right bottom"></div>
+            损失电量分析
+          </div>
+          <!-- <panel title=" 损失电量分析"> -->
+            <dual-pie-chart
+              height="21.296vh"
+              :innerData="innerFdl"
+              :outerData="outerFdl"
+              paddingWidth="28%"
+            />
+          <!-- </panel> -->
         </div>
-        <panel title=" 损失电量分析">
-          <dual-pie-chart
-            height="21.296vh"
-            :innerData="innerFdl"
-            :outerData="outerFdl"
-            paddingWidth="28%"
-          />
-        </panel>
-      </div>
-      <div class="bar-echarts">
-        <div class="chart-name">
-          <div class="point left bottom"></div>
-          <div class="point right bottom"></div>
-          <!-- 五项损失 -->
+        <div class="bar-echarts">
+          <div class="chart-name">
+            <div class="point left bottom"></div>
+            <div class="point right bottom"></div>
+            五项损失
+          </div>
+          <!-- <panel title="五项损失"> -->
+            <multiple-bar-chart
+              :height="'calc(100vh - 26.5vh - 500px)'"
+              :list="analyis"
+              :customerTooltip="true"
+              @tooltip="tooltip"
+              :units="['(万KWh)']"
+            />
+          <!-- </panel> -->
         </div>
-        <panel title="五项损失">
-          <multiple-bar-chart
-            :height="'calc(100vh - 26.5vh - 500px)'"
-            :list="analyis"
-            :customerTooltip="true"
-            @tooltip="tooltip"
-            :units="['(万KWh)']"
-          />
-        </panel>
       </div>
     </div>
 
-    <!-- <el-row :type="'flex'" class="content" v-show="detailShow == 2">
+    <el-row :type="'flex'" class="content" v-show="detailShow == 2">
       <el-col :span="24" class="pd-l-8">
-        <panel :title="'风机对标列表明细'" :showLine="false">
+      <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>风机对标列表明细</span>
+        </div>
+      </div>
+        <!-- <panel :title="'风机对标列表明细'" :showLine="false"> -->
           <div class="project-table">
             <Table
               :data="tableDataDetail"
@@ -181,9 +180,9 @@
               @onSort="onSort"
             ></Table>
           </div>
-        </panel>
+        <!-- </panel> -->
       </el-col>
-    </el-row> -->
+    </el-row>
     <el-dialog
       title="对标排名分析"
       v-model="dialogVisible"
@@ -233,12 +232,12 @@ export default {
 
       tableData: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
           {
             name: "",
             field: "check",
@@ -476,7 +475,7 @@ export default {
 
                     dataTab.push({
                       //表格
-                      index: index + 1,
+                      // index: index + 1,
                       fdl: item.fdl,
                       name: item.name,
                       zhpm: item.zhpm,
@@ -513,20 +512,12 @@ export default {
       },
       tableDataDetail: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            // name: "",
-            name: "发电量",
-            field: "fdl",
-            is_num: false,
-            is_light: false,
-            display: "none",
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
           {
             name: "",
             field: "check",
@@ -555,6 +546,41 @@ export default {
             },
           },
           {
+            // name: "",
+            name: "发电量",
+            field: "fdl",
+            is_num: false,
+            is_light: false,
+            display: "none",
+          },
+          // {
+          //   name: "",
+          //   field: "check",
+          //   is_num: false,
+          //   is_light: false,
+          //   template: function () {
+          //     return "<input class='check curCheckBox checkItem' type='CheckBox'/>";
+          //   },
+          //   click: function (event, data) {
+          //     var dataId = that.tableIdArr[data.index - 1];
+          //     if (event.target.checked == false && that.checkLength <= 2) {
+          //       that.tableId.forEach((item, i) => {
+          //         if (item == dataId) {
+          //           that.tableId.splice(i, 1);
+          //           that.dbData.splice(i, 1);
+          //         }
+          //       });
+          //       that.checkLength--;
+          //     } else if (event.target.checked && that.checkLength < 2) {
+          //       that.tableId.push(dataId);
+          //       that.dbData.push(data);
+          //       that.checkLength++;
+          //     } else if (that.checkLength == 2) {
+          //       event.target.checked = false;
+          //     }
+          //   },
+          // },
+          {
             name: "风机名称",
             field: "name",
             is_num: false,
@@ -1403,14 +1429,6 @@ export default {
   align-items: center;
   margin-top: 10px;
   margin-bottom: 10px;
-  //   .nb{
-  //     width: 180px;
-  // height: 25px;
-  // background: rgba(67,81,107,0.2);
-  // border: 1px solid #3B4C6C;
-  // border-radius: 13px;
-
-  //   }
 
   .station {
     display: flex;
@@ -1466,8 +1484,9 @@ export default {
     padding-left: 20px;
     position: relative;
     height: 39px;
-    width: 98%;
-    margin-left: 1%;
+    width: 100%;
+    // margin-left: 1%;
+    background:rgba(0, 0, 0, 0.45) ;
     border-bottom: 1px solid rgba(153, 153, 153, 0.5);
     font-size: 16px;
     font-family: Microsoft YaHei;
@@ -1478,7 +1497,9 @@ export default {
   .pie-echarts {
     width: 30%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
+    // background: red;
     border-radius: 5px;
   }
 
@@ -1486,7 +1507,9 @@ export default {
     width: 69%;
     margin-left: 1%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
+
     border-radius: 5px;
   }
 }

src/views/Decision/Decision2Cjdb.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="decision-page-2">
-    <div class="title">
-      <div class="station">
+    <div class="query-form">
+      <div class="station1">
         场站：
         <el-select
-          class="nb"
-          size="mini"
+  
           v-model="value1"
           @change="ChangZhanChange(value1)"
-          multiple
+           multiple
+          size="mini"
           collapse-tags
           placeholder="请选择"
           popper-class="select"
@@ -23,14 +23,14 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="station1">
         项目：
         <el-select
-          class="nb"
-          size="mini"
+    
           v-model="value2"
           @change="XiangMuChange(value2)"
           multiple
+          size="mini"
           collapse-tags
           placeholder="请选择"
           popper-class="select"
@@ -45,14 +45,13 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="station1">
         线路：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value3"
           @change="XianLuChange(value3)"
           multiple
+          size="mini"
           collapse-tags
           placeholder="请选择"
           popper-class="select"
@@ -67,11 +66,12 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="dates">
         开始日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+        
+          size="mini"
             v-model="value4"
             @change="BeginChange(value4)"
             type="date"
@@ -83,11 +83,11 @@
         </div>
       </div>
 
-      <div class="station">
+      <div class="dates">
         结束日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+          size="mini"
             v-model="value5"
             @change="EndChange(value5)"
             type="date"
@@ -102,15 +102,20 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="AjaxCommon()">搜索</button>
-        <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn" @click="exportExcel()">导出</button>
-        <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
+        <el-button round class="btn green" @click="AjaxCommon()">搜索</el-button>
+        <el-button round class="btn" @click="dbfx">对标分析</el-button>
+        <el-button round class="btn" @click="exportExcel()">导出</el-button>
+        <el-button round class="btn" v-show="detailShow == 2" @click="back">返回</el-button>
       </div>
     </div>
 
     <div v-show="detailShow == 1">
-      <toolbar-panel title="场际对标" :showLine="false"></toolbar-panel>
+     <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>场际对标</span>
+        </div>
+      </div>
+      <!-- <toolbar-panel title="场际对标" :showLine="false"></toolbar-panel> -->
       <div class="mg-b-16">
         <div class="project-table">
           <Table
@@ -121,30 +126,30 @@
           ></Table>
         </div>
       </div>
-    </div>
+   
 
     <div class="echarts">
       <div class="pie-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 发电量占比 -->
+          发电量占比
         </div>
-        <panel title="发电量占比">
+        <!-- <panel title="发电量占比"> -->
           <dual-pie-chart
             height="21.296vh"
             :innerData="innerFdl"
             :outerData="outerFdl"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
       <div class="bar-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 损失电量分析 -->
+          损失电量分析
         </div>
-        <panel title="损失电量分析">
+        <!-- <panel title="损失电量分析"> -->
           <multiple-bar-chart
             :height="'calc(100vh - 23.3vh - 550px)'"
             :list="analyis"
@@ -152,9 +157,10 @@
             @tooltip="tooltip"
             :units="['(万KWh)']"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
     </div>
+     </div>
 
     <!-- <el-row class="mg-b-16">
         <el-col :span="12">
@@ -187,10 +193,15 @@
           />
         </panel>
       </div>
-    </div>
+    </div>-->
     <el-row :type="'flex'" class="content" v-show="detailShow == 2">
       <el-col :span="24" class="pd-l-8">
-        <panel :title="'风机对标列表明细'" :showLine="false">
+      <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>风机对标列表明细</span>
+        </div>
+      </div>
+        <!-- <panel :title="'风机对标列表明细'" :showLine="false"> -->
           <div class="project-table">
             <Table
               :data="tableDataDetail"
@@ -198,9 +209,9 @@
               @onSort="onSort"
             ></Table>
           </div>
-        </panel>
+        <!-- </panel> -->
       </el-col>
-    </el-row>-->
+    </el-row>
 
     <el-dialog
       title="对标排名分析"
@@ -250,12 +261,12 @@ export default {
 
       tableData: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
           {
             name: "",
             field: "check",
@@ -496,7 +507,7 @@ export default {
                     that.tableIdArr.push(item.id);
                     dataTab.push({
                       //表格
-                      index: index + 1,
+                      // index: index + 1,
                       fdl: item.fdl,
                       name: item.name,
                       zhpm: item.zhpm,
@@ -582,20 +593,13 @@ export default {
       },
       tableDataDetail: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "",
-            field: "fdl",
-            is_num: false,
-            is_light: false,
-            display: "none",
-          },
-          {
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
+           {
             name: "",
             field: "check",
             is_num: false,
@@ -623,6 +627,14 @@ export default {
             },
           },
           {
+            name: "发电量",
+            field: "fdl",
+            is_num: false,
+            is_light: false,
+            display: "none",
+          },
+         
+          {
             name: "风机名称",
             field: "name",
             is_num: false,
@@ -1375,15 +1387,7 @@ export default {
   align-items: center;
   margin-top: 10px;
   margin-bottom: 10px;
-  //   .nb{
-  //     width: 180px;
-  // height: 25px;
-  // background: rgba(67,81,107,0.2);
-  // border: 1px solid #3B4C6C;
-  // border-radius: 13px;
-
-  //   }
-
+ 
   .station {
     display: flex;
     flex-direction: row;
@@ -1438,8 +1442,9 @@ export default {
     padding-left: 20px;
     position: relative;
     height: 39px;
-    width: 98%;
-    margin-left: 1%;
+    width: 100%;
+    // margin-left: 1%;
+    background:rgba(0, 0, 0, 0.45) ;
     border-bottom: 1px solid rgba(153, 153, 153, 0.5);
     font-size: 16px;
     font-family: Microsoft YaHei;
@@ -1450,7 +1455,8 @@ export default {
   .pie-echarts {
     width: 30%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 
@@ -1458,7 +1464,8 @@ export default {
     width: 69%;
     margin-left: 1%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 }

src/views/Decision/Decision2Cndb.vue

@@ -1,14 +1,13 @@
 <template>
   <div class="decision-page-2">
-    <div class="title">
-      <div class="station">
+    <div class="query-form">
+      <div class="station1">
         场站：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value1"
           @change="ChangZhanChange(value1)"
-          multiple
+           size="mini"
+           clearable
           collapse-tags
           placeholder="请选择"
           popper-class="select"
@@ -23,14 +22,14 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="station1">
         项目：
         <el-select
-          class="nb"
-          size="mini"
+
           v-model="value2"
           @change="XiangMuChange(value2)"
-          multiple
+          size="mini"
+           clearable
           collapse-tags
           placeholder="请选择"
           popper-class="select"
@@ -45,11 +44,10 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="station1">
         线路：
         <el-select
-          class="nb"
-          size="mini"
+         size="mini"
           v-model="value3"
           @change="XianLuChange(value3)"
           multiple
@@ -66,11 +64,11 @@
           </el-option>
         </el-select>
       </div>
-      <div class="station">
+      <div class="dates">
         开始日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+             size="mini"
             v-model="value4"
             @change="BeginChange(value4)"
             type="date"
@@ -82,11 +80,11 @@
         </div>
       </div>
 
-      <div class="station">
+      <div class="dates">
         结束日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+             size="mini"
             v-model="value5"
             @change="EndChange(value5)"
             type="date"
@@ -101,15 +99,20 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="search()">搜索</button>
-        <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn" @click="exportExcel()">导出</button>
-        <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
+        <el-button round class="btn green" @click="search()">搜索</el-button>
+        <el-button round class="btn" @click="dbfx">对标分析</el-button>
+        <el-button round class="btn" @click="exportExcel()">导出</el-button>
+        <el-button round class="btn" v-show="detailShow == 2" @click="back">返回</el-button>
       </div>
     </div>
 
     <div v-show="detailShow == 1">
-      <toolbar-panel title="场内对标" :showLine="false"></toolbar-panel>
+ <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>场内对标</span>
+        </div>
+      </div>
+      <!-- <toolbar-panel title="场内对标" :showLine="false"></toolbar-panel> -->
       <div class="mg-b-16">
         <div class="project-table">
           <Table
@@ -120,31 +123,31 @@
           ></Table>
         </div>
       </div>
-    </div>
+   
 
     <div class="echarts">
       <div class="pie-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 损失电量分析 -->
+          损失电量分析
         </div>
-        <panel title=" 损失电量分析">
+        <!-- <panel title=" 损失电量分析"> -->
           <dual-pie-chart
             height="21.296vh"
             :innerData="innerFdl"
             :outerData="outerFdl"
             paddingWidth="28%"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
       <div class="bar-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 五项损失 -->
+          五项损失
         </div>
-        <panel title="五项损失">
+        <!-- <panel title="五项损失"> -->
           <multiple-bar-chart
             :height="'calc(100vh - 26.5vh - 500px)'"
             :list="analyis"
@@ -152,9 +155,10 @@
             @tooltip="tooltip"
             :units="['(万KWh)']"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
     </div>
+     </div>
 
     <!-- <el-row :type="'flex'" class="content">
         <el-col :span="24" class="pd-l-8">
@@ -169,10 +173,15 @@
           </panel>
         </el-col>
       </el-row>
-    </div>
+    </div>-->
     <el-row :type="'flex'" class="content" v-show="detailShow == 2">
-      <el-col :span="24" class="pd-l-8">
-        <panel :title="'风机对标列表明细'" :showLine="false">
+      <el-col :span="24" class="pd-l-8"> 
+      <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>风机对标列表明细</span>
+        </div>
+      </div>
+        <!-- <panel :title="'风机对标列表明细'" :showLine="false"> -->
           <div class="project-table">
             <Table
               :data="tableDataDetail"
@@ -180,9 +189,9 @@
               @onSort="onSort"
             ></Table>
           </div>
-        </panel>
+        <!-- </panel> -->
       </el-col>
-    </el-row> -->
+    </el-row>  
 
     <el-dialog
       title="对标排名分析"
@@ -229,18 +238,15 @@ export default {
       // tableIdArr: [], //放checkbox的id数组
       tableId: [],
       checkLength: 0, //对标分析只能选择2个
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
+     
       tableData: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
           {
             name: "",
             field: "check",
@@ -475,7 +481,7 @@ export default {
                   res.data.forEach((item, index) => {
                     dataTab.push({
                       //表格
-                      index: index + 1,
+                      // index: index + 1,
                       fdl: item.fdl,
                       name: item.name,
                       zhpm: item.zhpm,
@@ -559,19 +565,12 @@ export default {
       },
       tableDataDetail: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "",
-            field: "fdl",
-            is_num: false,
-            is_light: false,
-            display: "none",
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
           {
             name: "",
             field: "check",
@@ -600,6 +599,14 @@ export default {
             },
           },
           {
+            name: "发电量",
+            field: "fdl",
+            is_num: false,
+            is_light: false,
+            display: "none",
+          },
+          
+          {
             name: "风机名称",
             field: "name",
             is_num: false,
@@ -1305,15 +1312,7 @@ export default {
   align-items: center;
   margin-top: 10px;
   margin-bottom: 10px;
-  //   .nb{
-  //     width: 180px;
-  // height: 25px;
-  // background: rgba(67,81,107,0.2);
-  // border: 1px solid #3B4C6C;
-  // border-radius: 13px;
-
-  //   }
-
+ 
   .station {
     display: flex;
     flex-direction: row;
@@ -1368,8 +1367,9 @@ export default {
     padding-left: 20px;
     position: relative;
     height: 39px;
-    width: 98%;
-    margin-left: 1%;
+    width: 100%;
+    // margin-left: 1%;
+    background:rgba(0, 0, 0, 0.45) ;
     border-bottom: 1px solid rgba(153, 153, 153, 0.5);
     font-size: 16px;
     font-family: Microsoft YaHei;
@@ -1380,7 +1380,8 @@ export default {
   .pie-echarts {
     width: 30%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 
@@ -1388,7 +1389,8 @@ export default {
     width: 69%;
     margin-left: 1%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 }

src/views/Decision/Decision2Xldb.vue

@@ -1,13 +1,12 @@
 <template>
   <div class="decision-page-2">
-    <div class="title">
-      <div class="station">
+    <div class="query-form">
+      <div class="station1">
         场站：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value1"
           @change="ChangZhanChange(value1)"
+           size="mini"
           multiple
           collapse-tags
           placeholder="请选择"
@@ -23,13 +22,12 @@
         </el-select>
       </div>
     
-      <div class="station">
+      <div class="station1">
         项目：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value2"
           @change="XiangMuChange(value2)"
+           size="mini"
           multiple
           collapse-tags
           placeholder="请选择"
@@ -45,10 +43,9 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="station1">
         线路：
         <el-select
-          class="nb"
           size="mini"
           v-model="value3"
           @change="XianLuChange(value3)"
@@ -67,11 +64,11 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="dates">
         开始日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+           size="mini"
             v-model="value4"
             @change="BeginChange(value4)"
             type="date"
@@ -83,11 +80,11 @@
         </div>
       </div>
 
-      <div class="station">
+      <div class="dates">
         结束日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+           size="mini"
             v-model="value5"
             @change="EndChange(value5)"
             type="date"
@@ -102,43 +99,48 @@
         </div>
       </div>
       <div :class="detailShow == 2 ? 'query-actions1' : 'query-actions'">
-        <button class="btn green" @click="AjaxCommon()">搜索</button>
-        <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn" @click="exportExcel()">导出</button>
-        <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
+        <el-button round class="btn green" @click="AjaxCommon()">搜索</el-button>
+        <el-button round class="btn" @click="dbfx">对标分析</el-button>
+        <el-button round class="btn" @click="exportExcel()">导出</el-button>
+        <el-button round class="btn" v-show="detailShow == 2" @click="back">返回</el-button>
       </div>
     </div>
     <div v-show="detailShow == 1">
-      <toolbar-panel title="线路对标" :showLine="false"></toolbar-panel>
+ <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>线路对标</span>
+        </div>
+      </div>
+      <!-- <toolbar-panel title="线路对标" :showLine="false"></toolbar-panel> -->
       <div class="mg-b-16">
         <div class="project-table">
           <Table :data="tableData" :canScroll="false" ref="curRef"></Table>
         </div>
       </div>
-    </div>
+    
 
     <div class="echarts">
       <div class="pie-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 发电量占比 -->
+          发电量占比
         </div>
-        <panel title="发电量占比">
+        <!-- <panel title="发电量占比"> -->
           <dual-pie-chart
             height="21.296vh"
             :innerData="innerFdl"
             :outerData="outerFdl"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
       <div class="bar-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 损失电量分析 -->
+          损失电量分析
         </div>
-        <panel title="损失电量分析">
+        <!-- <panel title="损失电量分析"> -->
           <multiple-bar-chart
             :height="'calc(100vh - 21.3vh - 550px)'"
             :list="analyis"
@@ -146,9 +148,10 @@
             @tooltip="tooltip"
             :units="['(万KWh)']"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
     </div>
+    </div>
 
     <!-- <el-row class="mg-b-16">
         <el-col :span="12">
@@ -181,15 +184,21 @@
           />
         </panel>
       </div>
-    </div>
+    </div>-->
     <el-row :type="'flex'" class="content" v-show="detailShow == 2">
       <el-col :span="24" class="pd-l-8">
-        <panel :title="'风机对标列表明细'" :showLine="false">
+      <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>风机对标列表明细</span>
+        </div>
+      </div>
+        <!-- <panel :title="'风机对标列表明细'" :showLine="false"> -->
           <div class="project-table">
             <Table :data="tableDataDetail" ref="curRef"></Table>
           </div>
-        </panel>
-      </el-col>-->
+        <!-- </panel> -->
+      </el-col>
+      </el-row>
 
     <el-dialog
       title="对标排名分析"
@@ -241,13 +250,13 @@ export default {
 
       tableData: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-            width: "50px",
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          //   width: "50px",
+          // },
           {
             name: "",
             field: "check",
@@ -490,7 +499,7 @@ export default {
 
                     dataTab.push({
                       //表格
-                      index: index + 1,
+                      // index: index + 1,
                       fdl: item.fdl,
                       name: item.name,
                       zhpm: item.zhpm,
@@ -577,19 +586,13 @@ export default {
       },
       tableDataDetail: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "",
-            field: "fdl",
-            is_num: false,
-            is_light: false,
-            display: "none",
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
+          
           {
             name: "",
             field: "check",
@@ -618,6 +621,13 @@ export default {
             },
           },
           {
+            name: "发电量",
+            field: "fdl",
+            is_num: false,
+            is_light: false,
+            display: "none",
+          },
+          {
             name: "风机名称",
             field: "name",
             is_num: false,
@@ -1466,14 +1476,6 @@ export default {
   align-items: center;
   margin-top: 10px;
   margin-bottom: 10px;
-  //   .nb{
-  //     width: 180px;
-  // height: 25px;
-  // background: rgba(67,81,107,0.2);
-  // border: 1px solid #3B4C6C;
-  // border-radius: 13px;
-
-  //   }
 
   .station {
     display: flex;
@@ -1529,8 +1531,9 @@ export default {
     padding-left: 20px;
     position: relative;
     height: 39px;
-    width: 98%;
-    margin-left: 1%;
+    width: 100%;
+    // margin-left: 1%;
+    background:rgba(0, 0, 0, 0.45) ;
     border-bottom: 1px solid rgba(153, 153, 153, 0.5);
     font-size: 16px;
     font-family: Microsoft YaHei;
@@ -1541,7 +1544,8 @@ export default {
   .pie-echarts {
     width: 30%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 
@@ -1549,7 +1553,8 @@ export default {
     width: 69%;
     margin-left: 1%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 }

src/views/Decision/Decision2Xmdb.vue

@@ -1,13 +1,12 @@
 <template>
   <div class="decision-page-2">
-    <div class="title">
-      <div class="station">
+    <div class="query-form">
+      <div class="station1">
         场站：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value1"
           @change="ChangZhanChange(value1)"
+           size="mini"
           multiple
           collapse-tags
           placeholder="请选择"
@@ -23,13 +22,12 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="station1">
         项目：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value2"
           @change="XiangMuChange(value2)"
+           size="mini"
           multiple
           collapse-tags
           placeholder="请选择"
@@ -45,13 +43,12 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="station1">
         线路：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value3"
           @change="XianLuChange(value3)"
+           size="mini"
           multiple
           collapse-tags
           placeholder="请选择"
@@ -67,11 +64,11 @@
         </el-select>
       </div>
 
-      <div class="station">
+      <div class="dates">
         开始日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+           size="mini"
             v-model="value4"
             @change="BeginChange(value4)"
             type="date"
@@ -83,11 +80,11 @@
         </div>
       </div>
 
-      <div class="station">
+      <div class="dates">
         结束日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+           size="mini"
             v-model="value5"
             @change="EndChange(value5)"
             type="date"
@@ -102,43 +99,48 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="AjaxCommon()">搜索</button>
-        <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn" @click="exportExcel()">导出</button>
-        <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
+        <el-button round class="btn green" @click="AjaxCommon()">搜索</el-button>
+        <el-button round class="btn" @click="dbfx">对标分析</el-button>
+        <el-button round class="btn" @click="exportExcel()">导出</el-button>
+        <el-button round class="btn" v-show="detailShow == 2" @click="back">返回</el-button>
       </div>
     </div>
     <div v-show="detailShow == 1">
-      <toolbar-panel title="项目对标" :showLine="false"></toolbar-panel>
+<div class="tabCut2">
+        <div class="tabCut-item">
+          <span>项目对标</span>
+        </div>
+      </div>
+      <!-- <toolbar-panel title="项目对标" :showLine="false"></toolbar-panel> -->
       <div class="mg-b-16">
         <div class="project-table">
           <Table :data="tableData" :canScroll="false" ref="curRef"></Table>
         </div>
       </div>
-    </div>
+    
 
     <div class="echarts">
       <div class="pie-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 发电量占比 -->
+          发电量占比
         </div>
-        <panel title="发电量占比">
+        <!-- <panel title="发电量占比"> -->
           <dual-pie-chart
             height="21.296vh"
             :innerData="innerFdl"
             :outerData="outerFdl"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
       <div class="bar-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 损失电量分析 -->
+          损失电量分析
         </div>
-        <panel title="损失电量分析">
+        <!-- <panel title="损失电量分析"> -->
           <multiple-bar-chart
             :height="'calc(100vh - 21.3vh - 550px)'"
             :list="analyis"
@@ -146,9 +148,10 @@
             @tooltip="tooltip"
             :units="['(万KWh)']"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
     </div>
+    </div>
 
     <!-- <el-row class="mg-b-16">
         <el-col :span="12">
@@ -181,16 +184,21 @@
           />
         </panel>
       </div>
-    </div>
+    </div>-->
     <el-row :type="'flex'" class="content" v-show="detailShow == 2">
       <el-col :span="24" class="pd-l-8">
-        <panel :title="'风机对标列表明细'" :showLine="false">
+      <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>风机对标列表明细</span>
+        </div>
+      </div>
+        <!-- <panel :title="'风机对标列表明细'" :showLine="false"> -->
           <div class="project-table">
             <Table :data="tableDataDetail" ref="curRef"></Table>
           </div>
-        </panel>
+        <!-- </panel> -->
       </el-col>
-    </el-row>-->
+    </el-row>
 
     <el-dialog
       title="对标排名分析"
@@ -240,12 +248,12 @@ export default {
 
       tableData: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
           {
             name: "",
             field: "check",
@@ -488,7 +496,7 @@ export default {
 
                     dataTab.push({
                       //表格
-                      index: index + 1,
+                      // index: index + 1,
                       name: item.name,
                       zhpm: item.zhpm,
                       gzssdl: item.gzssdl,
@@ -573,12 +581,12 @@ export default {
       },
       tableDataDetail: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
           {
             name: "",
             field: "check",
@@ -1404,15 +1412,7 @@ export default {
   align-items: center;
   margin-top: 10px;
   margin-bottom: 10px;
-  //   .nb{
-  //     width: 180px;
-  // height: 25px;
-  // background: rgba(67,81,107,0.2);
-  // border: 1px solid #3B4C6C;
-  // border-radius: 13px;
-
-  //   }
-
+  
   .station {
     display: flex;
     flex-direction: row;
@@ -1467,8 +1467,9 @@ export default {
     padding-left: 20px;
     position: relative;
     height: 39px;
-    width: 98%;
-    margin-left: 1%;
+    width: 100%;
+    // margin-left: 1%;
+    background:rgba(0, 0, 0, 0.45) ;
     border-bottom: 1px solid rgba(153, 153, 153, 0.5);
     font-size: 16px;
     font-family: Microsoft YaHei;
@@ -1479,7 +1480,8 @@ export default {
   .pie-echarts {
     width: 30%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 
@@ -1487,7 +1489,8 @@ export default {
     width: 69%;
     margin-left: 1%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+    border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 }

src/views/Decision/Decision3.vue

@@ -1,13 +1,12 @@
 <template>
   <div class="decision-page-3">
-    <div class="title">
-      <div class="station">
+    <div class="query-form">
+      <div class="station1">
         场站：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value1"
           @change="ChangZhanChange(value1)"
+            size="mini"
           multiple
           collapse-tags
           placeholder="请选择"
@@ -22,13 +21,12 @@
           </el-option>
         </el-select>
       </div>
-      <div class="station">
+      <div class="station1">
         项目：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value2"
           @change="XiangMuChange(value2)"
+            size="mini"
           multiple
           collapse-tags
           placeholder="请选择"
@@ -43,13 +41,12 @@
           </el-option>
         </el-select>
       </div>
-      <div class="station">
+      <div class="station1">
         线路：
         <el-select
-          class="nb"
-          size="mini"
           v-model="value3"
           @change="XianLuChange(value3)"
+            size="mini"
           multiple
           collapse-tags
           placeholder="请选择"
@@ -64,11 +61,11 @@
           </el-option>
         </el-select>
       </div>
-      <div class="station">
+      <div class="dates">
         开始日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+            size="mini"
             v-model="value4"
             @change="BeginChange(value4)"
             type="date"
@@ -79,11 +76,11 @@
           </el-date-picker>
         </div>
       </div>
-      <div class="station">
+      <div class="dates">
         结束日期：
         <div class="search-input">
           <el-date-picker
-            class="nb"
+            size="mini"
             v-model="value5"
             @change="EndChange(value5)"
             type="date"
@@ -98,19 +95,29 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="AjaxCommon()">搜索</button>
-        <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn" @click="exportExcel()">导出</button>
-        <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
+        <el-button round class="btn green" @click="AjaxCommon()"
+          >搜索</el-button
+        >
+        <el-button round class="btn" @click="dbfx">对标分析</el-button>
+        <el-button round class="btn" @click="exportExcel()">导出</el-button>
+        <el-button round class="btn" v-show="detailShow == 2" @click="back"
+          >返回</el-button
+        >
       </div>
     </div>
-    <toolbar-panel title="性能对标" :showLine="false"></toolbar-panel>
+   
+    <!-- <toolbar-panel title="性能对标" :showLine="false"></toolbar-panel> -->
     <!-- 列表 -->
     <div v-show="detailShow == 1">
+     <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>性能对标</span>
+        </div>
+      </div>
       <div class="project-table">
         <Table :data="tableData" ref="curRef"></Table>
       </div>
-    </div>
+    
     <!-- 风资源列表 -->
     <!-- <div class="direction-info mg-b-16">
 				<table class="com-table">
@@ -140,23 +147,23 @@
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 发电量占比 -->
+          发电量占比
         </div>
-        <panel title="发电量占比">
+        <!-- <panel title="发电量占比"> -->
           <dual-pie-chart
             height="21.296vh"
             :innerData="innerFdl"
             :outerData="outerFdl"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
       <div class="bar-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
           <div class="point right bottom"></div>
-          <!-- 损失电量分析 -->
+          损失电量分析
         </div>
-        <panel title="损失电量分析">
+        <!-- <panel title="损失电量分析"> -->
           <multiple-bar-chart
             :height="'calc(100vh - 26.5vh - 500px)'"
             :list="analyis"
@@ -164,9 +171,10 @@
             @tooltip="tooltip"
             :units="['(万KWh)']"
           />
-        </panel>
+        <!-- </panel> -->
       </div>
     </div>
+    </div>
 
     <!-- <el-row class="mg-b-16">
         <el-col :span="12">
@@ -202,17 +210,21 @@
           :units="['(万KWh)']"
         />
       </panel>
-    </div>
+    </div>-->
     <el-row :type="'flex'" class="content" v-show="detailShow == 2">
       <el-col :span="24" class="pd-l-8">
-        <panel :title="'风机对标列表明细'" :showLine="false">
+      <div class="tabCut2">
+        <div class="tabCut-item">
+          <span>风机对标列表明细</span>
+        </div>
+      </div>
+        <!-- <panel :title="'风机对标列表明细'" :showLine="false"> -->
           <div class="project-table">
             <Table :data="tableDataDetail" ref="curRef" height="70vh"></Table>
           </div>
-        </panel>
+        <!-- </panel> -->
       </el-col>
-    </el-row>-->
-
+    </el-row>
     <el-dialog
       title="对标排名分析"
       v-model="dialogVisible"
@@ -265,19 +277,13 @@ export default {
       },
       tableDataDetail: {
         column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "",
-            field: "fdl",
-            is_num: false,
-            is_light: false,
-            display: "none",
-          },
+          // {
+          //   name: "",
+          //   field: "index",
+          //   is_num: false,
+          //   is_light: false,
+          // },
+
           {
             name: "",
             field: "check",
@@ -306,6 +312,13 @@ export default {
             },
           },
           {
+            name: "发电量",
+            field: "fdl",
+            is_num: false,
+            is_light: false,
+            display: "none",
+          },
+          {
             name: "风机名称",
             field: "name",
             is_num: false,
@@ -497,13 +510,13 @@ export default {
       detailShow: 1,
       ajaxData: [],
       column1: [
-        {
-          //弃风率
-          name: "",
-          field: "index",
-          is_num: false,
-          is_light: false,
-        },
+        // {
+        //   //弃风率
+        //   name: "",
+        //   field: "index",
+        //   is_num: false,
+        //   is_light: false,
+        // },
         {
           name: "",
           field: "check",
@@ -1279,7 +1292,7 @@ export default {
 
             dataTab.push({
               //表格
-              index: index + 1,
+              // index: index + 1,
               fdl: item.fdl,
               name: item.name,
               zhpm: item.zhpm,
@@ -1596,15 +1609,7 @@ export default {
   align-items: center;
   margin-top: 10px;
   margin-bottom: 10px;
-  //   .nb{
-  //     width: 180px;
-  // height: 25px;
-  // background: rgba(67,81,107,0.2);
-  // border: 1px solid #3B4C6C;
-  // border-radius: 13px;
-
-  //   }
-
+ 
   .station {
     display: flex;
     flex-direction: row;
@@ -1658,8 +1663,9 @@ export default {
     padding-left: 20px;
     position: relative;
     height: 39px;
-    width: 98%;
-    margin-left: 1%;
+    width: 100%;
+    // margin-left: 1%;
+    background:rgba(0, 0, 0, 0.45) ;
     border-bottom: 1px solid rgba(153, 153, 153, 0.5);
     font-size: 16px;
     font-family: Microsoft YaHei;
@@ -1670,7 +1676,8 @@ export default {
   .pie-echarts {
     width: 30%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+      border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 
@@ -1678,8 +1685,10 @@ export default {
     width: 69%;
     margin-left: 1%;
     height: 100%;
-    background: rgba(0, 0, 0, 0.45);
+      border: 1px solid rgba(153, 153, 153, 0.5);
+    // background: rgba(0, 0, 0, 0.45);
     border-radius: 5px;
   }
 }
 </style>
+

src/views/Decision/slgl/fwjsl.vue

@@ -35,7 +35,7 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="handleSubmit">计算</button>
+        <el-button class="btn green" @click="handleSubmit">计算</el-button>
       </div>
     </div>
     <div class="table-box">

src/views/Decision/slgl/xqjsl.vue

@@ -35,7 +35,7 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="handleSubmit">计算</button>
+        <el-button class="btn green" @click="handleSubmit">计算</el-button>
       </div>
     </div>
     <div class="table-box">

src/views/Decision/slgl/ztzhl.vue

@@ -47,7 +47,7 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="handleSubmit">计算</button>
+        <el-button class="btn green" @click="handleSubmit">计算</el-button>
       </div>
     </div>
     <div class="table-box">

src/views/Decision/table.vue

@@ -1,7 +1,7 @@
 <template>
   <table class="com-table">
     <thead>
-      <tr class="back">
+      <tr>
         <th
         class="nb"
           v-for="(col, index) of data.column"
@@ -251,15 +251,13 @@ export default {
 
 <style lang="less">
 .nb{
-    background-color: rgba(86, 90, 100, 0.3) ;
-    border-right: 1px solid rgba(0, 0, 0, 0.8);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.8) ;
+    // background-color:#dcdddf ;
+    // border-right: 1px solid rgba(0, 0, 0, 0.5);
+    // border-bottom: 1px solid rgba(0, 0, 0, 0.5) ;
 }
 .dnb{
   height: 45px;
 }
-.back{
-background: rgba(83,89,104,0.4);
-}
+
 </style>
 

src/views/Status/components/status-panel.vue

@@ -109,6 +109,7 @@ export default {
   position: relative;
   height: 22.315vh;
   cursor: pointer;
+  // background: white;
 
   .pause {
     position: absolute;
@@ -141,6 +142,7 @@ export default {
 
       .category-box {
         width: 100%;
+        // background-color: white;
         background-color: fade(@darkgray, 30%);
         display: flex;
         margin-bottom: 0.37vh;
@@ -197,6 +199,7 @@ export default {
           flex: 1;
           display: flex;
           flex-direction: row;
+          // background-color: white;
           background-color: fade(@darkgray, 20%);
           margin-top: 0.278vh;
 

src/views/powerAnalysis/index.vue

@@ -22,10 +22,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickFitting()">拟合</button>
+              <el-button class="btn green" @click="onClickFitting()">拟合</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportExcel()">导出</button>
+              <el-button class="btn green" @click="exportExcel()">导出</el-button>
             </div>
           </div>
         </div>

src/views/powerRank/index.vue

@@ -67,7 +67,7 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="search()">搜索</button>
+        <el-button class="btn green" @click="search()">搜索</el-button>
       </div>
     </div>
     <div class="df-table">

src/views/singleAnalysis/index.vue

@@ -35,8 +35,8 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="search()">查询</button>
-        <button class="btn green" @click="exportExcel">导出</button>
+        <el-button class="btn green" @click="search()">查询</el-button>
+        <el-button class="btn green" @click="exportExcel">导出</el-button>
       </div>
     </div>
     <div class="df-table">

src/views/specific/fdl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/fnlyl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/fwjsl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/gzssl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/mtbf.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/mttr.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/slssl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/whssl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/xdssl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/xnssl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/xqjsl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/zhcydl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/ztfx.vue

@@ -19,7 +19,7 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
 
               <!-- <el-select
                 v-model="value2"
@@ -37,7 +37,7 @@
               </el-select> -->
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/specific/ztzhl.vue

@@ -18,10 +18,10 @@
           </div>
           <div class="query-item">
             <div class="search-input select-btn">
-              <button class="btn green" @click="onClickSearch">搜索</button>
+              <el-button class="btn green" @click="onClickSearch">搜索</el-button>
             </div>
             <div class="search-input select-btn">
-              <button class="btn green" @click="exportPDF">导出</button>
+              <el-button class="btn green" @click="exportPDF">导出</el-button>
             </div>
           </div>
         </div>

src/views/totalPowerRank/index.vue

@@ -48,7 +48,7 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="search()">搜索</button>
+        <el-button class="btn green" @click="search()">搜索</el-button>
       </div>
     </div>
     <div class="df-table">