Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into wsy

src/views/Home/Home.vue

@@ -769,10 +769,10 @@
       @closed="dialogType = ''"
     >
       <Table :data="dialogData" v-if="dialogType === 'table'" />
-      <MultipleLineChart
+      <multiple-y-line-chart-normal
         height="500px"
-        unit="(MW)"
-        :list="powerLineChartData"
+        :list="Powertrend"
+        :yAxises="PowertrendYAxises"
         :showLegend="true"
         v-if="dialogType === 'powerLineChart'"
       />
@@ -856,17 +856,13 @@ export default {
       tqmap: {},
       nowTime: "",
       planBtnName: "全部",
-      powerLineChartData: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
+      powerLineChartData: [
+        {
+          title: "",
+          yAxisIndex: 0, // 使用单位
+          value: [],
+        },
+      ],
       doneLineChartData: {
         // 图表所用单位
         units: [""],
@@ -909,13 +905,20 @@ export default {
         },
       ],
       PowertrendYAxises: [
-          {
-              name: '',
-              min: 0,
-              max: 60,
-              unit: "(MW)",
-              position: "left",
-          },
+        {
+          name: "功率",
+          min: 0,
+          max: 500,
+          unit: "(万kWh)",
+          position: "left",
+        },
+        {
+          name: "风速",
+          min: 0,
+          max: 50,
+          unit: "(m/s)",
+          position: "right",
+        },
       ],
     };
   },
@@ -1070,7 +1073,6 @@ export default {
         success(res) {
           let rdlKey = ["value1", "value2", "value3", "speed"];
           let DayPower = {
-            // 图表所用单位
             units: ["(万kWh)", "(m/s)"],
             value: [
               {

src/views/LightMatrix1/LightMatrix1.vue

@@ -35,31 +35,31 @@
             <div class="curStyle">
               <div>· 限电</div>
               <div>{{ sourceMap.fcxdnum || "---" }}</div>
-            </div> 
+            </div>
           </div>
           <div class="item red" @click="changeShow('gz_FDC', 2)">
             <div class="curStyle">
               <div>· 故障</div>
               <div>{{ sourceMap.fcgznum || "---" }}</div>
-            </div> 
+            </div>
           </div>
           <div class="item orange" @click="changeShow('jx_FDC', 4)">
             <div class="curStyle">
               <div>· 检修</div>
               <div>{{ sourceMap.fcwhnum || "---" }}</div>
-            </div> 
+            </div>
           </div>
           <div class="item write" @click="changeShow('sl_FDC', 6)">
             <div class="curStyle">
               <div>· 受累</div>
               <div>{{ sourceMap.fcslnum || "---" }}</div>
-            </div> 
+            </div>
           </div>
           <div class="item gray" @click="changeShow('lx_FDC', 3)">
             <div class="curStyle">
               <div>· 离线</div>
               <div>{{ sourceMap.fclxnum || "---" }}</div>
-            </div>     
+            </div>
           </div>
         </div>
       </Col>
@@ -82,49 +82,49 @@
             <div class="curStyle">
               <div>逆变器</div>
               <div>{{ sourceMap.gfjrnum || "---" }}</div>
-            </div>     
+            </div>
           </div>
           <div class="item blue" @click="changeShow('yx1_GDC', 1)">
             <div class="curStyle">
               <div>· 运行</div>
               <div>{{ sourceMap.gfyxnum || "---" }}</div>
-            </div>   
+            </div>
           </div>
           <div class="item greenv" @click="changeShow('dj1_GDC', 0)">
             <div class="curStyle">
               <div>· 待机</div>
               <div>{{ sourceMap.gfdjnum || "---" }}</div>
-            </div>   
+            </div>
           </div>
           <div class="item pink" @click="changeShow('xd1_GDC', 5)">
             <div class="curStyle">
               <div>· 限电</div>
               <div>{{ sourceMap.gfxdnum || "---" }}</div>
-            </div>   
+            </div>
           </div>
           <div class="item red" @click="changeShow('gz1_GDC', 2)">
             <div class="curStyle">
               <div>· 故障</div>
               <div>{{ sourceMap.gfgznum || "---" }}</div>
-            </div>   
+            </div>
           </div>
           <div class="item orange" @click="changeShow('jx1_GDC', 4)">
             <div class="curStyle">
               <div>· 检修</div>
               <div>{{ sourceMap.gfwhnum || "---" }}</div>
-            </div>   
+            </div>
           </div>
           <div class="item write" @click="changeShow('sl1_GDC', 6)">
             <div class="curStyle">
               <div>· 受累</div>
               <div>{{ sourceMap.gfslnum || "---" }}</div>
-            </div>     
+            </div>
           </div>
           <div class="item gray curStyle" @click="changeShow('lx1_GDC', 3)">
             <div class="curStyle">
               <div>· 离线</div>
               <div>{{ sourceMap.gflxnum || "---" }}</div>
-            </div>     
+            </div>
           </div>
         </div>
       </Col>
@@ -375,7 +375,7 @@ export default {
         });
       } else {
         this.$router.push({
-          path: `windsite/inverter-info/${item.wpId}/${item.wtId}`
+          path: `windsite/inverter-info/${item.wpId}/${item.wtId}`,
         });
       }
     },