修改单位

src/views/Home/Home.vue

@@ -187,10 +187,14 @@
                     {{ wpId === "0" ? "减排二氧化硫" : "年运行小时" }}
                   </td>
                   <td class="value green">
-                    {{ wpId === "0" ? jczbmap.jpeyhl : gxkmap.nyxxs }}
+                     <!-- {{ wpId === "0" ? jczbmap.jpeyhl  : gxkmap.nyxxs }} -->
+                    {{ wpId === "0" ? jczbmap.jpeyhl * 10000 : gxkmap.nyxxs }}
                   </td>
-                  <td class="unit gray">
+                  <!-- <td class="unit gray">
                     {{ wpId === "0" ? "万吨" : "小时" }}
+                  </td> -->
+                  <td class="unit gray">
+                    {{ wpId === "0" ? "吨" : "小时" }}
                   </td>
                 </tr>
                 <tr class="">
@@ -198,19 +202,25 @@
                     {{ wpId === "0" ? "减排二氧化碳" : "年等效科利用系数" }}
                   </td>
                   <td class="value green">
-                    {{ wpId === "0" ? jczbmap.jpeyht : gxkmap.ndxkyss }}
+                    <!-- {{ wpId === "0" ? jczbmap.jpeyht  : gxkmap.ndxkyss }} -->
+                     {{ wpId === "0" ? jczbmap.jpeyht * 10000 : gxkmap.ndxkyss }}
                   </td>
-                  <td class="unit gray">{{ wpId === "0" ? "万吨" : "%" }}</td>
+                  <!-- <td class="unit gray">{{ wpId === "0" ? "万吨" : "%" }}</td> -->
+                  <td class="unit gray">{{ wpId === "0" ? "吨" : "%" }}</td>
                 </tr>
                 <tr class="">
                   <td class="text gray">
                     {{ wpId === "0" ? "节约用水" : "年故障小时" }}
                   </td>
                   <td class="value green">
-                    {{ wpId === "0" ? jczbmap.jys : gxkmap.ngzxs }}
+                    <!-- {{ wpId === "0" ? jczbmap.jys  : gxkmap.ngzxs }} -->
+                     {{ wpId === "0" ? jczbmap.jys * 10000 : gxkmap.ngzxs }}
                   </td>
-                  <td class="unit gray">
+                  <!-- <td class="unit gray">
                     {{ wpId === "0" ? "万吨" : "小时" }}
+                  </td> -->
+                  <td class="unit gray">
+                    {{ wpId === "0" ? "吨" : "小时" }}
                   </td>
                 </tr>
                 <tr class="">
@@ -218,10 +228,14 @@
                     {{ wpId === "0" ? "节约标煤" : "年待机小时" }}
                   </td>
                   <td class="value green">
-                    {{ wpId === "0" ? jczbmap.jybm : gxkmap.ndjxs }}
+                    <!-- {{ wpId === "0" ? jczbmap.jybm  : gxkmap.ndjxs }} -->
+                      {{ wpId === "0" ? jczbmap.jybm * 10000 : gxkmap.ndjxs }}
                   </td>
-                  <td class="unit gray">
+                  <!-- <td class="unit gray">
                     {{ wpId === "0" ? "万吨" : "小时" }}
+                  </td> -->
+                  <td class="unit gray">
+                    {{ wpId === "0" ? "吨" : "小时" }}
                   </td>
                 </tr>
               </table>
@@ -945,7 +959,7 @@ export default {
           wpId: that.wpId,
         },
         success(res) {
-          console.log('resWeather:',res)
+          console.log("resWeather:", res);
           const keys = ["wd", "sd"];
           let weatherChart = [
             {
@@ -991,7 +1005,7 @@ export default {
           id: that.wpId,
         },
         success(res) {
-          console.log('basicData:',res)
+          // console.log('basicData:',res)
           that.powerData = [
             {
               title: "风速",
@@ -1083,6 +1097,7 @@ export default {
           id: that.wpId,
         },
         success(res) {
+          console.log("resCharts:", res);
           let rdlKey = ["value1", "value2", "value3", "speed"];
           let DayPower = {
             units: ["(万kWh)", "(m/s)"],
@@ -1194,6 +1209,7 @@ export default {
     openDialog(dialogTitle, subUrl, targetName, dialogType) {
       this.dialogTitle = dialogTitle;
       let that = this;
+      console.log("dialogSuburl:", subUrl);
       that.API.requestData({
         method: "POST",
         subUrl,
@@ -1202,6 +1218,7 @@ export default {
           targetName,
         },
         success(res) {
+          console.log("resDialog:", res);
           that.dialogShow = true;
           that.dialogData = res.data;
           that.dialogType = dialogType;
@@ -1232,6 +1249,7 @@ export default {
           wpId: that.wpId,
         },
         success(res) {
+          console.log("forecastBoxRes:", res);
           that.dialogData = res.data;
           that.dialogType = "table";
           that.dialogShow = true;
@@ -1241,6 +1259,7 @@ export default {
 
     // 显示功率复核图表
     showPowerChart(res) {
+      console.log("powerChartRes:", res);
       this.dialogTitle = res.dialogTitle;
       this.dialogType = res.dialogType;
 
@@ -1250,6 +1269,7 @@ export default {
 
     // 显示计划电量完成情况图表
     showDoneChart(res) {
+      console.log("doneChartRes:", res);
       this.dialogTitle = res.dialogTitle;
       this.dialogType = res.dialogType;
 

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

@@ -74,15 +74,9 @@
                     运行
                   </span>
                 </div>
-<<<<<<< HEAD
-                <div class="status">
-                  <span class="svg-icon svg-icon-pink">
-                    <svg-icon svgid="svg-limit-power"/>
-=======
                 <div class="status ">
                   <span class="svg-icon svg-icon-pink">
                     <svg-icon svgid="svg-limit-power" style="margin:3px 0.3704vh -3px 0;" />
->>>>>>> a90e20b975bbd19cc02c24778ace5845c39744dd
                   </span>
                   <span class="text pink">
                     限电