Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into new-power

src/api/wisdomOverhaul/energy/index.js

@@ -85,6 +85,13 @@ const getCurvefittingmonthmainList = (data) => {
         method: "post",
     });
 };
+export const getCurveIntervalfittingmainList = (data) => {
+    return request({
+      baseURL: process.env.VUE_APP_API,
+      url: `winddeviation/queryEquipmentInfoDay4?wpId=${data.wpId}&recorddate=${data.recorddate}`,
+      method: "get",
+    });
+};
 
 
 

src/components/other/healthReport/index.vue

@@ -206,17 +206,15 @@
       </div>
 
       <!-- 对风偏差先隐藏 -->
-      <div class="textBox" v-if="false">
+      <div class="textBox" v-if="healthreport != null">
         <el-form>
           <el-form-item class="imp fw text-indent-2">对风偏差：</el-form-item>
           <el-form-item class="text-indent-2">
-            统计周期内，对应的偏航对风偏差角度信号大部分集中在0度附近，近似于正态分布，正负偏差15%以内的频率{{
-              Number(healthreport.withincount)
-            }}次，以外的频次{{
-              Number(healthreport.beyondcount)
-            }}次，对风偏差率为{{
-              Number(healthreport.dfpcl).toFixed(1)
-            }}，总体高于该型号机组平均值（3%）。
+            对应的偏航对风偏差角度信号，正负偏差正常次数{{
+              Number(healthreport.hg)
+            }}次，异常偏差{{ Number(healthreport.bhg) }}次，对风偏差率为{{
+              Number(healthreport.dfpcl)
+            }}。
           </el-form-item>
           <el-form-item class="text-indent-2"
             >其中风速在3-5m/s区间的对风偏差率{{
@@ -224,16 +222,9 @@
             }}，风速在5-11m/s区间的对风偏差率{{
               Number(healthreport.fivedfpcl).toFixed(1)
             }}，风速在11-25m/s区间的对风偏差率{{
-              Number(healthreport.elevendfpcl).toFixed(1)
+              Number(healthreport.eledfpcl).toFixed(1)
             }}。
           </el-form-item>
-          <el-form-item class="text-indent-2">
-            对于功率分别在100,200,300,400,...,{{
-              healthreport.glfw
-            }}KW的偏航对风偏差角度信号进行统计,对风偏差率分别为{{
-              healthreport.descriptiondfpcl
-            }}；（如果需要查看在每一个功率等高线下偏航对风偏差角度信号在角度数值上的聚集程度，可参考能效分析中对风偏差分析模块）
-          </el-form-item>
 
           <div class="logHead">对风偏差率（频次）</div>
           <DoubleLineChart
@@ -948,7 +939,7 @@
 </template>
 
 <script>
-import DoubleLineChart from "@com/chart/line/double-line-chart.vue";
+import DoubleLineChart from "@/components/chart/line/double-line-chart.vue";
 // import ScatterLineChart from "@com/chart/combination/scatter-line-chart.vue";
 import NormalLineChart from "@com/chart/line/normal-line-chart.vue";
 import NormalRadarChart from "@com/chart/radar/normal-radar-chart.vue";
@@ -1858,6 +1849,52 @@ export default {
           this.glqxnh = glqxnh;
         }
       });
+      // 获取对风偏差率折线图
+      axios({
+        baseURL: process.env.VUE_APP_API,
+        url: `/winddeviation/getDeviationValue?wtId=${wtid}&recorddate=${recorddate}`,
+      }).then(({ data: res }) => {
+        if (res.data.code === 200) {
+          if (
+            res.data.data.deviationls.length &&
+            res.data.data.powerresultList.length &&
+            res.data.data.speedresultList.length
+          ) {
+            this.healthreport = res.data.data;
+            this.dfpc = {
+              nipples: [
+                {
+                  title: "频次",
+                  smooth: true,
+                  value: this.healthreport.deviationls.map((i) => {
+                    return { text: i.value, value: i.bhg };
+                  }),
+                },
+              ],
+              dfpclpowers: [
+                {
+                  title: "功率",
+                  smooth: true,
+                  value: this.healthreport.powerresultList.map((i) => {
+                    return { text: i.power, value: i.dfpcl };
+                  }),
+                },
+              ],
+              dfpclSpeeds: [
+                {
+                  title: "风速",
+                  smooth: true,
+                  value: this.healthreport.speedresultList.map((i) => {
+                    return { text: i.speed, value: i.dfpcl };
+                  }),
+                },
+              ],
+            };
+          } else {
+            this.healthreport = null;
+          }
+        }
+      });
 
       // 获取部件劣化状态
       axios({

src/router/index.js

@@ -1100,6 +1100,19 @@ export const asyncRoutes = [
             },
           },
           {
+            path: "qxqjpcl",
+            component: () =>
+              import(
+                "@/views/economicsOperation/windAnalyse/qxqjpcl/index.vue"
+              ),
+            name: "Qxqjpcl",
+            meta: {
+              title: "曲线区间偏差率分析",
+              icon: "",
+              permissions: ["jn_fdfx_qxpclfx"],
+            },
+          },
+          {
             path: "cutInAndOutAnalysis",
             component: () =>
               import(

src/views/economicsOperation/windAnalyse/monthlyAnalysis/index.vue

@@ -302,6 +302,7 @@ export default {
       return y + "-" + m;
     },
     reportDialogFn(row) {
+    
       this.dialogVisible = true;
       this.dialogTitle = row.wtcode;
       this.pickerTimerYear = this.pickerTimer.substring(

src/views/economicsOperation/windAnalyse/monthlyAnalysis/reportDialog.vue

@@ -13,9 +13,9 @@
   >
     <div class="dialogHeader">
       <span
-        >{{ dialogTitle }}号风机{{ pickerTimerYear }}年{{
-          pickerTimerMonth
-        }}月运行指标性能分析</span
+        >{{ rowData?.windPowerStationName }}{{ dialogTitle }}号风机{{
+          pickerTimerYear
+        }}年{{ pickerTimerMonth }}月运行指标性能分析</span
       >
     </div>
     <div class="monthReportTable">
@@ -33,7 +33,8 @@
     </div>
     <div class="monthReportMsage">
       <div class="textIndent">
-        1.本月{{ dialogTitle }}号风机风机设备利用小时数{{
+        1.本月{{ rowData?.windPowerStationName
+        }}{{ dialogTitle }}号风机风机设备利用小时数{{
           tableVal.byzb && (tableVal.byzb.lyxs || 0)
         }}小时、同比{{ tableVal.tqzb && (tableVal.tqzb.lyxs || 0) }}小时，
         设备可利用率{{ tableVal.byzb && (tableVal.byzb.sbklyl || 0) }}%、同比{{
@@ -48,11 +49,12 @@
         }}%、同比{{ tableVal.tqzb && (tableVal.tqzb.glyzxxs || 0) }}%。
       </div>
       <div class="textIndent">
-        2.{{ dialogTitle }}风机{{ pickerTimerYear }}年{{
-          pickerTimerMonth
-        }}月平均风速{{ tableVal.byzb && (tableVal.byzb.fs || 0) }}m/s、同比{{
-          tableVal.tqzb && (tableVal.tqzb.fs || 0)
-        }}m/s， 小风平均切入风速{{
+        2.{{ rowData?.windPowerStationName }}{{ dialogTitle }}风机{{
+          pickerTimerYear
+        }}年{{ pickerTimerMonth }}月平均风速{{
+          tableVal.byzb && (tableVal.byzb.fs || 0)
+        }}m/s、同比{{ tableVal.tqzb && (tableVal.tqzb.fs || 0) }}m/s，
+        小风平均切入风速{{
           tableVal.byzb && (tableVal.byzb.xfqr || 0)
         }}m/s、同比{{ tableVal.tqzb && (tableVal.tqzb.xfqr || 0) }}m/s，
         有效风时数{{ tableVal.byzb && (tableVal.byzb.yxfss || 0) }}小时、同比{{
@@ -580,7 +582,7 @@ export default {
     getFiveBarEchart(xAxis, lenged, series) {
       let option = {
         backgroundColor: this.showWhite ? "#fff" : "",
-        color: [ "#e17e23", "#ba3237", "#c531c7", "#000","#05bb4c",],
+        color: ["#e17e23", "#ba3237", "#c531c7", "#000", "#05bb4c"],
         title: {
           text: "损失电量分析",
           textStyle: {

src/views/economicsOperation/windAnalyse/performanceAssess/index.vue

@@ -125,7 +125,7 @@
       "
     >
       <div class="Evaluation_title clearfix">
-        <div class="leftContent "><span>月度性能等级评估</span></div>
+        <div class="leftContent"><span>月度性能等级评估</span></div>
       </div>
 
       <div class="economicTable1">
@@ -144,7 +144,12 @@
           </el-table-column>
           <el-table-column prop="dayLevel" label="等级" align="center">
           </el-table-column>
-          <el-table-column prop="dayRank" label="综合排名" align="center">
+          <el-table-column
+            prop="dayRank"
+            label="综合排名"
+            sortable
+            align="center"
+          >
           </el-table-column>
           <el-table-column
             v-for="(item, index) in tabEvent === -1
@@ -268,7 +273,7 @@ export default {
         { title: "利用小时数(h)", code: "daylyxs" },
         { title: "拟合优度(%)", code: "daynhyd" },
         { title: "可利用率(%)", code: "daysbklyl" },
-        { title: "可用系数(%)", code: "daydxkyxs" },
+        { title: "等效可用系数(%)", code: "daydxkyxs" },
         { title: "有效风时数(h)", code: "dayyxfss" },
         { title: "平均切入(m/s)", code: "dayxfqr" },
         { title: "静风频率(%)", code: "dayjfpl" },
@@ -286,7 +291,7 @@ export default {
         { title: "利用小时数(h)", code: "daylyxs" },
         { title: "拟合优度(%)", code: "daynhyd" },
         { title: "可利用率(%)", code: "daysbklyl" },
-        { title: "可用系数(%)", code: "daydxkyxs" },
+        { title: "等效可用系数(%)", code: "daydxkyxs" },
         { title: "有效光时数(h)", code: "dayyxfss" },
         { title: "功率一致性(%)", code: "dayglyzxxs" },
       ],

src/views/economicsOperation/windAnalyse/qxqjpcl/index.vue

@@ -0,0 +1,254 @@
+<template>
+  <div style="height: 100%; padding: 10px 20px">
+    <div class="query mg-b-8">
+      <div class="query-items">
+        <div class="query-item">
+          <div class="lable">场站：</div>
+          <div class="search-input">
+            <el-select
+              size="mini"
+              v-model="value1"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in ChangZhan"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">日期：</div>
+          <div class="search-input">
+            <el-date-picker
+              size="mini"
+              v-model="date"
+              type="date"
+              placeholder="选择日期"
+              popper-class="date-select"
+              value-format="YYYY-MM-DD"
+            >
+            </el-date-picker>
+          </div>
+        </div>
+        <div class="query-actions">
+          <el-button size="mini" round class="searchColor" @click="getTable"
+            >查 询</el-button
+          >
+        </div>
+      </div>
+    </div>
+    <div class="table-box">
+      <div class="leftContent">
+        <span>{{ showTitle }}</span>
+      </div>
+      <el-table
+        :data="tableData.data"
+        stripe
+        height="calc(100% - 40px)"
+        size="mini"
+      >
+        <el-table-column
+          :sortable="item.field != 'nemCode' && item.field != 'recordDate'"
+          align="center"
+          v-for="(item, index) in tableData.column"
+          :key="index"
+          :prop="item.field"
+          :label="item.name"
+        >
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+<script>
+import api1 from "@api/economic/index.js";
+import { getCurveIntervalfittingmainList } from "@api/wisdomOverhaul/energy/index.js";
+export default {
+  name: "Qxqjpcl",
+
+  data() {
+    return {
+   
+      ChangZhan: [],
+      value1: "",
+      date: "",
+      showTitle: "曲线区间偏差率",
+      tableLoading: true,
+      tableData: {
+        column: [
+          {
+            name: "风机",
+            field: "nemCode",
+          },
+          {
+            name: "日期",
+            field: "recordDate",
+          },
+
+          {
+            name: "3-5米",
+            field: "y35mqxpcl",
+          },
+          {
+            name: "5-11米",
+            field: "y511mqxpcl",
+          },
+          {
+            name: "11米以上",
+            field: "y11mycqxpcl",
+          },
+        ],
+        data: [],
+      },
+    };
+  },
+  created() {
+    this.ChangZhanVal();
+    this.date = new Date().formatDate("yyyy-MM-dd");
+  },
+  methods: {
+    // 获取表格数据
+    getTable() {
+      this.tableLoading = true;
+
+      const param = {
+        wpId: this.value1,
+        recorddate: this.date,
+      };
+
+      getCurveIntervalfittingmainList(param).then(({ data: res }) => {
+        this.tableLoading = false;
+        console.log(res.code);
+        if (res.code === 200) {
+          res.data.forEach((ele) => {
+            ele.recordDate = this.date;
+          });
+          this.tableData.data = res.data || [];
+        }
+      });
+    },
+    // tab
+    handleOpen(vl, index) {
+      this.cur = index;
+      this.showTitle = vl;
+      this.date = new Date().formatDate(`yyyy-MM${index ? "-dd" : ""}`);
+      this.getTable();
+    },
+    // 场站
+    ChangZhanVal() {
+      api1
+        .getWpList({
+          type: "-1",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.ChangZhan = res.data.data;
+            this.value1 = res.data.data[0].id;
+            this.getTable();
+          }
+        });
+    },
+  },
+};
+</script>
+<style scoped lang="less">
+.table-box {
+  height: calc(100% - 80px);
+  .leftContent {
+    width: 242px;
+    height: 45px;
+    line-height: 45px;
+    background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
+
+    span {
+      font-size: 16px;
+      font-family: Microsoft YaHei;
+      font-weight: 400;
+      color: #05bb4c;
+      margin-left: 25px;
+    }
+  }
+}
+.query-actions {
+  margin-left: 0 !important;
+}
+button {
+  margin-left: 10px;
+  background: rgba(67, 81, 107, 0.3);
+  border: 1px solid #274934;
+  color: #b3b3b3;
+}
+
+.searchColor {
+  background-color: rgba(5, 187, 76, 0.2);
+  border: 1px solid #3b6c53;
+  color: #b3b3b3;
+  font-size: 14px;
+
+  &:hover {
+    background-color: rgba(5, 187, 76, 0.5);
+    color: #ffffff;
+  }
+}
+
+.newspan {
+  line-height: 30px;
+  cursor: pointer;
+  padding: 0 1vw;
+  margin: 0 2px;
+  color: #9ca5a8;
+  transition: color 0.2s ease-in-out;
+  position: relative;
+}
+.newspan:hover {
+  background: linear-gradient(
+    to top,
+    rgba(5, 187, 76, 0.5),
+    rgba(5, 187, 76, 0)
+  );
+  color: white;
+  position: relative;
+}
+.newspan:hover::after {
+  content: "";
+  position: absolute;
+  width: 100%;
+  height: 0.463vh;
+  border: 0.093vh solid #05bb4c;
+  border-top: 0;
+  left: 0;
+  bottom: 0;
+  box-sizing: border-box;
+}
+.active {
+  background: linear-gradient(
+    to top,
+    rgba(5, 187, 76, 0.5),
+    rgba(5, 187, 76, 0)
+  );
+  color: white;
+  position: relative;
+}
+.active::after {
+  content: "";
+  position: absolute;
+  width: 100%;
+  height: 4px;
+  border: 1px solid #05bb4c;
+  border-top: 0;
+  left: 0;
+  bottom: 0;
+  box-sizing: border-box;
+}
+.title {
+  background: rgba(255, 255, 255, 0.1);
+  margin-bottom: 8px;
+  padding: 8px;
+}
+</style>

src/views/stateMonitor/factoryMonitor/photovoltaic/lightMillivolt/index.vue

@@ -49,10 +49,10 @@
       v-if="wpId === 'SXJ_KGDL_YY_GDC_STA'"
     />
     <!-- 平鲁阻虎 -->
-    <!-- <GFpingluzuhu
+    <GFpingluzuhu
       class="booster-station-body"
       v-if="wpId === 'SXJ_KGDL_PL_GDC_STA'"
-    /> -->
+    />
     <!-- 天镇旭升 -->
     <GFtianzhenxusheng
       class="booster-station-body"