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

src/views/HealthControl/infotrack2.vue

@@ -332,7 +332,7 @@
         class="videoBoxiframe"
         width="100%"
         height="600px"
-        src="http://localhost:8081?token=stream-1"
+        :src="'http://10.155.32.4:9984/ws.html?token=' + form.wtId +'_TD&autoplay=true'"
       ></iframe>
     </el-dialog>
     <el-dialog
@@ -522,30 +522,30 @@ export default {
     },
   },
   watch: {
-  	formdata(res) {
-  		if (res) {
-  			this.form = this.formdata;
-  			this.form.tjss = this.form.tjss
-  			  ? new Date(this.form.tjss).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.prodtdepttime = this.form.prodtdepttime
-  			  ? new Date(this.form.prodtdepttime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.departuretime = this.form.departuretime
-  			  ? new Date(this.form.departuretime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.arrivaltime = this.form.arrivaltime
-  			  ? new Date(this.form.arrivaltime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.repairedtime = this.form.repairedtime
-  			  ? new Date(this.form.repairedtime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.checktime = this.form.checktime
-  			  ? new Date(this.form.checktime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  		}
-  	}
-  }
+    formdata(res) {
+      if (res) {
+        this.form = this.formdata;
+        this.form.tjss = this.form.tjss
+          ? new Date(this.form.tjss).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.prodtdepttime = this.form.prodtdepttime
+          ? new Date(this.form.prodtdepttime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.departuretime = this.form.departuretime
+          ? new Date(this.form.departuretime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.arrivaltime = this.form.arrivaltime
+          ? new Date(this.form.arrivaltime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.repairedtime = this.form.repairedtime
+          ? new Date(this.form.repairedtime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.checktime = this.form.checktime
+          ? new Date(this.form.checktime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+      }
+    },
+  },
 };
 </script>
 

src/views/Home/Home.vue

@@ -1072,29 +1072,31 @@ export default {
         },
         success(res) {
           let rdlKey = ["value1", "value2", "value3", "speed"];
-          // units: ["(万kWh)", "(m/s)"],
-          let DayPower = [
-            {
-              title: "发电量",
-              yAxisIndex: 0,
-              value: [],
-            },
-            {
-              title: "上网电量",
-              yAxisIndex: 0,
-              value: [],
-            },
-            {
-              title: "购网电量",
-              yAxisIndex: 0,
-              value: [],
-            },
-            {
-              title: "风速",
-              yAxisIndex: 1,
-              value: [],
-            },
-          ];
+          let DayPower = {
+            units: ["(万kWh)", "(m/s)"],
+            value: [
+              {
+                title: "发电量",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "上网电量",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "购网电量",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "风速",
+                yAxisIndex: 1,
+                value: [],
+              },
+            ],
+          };
 
           let glKey = [
             "value2",
@@ -1139,7 +1141,7 @@ export default {
 
           rdlKey.forEach((keyEle, keyIndex) => {
             res.data.rdlvos.forEach((cEle) => {
-              DayPower[keyIndex].value.push({
+              DayPower.value[keyIndex].value.push({
                 text: cEle.timestr,
                 value: cEle[keyEle],
               });

src/views/Home/components/power-plan.vue

@@ -15,8 +15,8 @@
         <!-- <percent-card-2 :title="'月完成率' + parseInt((planData.yfdl / planData.yfdljh) * 100) + '%'" TotalText="实际" ActualText="计划" :TotalValue="planData.yfdl" :ActualValue="planData.yfdljh" :percent="planData.ywcl" /> -->
         <percent-card-2
           :title="''"
-          TotalText="实际"
-          ActualText="计划"
+          TotalText="月实际"
+          ActualText="月计划"
           :TotalValue="planData.yfdl"
           :ActualValue="planData.yfdljh"
           :percent="planData.ywcl"
@@ -26,8 +26,8 @@
         <!-- <percent-card-2 :title="'年完成率' + parseInt((planData.nfdl / planData.nfdljh) * 100) + '%'" TotalText="实际" ActualText="计划" :TotalValue="planData.nfdl" :ActualValue="planData.nfdljh" :percent="planData.nwcl" /> -->
         <percent-card-2
           :title="''"
-          TotalText="实际"
-          ActualText="计划"
+          TotalText="年实际"
+          ActualText="年计划"
           :TotalValue="planData.nfdl"
           :ActualValue="planData.nfdljh"
           :percent="planData.nwcl"

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}`,
         });
       }
     },