xujuanning преди 2 месеца
родител
ревизия
623919e4b4

+ 2 - 1
src/utils/nxfCodeStyle.js

@@ -1,4 +1,4 @@
-export function nxfCodeStyle() {
+export function nxfCodeStyle(name) {
     const faultCategories = [
         "实时有功",
         "实时有功可调上限",
@@ -60,5 +60,6 @@ export function nxfCodeStyle() {
     for (let i = 0; i < faultCategories.length; i++) {
         colorMapping[faultCategories[i]] = chartColors[i];
     }
+    // return colorMapping[name]
     return colorMapping
 }

+ 1 - 1
src/views/economicsOperation/benchmarkingManagement/compontent/bar-line-chart.vue

@@ -100,7 +100,7 @@ export default {
       let chart = echarts.init(this.$el);
 
       let option = {
-        color: this.color,
+        // color: this.color,
         grid: {
           left: 18,
           right: 16,

+ 9 - 2
src/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -201,6 +201,7 @@
 </template>
 
 <script>
+// import {nxfCodeStyle} from "@/utils/nxfCodeStyle.js";
 import BarLineChart from "../compontent/bar-line-chart.vue";
 import { companys } from "@/api/curveAnalyse";
 import dataJson from "./dataJson.json";
@@ -498,7 +499,7 @@ export default {
           data = [],
           llfdl = [],
           legend = [
-            "实际电量",
+            "实际电量",
             "检修损失电量",
             "故障损失电量",
             "限电损失电量",
@@ -526,7 +527,12 @@ export default {
           for (let i = 0; i < length; i++) {
             let arr2 = [];
             data.forEach((ele) => {
-              arr2.push(ele[i]);
+              // arr2.push(ele[i]);
+              let obj = {
+                value: ele[i],
+                // itemStyle: { color: nxfCodeStyle[legend[i]] },
+              };
+              arr2.push(obj)
             });
             arr1.push(arr2);
           }
@@ -539,6 +545,7 @@ export default {
         } else {
           (this.bardata = []), (this.lineData = []);
         }
+        console.log("bardata====>>>", this.bardata)
         if (this.lineData.length > 22) {
           this.height = this.lineData.length * 37 + 53 + "px";
         } else {

+ 1 - 1
src/views/economicsOperation/windAnalyse/singleWindAnasyle/historyDetail.vue

@@ -169,7 +169,7 @@ export default {
         // { title: "年报警次数", code: "nbjcs" },
         { title: "日停机次数", code: "rtjcs" },
         { title: "月停机次数", code: "ytjcs" },
-        { title: "年停机数", code: "ntjcs" },
+        { title: "年停机数", code: "ntjcs" },
         // { title: "日不饱和数", code: "rbbhcs" },
         // { title: "月不饱和数", code: "ybbhcs" },
         // { title: "年不饱和数", code: "nbbhcs" },

+ 8 - 5
src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue

@@ -240,7 +240,8 @@
               <div class="info-item">
                 <div class="text">停机小时:</div>
                 <div class="value green">
-                  {{ Number(dayPowerInfo.rgzxs) + Number(dayPowerInfo.rjxxs) }}h
+                  <!-- {{ Number(dayPowerInfo.rgzxs) + Number(dayPowerInfo.rjxxs) }}h -->
+                  {{ dayPowerInfo.rbbhcs }}h
                 </div>
               </div>
               <div class="info-item">
@@ -336,9 +337,10 @@
                   <div class="info-item">
                     <div class="text">月停机小时:</div>
                     <div class="value green">
-                      {{
+                      <!-- {{
                         Number(dayPowerInfo.ygzxs) + Number(dayPowerInfo.yjxxs)
-                      }}h
+                      }}h -->
+                      {{ dayPowerInfo.ybbhcs }}h
                     </div>
                   </div>
                   <div class="info-item">
@@ -408,12 +410,13 @@
                   <div class="info-item">
                     <div class="text">年停机小时:</div>
                     <div class="value green">
-                      {{
+                      <!-- {{
                         (
                           Number(dayPowerInfo.ngzxs) +
                           Number(dayPowerInfo.njxxs)
                         ).toFixed(2)
-                      }}h
+                      }}h -->
+                      {{ dayPowerInfo.nbbhcs }}h
                     </div>
                   </div>
                   <div class="info-item">