Merge branch 'baiyanting' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into baiyanting1

src/components/other/healthReport/index.vue

@@ -87,7 +87,7 @@
                       )}并网运行，`
                     : ""
                 }}运行{{ reportInfo1.runningDays }}天，统计周期内累计发电量为{{
-                  reportInfo1.monthFdl
+                  (reportInfo1.monthFdl / 10000).toFixed(2)
                 }}万Kwh，风能利用率{{ reportInfo1.yfnlyl }}%，环比增加{{
                   reportInfo1.yfnlylhb
                 }}%；设备可利用率{{ reportInfo1.ylyxs }}%，环比下降{{
@@ -192,9 +192,7 @@
               reportInfo1.y35mqxpcl
             }}%，风速在5-11m/s区间曲线偏差率为{{
               reportInfo1.y511mqxpcl
-            }}%，风速在11-25m/s区间曲线偏差率为{{
-              reportInfo1.y11mycqxpcl
-            }}%。
+            }}%，风速在11-25m/s区间曲线偏差率为{{ reportInfo1.y11mycqxpcl }}%。
           </el-form-item>
           <div>
             <div class="logHead">功率曲线拟合</div>
@@ -814,7 +812,6 @@
             :cell-style="columnStyle"
             border
             stripe
-   
             style="width: 100%; margin: 10px 0"
           >
             <el-table-column prop="name" label="指标" />
@@ -856,7 +853,6 @@
             :cell-style="columnStyle"
             border
             stripe
-   
             style="width: 100%; margin: 10px 0"
           >
             <el-table-column prop="name" label="指标" />

src/views/Home/index.vue

@@ -29,7 +29,7 @@ export default {
 .home {
   width: 100%;
   height: 100%;
-  background: url(../../assets/newHome_h.png);
+  background: url('~@/assets/newHome_h.png');
   background-repeat: round;
   .date {
     display: flex;
@@ -399,7 +399,7 @@ export default {
         position: relative;
         width: 84px;
         height: 84px;
-        background: url("../../assets/imgs/instrumentPanel.png") no-repeat;
+        background: url("~@/assets/imgs/instrumentPanel.png") no-repeat;
 
         img {
           position: absolute;
@@ -468,7 +468,7 @@ export default {
           background: linear-gradient(90deg, #561f00, #853000, #f78712);
 
           .img {
-            background: url("../../assets/imgs/generatingCapacityDay.png")
+            background: url("~@/assets/imgs/generatingCapacityDay.png")
               no-repeat;
           }
         }

src/views/economicsOperation/windAnalyse/monthlyAnalysis/reportDialog.vue

@@ -426,7 +426,7 @@ export default {
           name: "日发电量",
           value: e.fdl,
           itemStyle: {
-            color: "#05bb4c",
+            color: "#1c99ff",
           },
         };
         let objfs = {
@@ -444,7 +444,7 @@ export default {
     getPowerAndWind(xAxis, barData, lineData) {
       let option = {
         backgroundColor: this.showWhite ? "#fff" : "",
-        color: ["#05bb4c", "#dcc652"],
+        color: ["#1c99ff", "#dcc652"],
         title: {
           text: "日发电量",
           textStyle: {

src/views/economicsOperation/windAnalyse/performanceAssess/index.vue

@@ -94,27 +94,27 @@
         </div>
       </div>
       <div class="selections">
-        <div
+        <!-- <div
           class="selections_btn"
           @click="tabSelect(0)"
           :class="{ active: tabIndex == 0 }"
         >
           日
-        </div>
-        <div
+        </div> -->
+        <!-- <div
           class="selections_btn"
           @click="tabSelect(1)"
           :class="{ active: tabIndex == 1 }"
         >
           月
-        </div>
-        <div
+        </div> -->
+        <!-- <div
           class="selections_btn"
           @click="tabSelect(2)"
           :class="{ active: tabIndex == 2 }"
         >
           年
-        </div>
+        </div> -->
       </div>
     </div>
     <div
@@ -125,7 +125,7 @@
       "
     >
       <div class="Evaluation_title clearfix">
-        <div class="leftContent floatLeft"><span>性能等级评估</span></div>
+        <div class="leftContent "><span>月度性能等级评估</span></div>
       </div>
 
       <div class="economicTable1">
@@ -249,7 +249,7 @@ export default {
   },
   data() {
     return {
-      tabIndex: 0,
+      tabIndex: 1,
       companyVal: "",
       companyOptions: [],
       stationVal: "",
@@ -465,18 +465,6 @@ export default {
         margin-left: 25px;
       }
     }
-    .floatLeft {
-      float: left;
-    }
-    .floatRight {
-      float: right;
-    }
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
   }
   .clearfix::after {
     content: "";

src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue

@@ -1226,7 +1226,9 @@ export default {
   },
   computed: {
     cftlist() {
-      return this.$store.state.cftList;
+      return this.$store.state.cftList.filter(
+        (item) => !item.name.includes("光电站")
+      );
     },
   },
   methods: {