字段错误BUUG修复

src/assets/icon/svg/风机.svg

@@ -23,6 +23,6 @@
 		c-0.615,0.271-1.052,0.836-1.158,1.5c-0.886,5.22-3.695,9.918-7.875,13.166c-0.533,0.42-0.823,1.074-0.775,1.75
 		c0.05,0.668,0.45,1.275,1.041,1.634c26.25,14.267,57.268,29.524,66.15,29.75c0.967-0.024,2.283-0.158,3.233-1.476
 		c0.267-0.469,0.407-1,0.408-1.541C182.537,133.341,174.862,127.999,163.604,119.332L163.604,119.332z" />
-		<animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="3s" type="rotate" from="0 99 90" to="360 99 90" repeatCount="indefinite" />
+		<animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="3s" type="rotate" from="0 99 90" to="-360 99 90" repeatCount="indefinite" />
 	</g>
 </svg>

src/views/WindSite/pages/Home/Home.vue

@@ -1,234 +1,236 @@
 <template>
-  <div class="btn-group-tabs">
-    <BtnGroup2 :btnGroups="btnGroupsss" :rowIndex="rowIndex" :index="selectIndex" @select="select"></BtnGroup2>
-  </div>
-  <div class="wind-site-home">
-    <div class="mg-b-16">
-      <btn-group-double :btnGroups="btnGroups" :rowIndex="0" :index="1" @select="select" />
+  <div>
+    <div class="btn-group-tabs">
+      <BtnGroup2 :btnGroups="btnGroupsss" :rowIndex="rowIndex" :index="selectIndex" @select="select"></BtnGroup2>
     </div>
-    <row>
-      <wind-site-weather :time="nowTime" :data="tqmap" />
-      <panel-3 class="wind-site-info">
-        <row align="middle">
-          <div class="info-item">
-            <div class="value">{{ jczbmap.zjrl }}</div>
-            <div class="text">装机容量</div>
-          </div>
-          <div class="info-item">
-            <div class="value">{{ jczbmap.rfdl }}</div>
-            <div class="text">日发电量</div>
-          </div>
-          <div class="info-item">
-            <div class="value">{{ jczbmap.yfdl }}</div>
-            <div class="text">月发电量</div>
-          </div>
-          <div class="info-item">
-            <div class="value">{{ jczbmap.nfdl }}</div>
-            <div class="text">年发电量</div>
-          </div>
-          <div class="info-item">
-            <div class="value">{{ jczbmap.ylyxs }}</div>
-            <div class="text">月利用小时</div>
-          </div>
-          <div class="info-item">
-            <div class="value">{{ jczbmap.nlyxs }}</div>
-            <div class="text">年利用小时</div>
-          </div>
-          <div class="info-item">
-            <div class="value">{{ jczbmap.ssfs }}</div>
-            <div class="text">实时风速</div>
-          </div>
-          <div class="info-item">
-            <div class="value">{{ jczbmap.sjgl }}</div>
-            <div class="text">实时功率</div>
-          </div>
-        </row>
-      </panel-3>
-      <panel-3 class="wind-running-info">
-        <row align="middle">
-          <div class="fengji">
-            <div class="fengji-icon svg-icon svg-icon-white">
-              <svg-icon class="" svgid="svg-风机" />
+    <div class="wind-site-home">
+      <div class="mg-b-16">
+        <btn-group-double :btnGroups="btnGroups" :rowIndex="0" :index="1" @select="select" />
+      </div>
+      <row>
+        <wind-site-weather :time="nowTime" :data="tqmap" />
+        <panel-3 class="wind-site-info">
+          <row align="middle">
+            <div class="info-item">
+              <div class="value">{{ jczbmap.zjrl }}</div>
+              <div class="text">装机容量</div>
             </div>
-            <div class="info">
-              <div class="text green">接入风机</div>
-              <div class="value">{{ jczbmap.jrts }}</div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.rfdl }}</div>
+              <div class="text">日发电量</div>
             </div>
-          </div>
-          <div class="situation">
-            <row class="icon-status">
-              <div class="status ">
-                <span class="svg-icon svg-icon-purple">
-                  <svg-icon svgid="svg-standby" />
-                </span>
-                <span class="text purple">
-                  待机
-                </span>
-              </div>
-              <div class="status ">
-                <span class="svg-icon svg-icon-green">
-                  <svg-icon svgid="svg-normal-power" />
-                </span>
-                <span class="text green">
-                  运行
-                </span>
-              </div>
-              <div class="status ">
-                <span class="svg-icon svg-icon-yellow">
-                  <svg-icon svgid="svg-limit-power" style="margin:3px 0.3704vh -3px 0;" />
-                </span>
-                <span class="text yellow">
-                  限电
-                </span>
-              </div>
-              <div class="status ">
-                <span class="svg-icon svg-icon-red">
-                  <svg-icon svgid="svg-gz-downtime" />
-                </span>
-                <span class="text red">
-                  故障
-                </span>
-              </div>
-              <div class="status ">
-                <span class="svg-icon svg-icon-orange">
-                  <svg-icon svgid="svg-jx-downtime" />
-                </span>
-                <span class="text orange">
-                  检修
-                </span>
-              </div>
-              <div class="status ">
-                <span class="svg-icon svg-icon-gray">
-                  <svg-icon svgid="svg-offline" />
-                </span>
-                <span class="text gray">
-                  离线
-                </span>
-              </div>
-              <div class="status ">
-                <span class="svg-icon svg-icon-darkblue">
-                  <svg-icon svgid="svg-intranet-involvement" />
-                </span>
-                <span class="text darkblue">
-                  受限
-                </span>
-              </div>
-            </row>
-            <row>
-              <div class="status">
-                <span class="text gray">
-                  待风
-                </span>
-                <span class="value">
-                  {{ jczbmap.djnum }}
-                </span>
-              </div>
-              <div class="status">
-                <span class="text gray">
-                  正常出力
-                </span>
-                <span class="value">
-                  {{ jczbmap.zcfdnum }}
-                </span>
-              </div>
-              <div class="status">
-                <span class="text gray">
-                  降出力
-                </span>
-                <span class="value">
-                  {{ jczbmap.xdjclnum }}
-                </span>
-              </div>
-              <div class="status">
-                <span class="text gray">
-                  故障停机
-                </span>
-                <span class="value">
-                  {{ jczbmap.gztjnum }}
-                </span>
-              </div>
-              <div class="status">
-                <span class="text gray">
-                  检修停机
-                </span>
-                <span class="value">
-                  {{ jczbmap.jxtjnum }}
-                </span>
-              </div>
-              <div class="status">
-                <span class="text gray">
-                  电网
-                </span>
-                <span class="value">
-                  {{ jczbmap.dwslnum }}
-                </span>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.yfdl }}</div>
+              <div class="text">月发电量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.nfdl }}</div>
+              <div class="text">年发电量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.ylyxs }}</div>
+              <div class="text">月利用小时</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.nlyxs }}</div>
+              <div class="text">年利用小时</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.ssfs }}</div>
+              <div class="text">实时风速</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.sjgl }}</div>
+              <div class="text">实时功率</div>
+            </div>
+          </row>
+        </panel-3>
+        <panel-3 class="wind-running-info">
+          <row align="middle">
+            <div class="fengji">
+              <div class="fengji-icon svg-icon svg-icon-white">
+                <svg-icon class="" svgid="svg-风机" />
               </div>
-              <div class="status">
-                <span class="text gray">
-                  离线
-                </span>
-                <span class="value">
-                  {{ jczbmap.lxnum }}
-                </span>
+              <div class="info">
+                <div class="text green">接入风机</div>
+                <div class="value">{{ jczbmap.jrts }}</div>
               </div>
-            </row>
-          </div>
-        </row>
-      </panel-3>
-    </row>
-    <div class="first-info mg-t-16 mg-b-16">
-      <div style="flex:0 1 450px;">
-        <panel title="场站">
-          <station height="18.519vh" />
-        </panel>
+            </div>
+            <div class="situation">
+              <row class="icon-status">
+                <div class="status ">
+                  <span class="svg-icon svg-icon-purple">
+                    <svg-icon svgid="svg-standby" />
+                  </span>
+                  <span class="text purple">
+                    待机
+                  </span>
+                </div>
+                <div class="status ">
+                  <span class="svg-icon svg-icon-green">
+                    <svg-icon svgid="svg-normal-power" />
+                  </span>
+                  <span class="text green">
+                    运行
+                  </span>
+                </div>
+                <div class="status ">
+                  <span class="svg-icon svg-icon-yellow">
+                    <svg-icon svgid="svg-limit-power" style="margin:3px 0.3704vh -3px 0;" />
+                  </span>
+                  <span class="text yellow">
+                    限电
+                  </span>
+                </div>
+                <div class="status ">
+                  <span class="svg-icon svg-icon-red">
+                    <svg-icon svgid="svg-gz-downtime" />
+                  </span>
+                  <span class="text red">
+                    故障
+                  </span>
+                </div>
+                <div class="status ">
+                  <span class="svg-icon svg-icon-orange">
+                    <svg-icon svgid="svg-jx-downtime" />
+                  </span>
+                  <span class="text orange">
+                    检修
+                  </span>
+                </div>
+                <div class="status ">
+                  <span class="svg-icon svg-icon-gray">
+                    <svg-icon svgid="svg-offline" />
+                  </span>
+                  <span class="text gray">
+                    离线
+                  </span>
+                </div>
+                <div class="status ">
+                  <span class="svg-icon svg-icon-darkblue">
+                    <svg-icon svgid="svg-intranet-involvement" />
+                  </span>
+                  <span class="text darkblue">
+                    受限
+                  </span>
+                </div>
+              </row>
+              <row>
+                <div class="status">
+                  <span class="text gray">
+                    待风
+                  </span>
+                  <span class="value">
+                    {{ jczbmap.djnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="text gray">
+                    正常出力
+                  </span>
+                  <span class="value">
+                    {{ jczbmap.zcfdnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="text gray">
+                    降出力
+                  </span>
+                  <span class="value">
+                    {{ jczbmap.xdjclnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="text gray">
+                    故障停机
+                  </span>
+                  <span class="value">
+                    {{ jczbmap.gztjnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="text gray">
+                    检修停机
+                  </span>
+                  <span class="value">
+                    {{ jczbmap.jxtjnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="text gray">
+                    电网
+                  </span>
+                  <span class="value">
+                    {{ jczbmap.dwslnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="text gray">
+                    离线
+                  </span>
+                  <span class="value">
+                    {{ jczbmap.lxnum }}
+                  </span>
+                </div>
+              </row>
+            </div>
+          </row>
+        </panel-3>
+      </row>
+      <div class="first-info mg-t-16 mg-b-16">
+        <div style="flex:0 1 450px;">
+          <panel title="场站">
+            <station height="18.519vh" />
+          </panel>
+        </div>
+        <div class="mg-l-16" style="flex:1 1 auto;" ref="lineChart">
+          <panel title="4小时功率曲线图">
+            <multiple-line-chart height="18.519vh" v-if="Powertrend" :list="Powertrend.value" :units="Powertrend.units"
+              :showLegend="true" />
+          </panel>
+        </div>
+        <div class="mg-l-16" style="flex:0 0 400px;">
+          <panel class="light-matrix-panel">
+            <light-matrix :list="fjmap" />
+          </panel>
+        </div>
       </div>
-      <div class="mg-l-16" style="flex:1 1 auto;" ref="lineChart">
-        <panel title="4小时功率曲线图">
-          <multiple-line-chart height="18.519vh" v-if="Powertrend" :list="Powertrend.value" :units="Powertrend.units"
+      <row>
+        <Col :span="8">
+        <panel title="日度损失电量分析">
+          <dual-pie-chart :innerData="pieChartData.dayData" :outerData="pieChartData.dayData" height="21.296vh" />
+        </panel>
+        </Col>
+        <Col :span="8">
+        <panel title="月度损失电量分析">
+          <dual-pie-chart :innerData="pieChartData.monthData" :outerData="pieChartData.monthData" height="21.296vh" />
+        </panel>
+        </Col>
+        <Col :span="8">
+        <panel title="年度损失电量分析">
+          <dual-pie-chart :innerData="pieChartData.yearData" :outerData="pieChartData.yearData" height="21.296vh" />
+        </panel>
+        </Col>
+      </row>
+      <row>
+        <Col :span="8">
+        <panel title="日度损失电量分析">
+          <hover-bar-chart :list="dayLost" height="21.296vh" />
+        </panel>
+        </Col>
+        <Col :span="8">
+        <panel title="日发电量对比">
+          <multiple-bar-chart height="21.296vh" :list="CompleteElectricity.data" :units="CompleteElectricity.units"
             :showLegend="true" />
         </panel>
-      </div>
-      <div class="mg-l-16" style="flex:0 0 400px;">
-        <panel class="light-matrix-panel">
-          <light-matrix :list="fjmap" />
+        </Col>
+        <Col :span="8">
+        <panel title="月发电量对比">
+          <normal-line-chart height="21.296vh" :list="MonthCompare.value" :units="MonthCompare.units" />
         </panel>
-      </div>
+        </Col>
+      </row>
     </div>
-    <row>
-      <Col :span="8">
-      <panel title="日度损失电量分析">
-        <dual-pie-chart :innerData="pieChartData.dayData" :outerData="pieChartData.dayData" height="21.296vh" />
-      </panel>
-      </Col>
-      <Col :span="8">
-      <panel title="月度损失电量分析">
-        <dual-pie-chart :innerData="pieChartData.monthData" :outerData="pieChartData.monthData" height="21.296vh" />
-      </panel>
-      </Col>
-      <Col :span="8">
-      <panel title="年度损失电量分析">
-        <dual-pie-chart :innerData="pieChartData.yearData" :outerData="pieChartData.yearData" height="21.296vh" />
-      </panel>
-      </Col>
-    </row>
-    <row>
-      <Col :span="8">
-      <panel title="日度损失电量分析">
-        <hover-bar-chart :list="dayLost" height="21.296vh" />
-      </panel>
-      </Col>
-      <Col :span="8">
-      <panel title="日发电量对比">
-        <multiple-bar-chart height="21.296vh" :list="CompleteElectricity.data" :units="CompleteElectricity.units"
-          :showLegend="true" />
-      </panel>
-      </Col>
-      <Col :span="8">
-      <panel title="月发电量对比">
-        <normal-line-chart height="21.296vh" :list="MonthCompare.value" :units="MonthCompare.units" />
-      </panel>
-      </Col>
-    </row>
   </div>
 </template>
 
@@ -443,6 +445,7 @@ export default {
           wpId: that.wpId,
         },
         success (res) {
+          console.log(123,res);
           if (res.data) {
             that.tqmap = res.data.tqmap;
             let fjmap = [];
@@ -538,7 +541,7 @@ export default {
             keys.forEach((key, keyIndex) => {
               res.data.glvos.forEach((ele) => {
                 Powertrend.value[keyIndex].value.push({
-                  text: new Date().formatDate("hh:mm"),
+                  text: new Date(ele.time).formatDate("hh:mm"),
                   value: ele[key],
                 });
               });