问题修改

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

@@ -201,10 +201,11 @@
           </panel>
           <panel
             :title="'日发电量信息'"
+            :subTitle="'单位:万kWh'"
             style="height: 297px; margin-bottom: 10px"
             :showLine="false"
           >
-            <div class="power-info">
+            <div class="power-info month-1">
               <div class="info-item">
                 <div class="text">发电量：</div>
                 <div class="value green">{{ dayPowerInfo.rfdl }}</div>
@@ -213,18 +214,18 @@
                 <div class="text">理论发电量：</div>
                 <div class="value green">{{ dayPowerInfo.ryfdl }}</div>
               </div>
-              <div class="info-item">
+              <!-- <div class="info-item">
                 <div class="text">平均功率：</div>
                 <div class="value green">{{ dayPowerInfo.rpjgl }}</div>
-              </div>
+              </div> -->
               <div class="info-item">
                 <div class="text">平均风速：</div>
                 <div class="value green">{{ dayPowerInfo.rpjfs }}</div>
               </div>
-              <div class="info-item">
+              <!-- <div class="info-item">
                 <div class="text">拟合优度：</div>
                 <div class="value green">{{ dayPowerInfo.rnhyd }}</div>
-              </div>
+              </div> -->
               <div class="info-item">
                 <div class="text">运行小时：</div>
                 <div class="value green">{{ dayPowerInfo.ryxxs }}</div>
@@ -263,36 +264,37 @@
                 <div class="text">停机次数：</div>
                 <div class="value green">{{ dayPowerInfo.rtjcs }}</div>
               </div>
-              <div class="info-item">
+              <!-- <div class="info-item">
                 <div class="text">不饱和次数：</div>
                 <div class="value green">{{ dayPowerInfo.rbbhcs }}</div>
-              </div>
+              </div> -->
               <div class="info-item">
                 <div class="text">设备可利用率：</div>
-                <div class="value green">{{ dayPowerInfo.rsbklyl }}</div>
+                <div class="value green">{{ dayPowerInfo.rsbklyl }}%</div>
               </div>
-              <div class="info-item">
+              <!-- <div class="info-item">
                 <div class="text">实际/保证偏差率：</div>
                 <div class="value green">{{ dayPowerInfo.rsjbz }}</div>
-              </div>
+              </div> -->
               <div class="info-item">
                 <div class="text">平均温度：</div>
-                <div class="value green">{{ dayPowerInfo.rpjwd }}</div>
+                <div class="value green">{{ dayPowerInfo.rpjwd }}℃</div>
               </div>
-              <div class="info-item">
+              <!-- <div class="info-item">
                 <div class="text">平均湿度：</div>
                 <div class="value green">{{ dayPowerInfo.rpjsd }}</div>
               </div>
               <div class="info-item">
                 <div class="text">平均压强：</div>
                 <div class="value green">{{ dayPowerInfo.rpjyq }}</div>
-              </div>
+              </div> -->
             </div>
           </panel>
           <div class="month-info">
             <div class="month-info-left">
               <panel
                 :title="'月发电量信息'"
+                :subTitle="'单位:万kWh'"
                 style="height: 100%"
                 :showLine="false"
               >
@@ -305,18 +307,18 @@
                     <div class="text">月理论发电量：</div>
                     <div class="value green">{{ dayPowerInfo.yyfdl }}</div>
                   </div>
-                  <div class="info-item">
+                  <!-- <div class="info-item">
                     <div class="text">月平均功率：</div>
                     <div class="value green">{{ dayPowerInfo.ypjgl }}</div>
-                  </div>
+                  </div> -->
                   <div class="info-item">
                     <div class="text">月平均风速：</div>
                     <div class="value green">{{ dayPowerInfo.ypjfs }}</div>
                   </div>
-                  <div class="info-item">
+                  <!-- <div class="info-item">
                     <div class="text">月拟合优度：</div>
                     <div class="value green">{{ dayPowerInfo.ynhyd }}</div>
-                  </div>
+                  </div> -->
                   <div class="info-item">
                     <div class="text">月运行小时：</div>
                     <div class="value green">{{ dayPowerInfo.yyxxs }}</div>
@@ -353,35 +355,67 @@
                     <div class="text">月停机次数：</div>
                     <div class="value green">{{ dayPowerInfo.ytjcs }}</div>
                   </div>
-                  <div class="info-item">
+                  <!-- <div class="info-item">
                     <div class="text">月实际/保证：</div>
                     <div class="value green">{{ dayPowerInfo.ysjbz }}</div>
-                  </div>
+                  </div> -->
                   <div class="info-item">
                     <div class="text">设备可利用率：</div>
-                    <div class="value green">{{ dayPowerInfo.ysbklyl }}</div>
+                    <div class="value green">{{ dayPowerInfo.ysbklyl }}%</div>
                   </div>
                 </div>
               </panel>
             </div>
             <div class="month-info-right">
+                <!-- style="height: calc(100% - 220px - 10px)" -->
               <panel
                 :title="'年发电量信息'"
-                style="height: calc(100% - 220px - 10px)"
+                :subTitle="'单位:万kWh'"
+                style="height: 100%"
                 :showLine="false"
               >
-                <div class="power-info month-2">
+                <div class="power-info power-infoss month-2">
                   <div class="info-item">
                     <div class="text">年发电量：</div>
                     <div class="value green">{{ dayPowerInfo.nfdl }}</div>
                   </div>
                   <div class="info-item">
-                    <div class="text">年拟合优度：</div>
-                    <div class="value green">{{ dayPowerInfo.nnhyd }}</div>
+                    <div class="text">年理论发电量：</div>
+                    <div class="value green">{{ dayPowerInfo.nyfdl }}</div>
+                  </div>
+                  <div class="info-item">
+                    <div class="text">年平均风速：</div>
+                    <div class="value green">{{ dayPowerInfo.npjfs }}</div>
+                  </div>
+                  <div class="info-item">
+                    <div class="text">年运行小时：</div>
+                    <div class="value green">{{ dayPowerInfo.nyxxs }}</div>
+                  </div>
+                  <div class="info-item">
+                    <div class="text">年停机小时：</div>
+                    <div class="value green">{{
+                        Number(dayPowerInfo.ngzxs) + Number(dayPowerInfo.njxxs)
+                      }}</div>
+                  </div>
+                  <div class="info-item">
+                    <div class="text">年故障小时：</div>
+                    <div class="value green">{{ dayPowerInfo.ngzxs }}</div>
+                  </div>
+                  <div class="info-item">
+                    <div class="text">年维护小时：</div>
+                    <div class="value green">{{ dayPowerInfo.njxxs }}</div>
+                  </div>
+                  <div class="info-item">
+                    <div class="text">年中断小时：</div>
+                    <div class="value green">{{ dayPowerInfo.nzdxs }}</div>
+                  </div>
+                  <div class="info-item">
+                    <div class="text">年有效风时数：</div>
+                    <div class="value green">{{ dayPowerInfo.nyxfs }}</div>
                   </div>
                 </div>
               </panel>
-              <panel
+              <!-- <panel
                 :title="'风资源'"
                 class="radar-panel"
                 :icon="'svg-wind-site'"
@@ -400,7 +434,7 @@
                     :showLegend="true"
                   />
                 </div>
-              </panel>
+              </panel> -->
             </div>
           </div>
         </el-col>
@@ -963,9 +997,9 @@ export default {
     MultipleBarLineChart,
     Table,
     MarkerLineChart,
-    DirectionRadarChart,
+    // DirectionRadarChart,
     DualPieChart,
-    RadarChart,
+    // RadarChart,
     randerNewChart,
   },
   props: {
@@ -1968,10 +2002,16 @@ export default {
     .power-info {
       display: flex;
       flex-wrap: wrap;
-      justify-content: space-between;
       height: 100%;
       color: #05bb4c;
+      &.month-1{
+        justify-content: flex-start;
+        .info-item {
+            margin-right: 8px;
+        }
+      }
       &.month-3 {
+      justify-content: space-between;
         .info-item {
           height: calc((100% - 8px * 4) / 5);
           line-height: calc((100% - 8px * 4) / 5);
@@ -1982,11 +2022,12 @@ export default {
         }
       }
       &.month-2 {
+        justify-content: space-between;
         .info-item {
           flex: 0 0 calc(100% / 2 - 4px);
           height: calc(100% - 8px);
-          &:nth-child(-n + 5) {
-            margin-top: 8px;
+          &:nth-child(-n + 9) {
+            margin-top: 5px;
           }
 
           &:nth-child(-n + 2) {
@@ -2022,6 +2063,14 @@ export default {
       }
     }
 
+    .power-infoss{
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        height: calc(100% - 230px);
+        color: #05bb4c;
+    }
+
     .month-info {
       display: flex;
       height: calc(100% - 270px - 297px - 20px);
@@ -2033,7 +2082,7 @@ export default {
 
       .month-info-right {
         height: 100%;
-        flex: 1 0 auto;
+        flex: 1 0 0;
       }
     }