冲突解决

src/components/other/healthReport/index.vue

@@ -1719,6 +1719,10 @@ export default {
  
     // 获取报告详情
     getReport(wtid,recorddate) {
+		console.log(this.params)
+		if(wtid == undefined){
+			return;
+		}
       let that = this;
       let reqData = this.params;
       that.API.requestData({

src/views/HealthControl/Health0.vue

@@ -199,7 +199,7 @@
         </el-row>
       </el-col>
     </el-row>
-    <health-report :show="reportshow" :params="reportparams" @closed="closed"/>
+    <health-report :show="reportshow" :params="reportparams" ref="eport" @closed="closed"/>
   </div>
 </template>
 
@@ -699,9 +699,11 @@ export default {
   methods: {
     // 查看健康报告
     onClickReport(){
-      console.warn('查看健康报告');
+		// console.log(this.value2,new Date(new Date()).formatDate("yyyy-MM-dd"))
+      
       this.reportshow = true
-      this.reportparams = {wtId: this.value2, recorddate: new Date(new Date()).formatDate("yyyy-MM-dd")}
+      // this.reportparams = {wtId: this.value2, recorddate: new Date(new Date()).formatDate("yyyy-MM-dd")}
+	  this.$refs.eport.getReport(this.value2,new Date(new Date()).formatDate("yyyy-MM-dd"));
     },
     // 关闭健康报告
     closed(){
@@ -789,7 +791,6 @@ export default {
              wtId : this.value2
         },
         success(res) {
-          console.log('findWtHealthInfo:',res)
           that.yxtableData.data = res.data.bjyxls;
           that.tableData2.data =  res.data.djpgls;
         },

src/views/HealthControl/HealthTab1.vue

@@ -152,7 +152,6 @@ export default {
         wtId: item.wtid,
         recorddate: recorddate,
       };
-	  console.log(this.reportparams)
 	  this.$refs.eport.getReport(item.wtid,recorddate);
     },
     // 关闭健康报告

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

@@ -775,7 +775,7 @@ export default {
                   value: [],
                 },
                 {
-                  title: "最有功率律",
+                  title: "最优功率",
                   smooth: true, // 使用单位
                   value: [],
                 },

src/views/WindSite/pages/Map.vue

@@ -53,7 +53,7 @@
     </div>
     <div class="panel-body">
       <MHSFDC wpId="MHS_FDC" v-if="wpId.indexOf('FDC') !== -1" />
-	  <NSSFDC wpId="NSS_FDC" v-if="wpId.indexOf('FDC') !== -1" />
+	  <!-- <NSSFDC wpId="NSS_FDC" v-if="wpId.indexOf('FDC') !== -1" /> -->
       <PLGDC wpId="PL_GDC" v-if="wpId.indexOf('GDC') !== -1" />
       <div class="map-popup-panel" v-show="showPopup">
         <!-- <div class="map-popup-panel-header">
@@ -165,7 +165,7 @@
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
 // import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import MHSFDC from "@com/arcgis/MHS_FDC.vue";
-import NSSFDC from "@com/arcgis/NSS_FDC.vue";
+// import NSSFDC from "@com/arcgis/NSS_FDC.vue";
 import PLGDC from "@com/arcgis/PL_GDC.vue";
 import dataService from "@/helper/data.js";
 
@@ -176,7 +176,7 @@ export default {
   components: {
     BtnGroup2,
     MHSFDC,
-	  NSSFDC,
+	  // NSSFDC,
     PLGDC
   },
   // 数据

src/views/totalPowerRank/index.vue

@@ -233,6 +233,7 @@ export default {
         that.API.requestData({
           method: "GET",
           subUrl: "leaderboard/totalPowerCapacityTopList",
+		  showLoading: true,
           data: {
             wpIps: that.wpId.length ? that.wpId.toString() : that.wpIps,
             isAsc: that.isAsc,
@@ -249,6 +250,7 @@ export default {
             res.data.forEach((ele) => {
               ele.beginDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
               ele.endDate = new Date(ele.beginDate).formatDate("yyyy-MM-dd");
+			  ele.speed = ele.speed.toFixed(2);
             });
             res.data.sort((a, b) => {
               return b.power - a.power;