Merge branch 'yx' of ssh://61.161.152.110:29418/electronic-map into tjj2

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

@@ -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/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>
@@ -384,7 +384,7 @@ export default {
         });
       } else {
         this.$router.push({
-          path: `windsite/inverter-info/${item.wpId}/${item.wtId}`
+          path: `windsite/inverter-info/${item.wpId}/${item.wtId}`,
         });
       }
     },

src/views/SandTable/SandTable.vue

@@ -118,7 +118,7 @@
       <Ppanel
         title="利用小时"
         :data="riseNumber(gxkmap.bg_dxkyss)"
-        :dataColor="gxkmap.bg_dxkyss < 0 ? '#f25656' : '#05BB4C'"
+        dataColor="#05BB4C"
         :days="gxkmap.ydxkyss"
         :data1Icon="
           gxkmap.tb_dxkyss < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'
@@ -141,7 +141,7 @@
         title="设备可利用率"
         class="stb-p"
         :data="riseNumber(gxkmap.bg_sbklyl)"
-        :dataColor="gxkmap.bg_sbklyl < 0 ? '#f25656' : '#05BB4C'"
+        dataColor="#05BB4C"
         :days="gxkmap.ysbklyl"
         :data1Icon="
           gxkmap.hb_sbklyl < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'
@@ -164,7 +164,7 @@
         title="MTBF"
         class="stb-p"
         :data="riseNumber(gxkmap.bg_mtbf)"
-        :dataColor="gxkmap.bg_mtbf < 0 ? '#f25656' : '#05BB4C'"
+        dataColor="#05BB4C"
         :days="gxkmap.mtbf"
         :data1Icon="gxkmap.hb_mtbf < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'"
         :data1IconClass="
@@ -183,7 +183,7 @@
         title="MTTR"
         class="stb-p"
         :data="riseNumber(gxkmap.bg_mttr)"
-        :dataColor="gxkmap.bg_mttr < 0 ? '#f25656' : '#05BB4C'"
+        dataColor="#05BB4C"
         :days="gxkmap.mttr"
         :data1Icon="gxkmap.hb_mttr < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'"
         :data1IconClass="
@@ -202,7 +202,7 @@
         title="MTTF"
         class="stb-p"
         :data="riseNumber(gxkmap.bg_mttf)"
-        :dataColor="gxkmap.bg_mttf < 0 ? '#f25656' : '#05BB4C'"
+        dataColor="#05BB4C"
         :days="gxkmap.mttf"
         :data1Icon="gxkmap.hb_mttf < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'"
         :data1IconClass="
@@ -865,11 +865,12 @@ export default {
     },
 
     riseNumber(number) {
-      if (number < 0) {
-        return (number - number * 2) / 100;
-      } else {
-        return number / 100;
-      }
+      // if (number < 0) {
+      //   return (number - number * 2) / 100;
+      // } else {
+      //   return number / 100;
+      // }
+      return number / 100;
     },
 
     // 切换人员展示

src/views/SandTable/component/p-panel.vue

@@ -25,7 +25,7 @@
           <div class="pp-tip-data font-sm">
             {{
               (data * 100).toFixed(2)
-            }}
+            }}%
           </div>
           <div class="pp-tip-icon">
             <i