소스 검색

增加历史数据查询

sunzehao 7 시간 전
부모
커밋
d316506881

+ 1 - 0
.env.development

@@ -29,6 +29,7 @@ VUE_APP_URL2=https://10.220.1.5:8080
 
 VUE_APP_REPORT=https://10.220.1.5:8080
 # VUE_APP_REPORT=https://10.112.33.5:8001
+VUE_APP_REPORT2=https://10.112.33.5:8085
 
 VUE_APP_GENERAT_URL=https://10.220.1.5:6060
 # VUE_APP_GENERAT_URL=http://10.112.33.5:6060

+ 1 - 0
.env.production

@@ -35,6 +35,7 @@ VUE_APP_API=/api6060
 VUE_APP_REPORT=https://10.112.33.5:8081
 # VUE_APP_REPORT=https://10.220.1.5:8443
 # VUE_APP_REPORT=https://10.112.33.5:8443
+VUE_APP_REPORT2=https://10.112.33.5:8085
 
 # VUE_APP_URL=https://10.220.1.5:5300
 VUE_APP_URL=https://10.112.33.5:5300

+ 5 - 0
src/App.vue

@@ -575,6 +575,11 @@ export default {
           svg: `<svg t="1711617616189" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="71308" width="25" height="25"><path d="M787.4 918H238.8c-72 0-130.6-58.6-130.6-130.6V238.8c0-72 58.6-130.6 130.6-130.6h548.6c72 0 130.6 58.6 130.6 130.6v548.6c0 72-58.6 130.6-130.6 130.6zM238.8 168.2c-38.9 0-70.6 31.7-70.6 70.6v548.6c0 38.9 31.7 70.6 70.6 70.6h548.6c38.9 0 70.6-31.7 70.6-70.6V238.8c0-38.9-31.7-70.6-70.6-70.6H238.8z" p-id="71309" fill="#33CAB7"></path><path d="M451.1 728.8c-3.1 0-6.3-0.5-9.5-1.5-15.7-5.2-24.2-22.2-19-38l128-383.9c5.2-15.7 22.2-24.2 38-19 15.7 5.2 24.2 22.2 19 38l-128 383.9c-4.2 12.5-15.9 20.5-28.5 20.5zM643.1 661.9c-8.3 0-16.5-3.4-22.4-10.1-11-12.4-9.9-31.3 2.5-42.4l105.6-94-107.5-113c-11.4-12-10.9-31 1.1-42.4 12-11.4 31-10.9 42.4 1.1l128.8 135.6c5.6 5.9 8.6 13.8 8.2 21.9-0.3 8.1-4 15.7-10 21.2L663 654.3c-5.7 5.1-12.8 7.6-19.9 7.6zM385.9 661.9c-7.1 0-14.2-2.5-19.9-7.6L237.2 539.7c-6.1-5.4-9.7-13-10-21.2-0.3-8.1 2.6-16 8.2-21.9L364.2 361c11.4-12 30.4-12.5 42.4-1.1s12.5 30.4 1.1 42.4L300.2 515.5l105.6 94c12.4 11 13.5 30 2.5 42.4-5.9 6.6-14.2 10-22.4 10z" p-id="71310" fill="#33CAB7"></path></svg>`,
           name: "自定义报表",
         },
+        {
+          index: "/nxreport/scrbTest",
+          svg: `<svg t="1711617616189" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="71308" width="25" height="25"><path d="M787.4 918H238.8c-72 0-130.6-58.6-130.6-130.6V238.8c0-72 58.6-130.6 130.6-130.6h548.6c72 0 130.6 58.6 130.6 130.6v548.6c0 72-58.6 130.6-130.6 130.6zM238.8 168.2c-38.9 0-70.6 31.7-70.6 70.6v548.6c0 38.9 31.7 70.6 70.6 70.6h548.6c38.9 0 70.6-31.7 70.6-70.6V238.8c0-38.9-31.7-70.6-70.6-70.6H238.8z" p-id="71309" fill="#33CAB7"></path><path d="M451.1 728.8c-3.1 0-6.3-0.5-9.5-1.5-15.7-5.2-24.2-22.2-19-38l128-383.9c5.2-15.7 22.2-24.2 38-19 15.7 5.2 24.2 22.2 19 38l-128 383.9c-4.2 12.5-15.9 20.5-28.5 20.5zM643.1 661.9c-8.3 0-16.5-3.4-22.4-10.1-11-12.4-9.9-31.3 2.5-42.4l105.6-94-107.5-113c-11.4-12-10.9-31 1.1-42.4 12-11.4 31-10.9 42.4 1.1l128.8 135.6c5.6 5.9 8.6 13.8 8.2 21.9-0.3 8.1-4 15.7-10 21.2L663 654.3c-5.7 5.1-12.8 7.6-19.9 7.6zM385.9 661.9c-7.1 0-14.2-2.5-19.9-7.6L237.2 539.7c-6.1-5.4-9.7-13-10-21.2-0.3-8.1 2.6-16 8.2-21.9L364.2 361c11.4-12 30.4-12.5 42.4-1.1s12.5 30.4 1.1 42.4L300.2 515.5l105.6 94c12.4 11 13.5 30 2.5 42.4-5.9 6.6-14.2 10-22.4 10z" p-id="71310" fill="#33CAB7"></path></svg>`,
+          name: "生产日报(试运行)",
+        },
       ],
     };
   },

+ 9 - 0
src/api/monthlyPerformanceAnalysis.js

@@ -462,3 +462,12 @@ export function getComponentsTableData(params) {
     params: params
   });
 }
+
+export function getComponentsHistoryData(params) {
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/original/historyData`,
+    method: "GET",
+    params: params
+  });
+}

+ 1 - 1
src/nxfStyle.less

@@ -538,7 +538,7 @@
     }
 
     .el-picker-panel {
-        .el-time-panel {
+        .el-time-panel, .el-picker-panel__body-wrapper {
             border-color: #fff;
             background-color: rgb(3, 7, 19);
             box-shadow: var(--el-box-shadow-light);

+ 9 - 0
src/router/index.js

@@ -1171,6 +1171,15 @@ export const asyncRoutes = [
                     icon: "svg-自定制报表管理",
                 },
             },
+            {
+                path: "scrbTest",
+                name: "scrbTest",
+                component: () => import("@/views/nxReport/scrbTest"),
+                meta: {
+                    title: "生产日报(试运行)",
+                    icon: "svg-自定制报表管理",
+                },
+            },
             // {
             //     path: "fdscqk",
             //     name: "fdscqk",

+ 171 - 1
src/views/economicsOperation/windTurbineMonitor/dataJson.json

@@ -242,6 +242,176 @@
           "value": "2.928"
         }
       ]
-    }
+    },
+    "historyTurbineMonitor": [
+      {
+        "pointValueInDouble": 1.7318182,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768528800000,
+        "pointValue": "1.7318182",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7272131,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768529100000,
+        "pointValue": "1.7272131",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7231708,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768529400000,
+        "pointValue": "1.7231708",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7348387,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768529700000,
+        "pointValue": "1.7348387",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.74464,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768530000000,
+        "pointValue": "1.74464",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7407937,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768530300000,
+        "pointValue": "1.7407937",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7485039,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768530600000,
+        "pointValue": "1.7485039",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7318182,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768528800000,
+        "pointValue": "1.7318182",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7272131,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768529100000,
+        "pointValue": "1.7272131",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7231708,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768529400000,
+        "pointValue": "1.7231708",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7348387,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768529700000,
+        "pointValue": "1.7348387",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.74464,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768530000000,
+        "pointValue": "1.74464",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7407937,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768530300000,
+        "pointValue": "1.7407937",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7485039,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768530600000,
+        "pointValue": "1.7485039",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7318182,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768528800000,
+        "pointValue": "1.7318182",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7272131,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768529100000,
+        "pointValue": "1.7272131",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7231708,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768529400000,
+        "pointValue": "1.7231708",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7348387,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768529700000,
+        "pointValue": "1.7348387",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.74464,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768530000000,
+        "pointValue": "1.74464",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7407937,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768530300000,
+        "pointValue": "1.7407937",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      },
+      {
+        "pointValueInDouble": 1.7485039,
+        "pointValueInDouble2": 0.0,
+        "pointTime": 1768530600000,
+        "pointValue": "1.7485039",
+        "pointName": "1",
+        "ednaId": "区域集控.惠安风场.一期.风机1105.日平均风速"
+      }
+    ]
   }
 }

+ 124 - 196
src/views/economicsOperation/windTurbineMonitor/historyDetail.vue

@@ -1,81 +1,59 @@
 <template>
-  <div class="historysingleMachine">
-    <div class="historysingleMachine_top">
+  <div class="historyTurbineMonitor">
+    <div class="historyTurbineMonitor_top">
       <div class="stationsv">
         <span class="timeaa">时间:</span>
         <el-date-picker
           v-model="pickerTimer"
-          type="daterange"
+          type="datetimerange"
           range-separator="至"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
           size="mini"
-          format="YYYY/MM/DD"
-          value-format="YYYY-MM-DD"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </div>
+      <div class="stationsv">
+        <span class="timeaa">间隔:</span>
+        <el-input-number v-model="picknum" :min="1" />
+        <span class="timeaa">秒</span>
+      </div>
       <div class="but">
-        <el-button round size="mini" class="buttons" @click="seachData"
+        <el-button round size="mini" class="buttons" @click="funGetHistoryTableData"
           >搜 索</el-button
         >
       </div>
     </div>
     <div class="economicTable1">
       <el-table
-        :data="historysingleMachineData"
+        :data="historyTurbineMonitor"
         stripe
         size="mini"
-        height="calc(100% - 40px)"
+        height="100%"
         ref="historysingleTable"
         style="width: 100%"
       >
         <el-table-column
           align="center"
-          :label="tabIndex === -1 ? '风机' : '逆变器'"
-          width="80"
-          fixed="left"
-        >
-          <template #default="{ row }">
-            <span>{{ tabIndex === -1 ? row.wtcode : row.wtname }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="recordDate"
-          label="日期"
-          width="120"
-          fixed="left"
+          label="时间"
         >
           <template #default="scope">
             <span>{{ dateTimeFn(scope.row) }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          v-for="(item, index) in tabIndex === -1 ? tableHeader : tableHeaderGf"
-          :key="index"
-          sortable
-          :prop="item.code"
-          :label="item.title"
-          show-overflow-tooltip
-          header-align="center"
           align="center"
-        >
-          <template #header="scope">
-            <div v-if="scope.column.label.indexOf('(') > 0">
-              <div style="font-size: 14px">
-                {{
-                  scope.column.label.slice(0, scope.column.label.indexOf("("))
-                }}
-              </div>
-              <div style="font-size: 12px">
-                {{ scope.column.label.slice(scope.column.label.indexOf("(")) }}
-              </div>
-            </div>
-            <div v-else>{{ scope.column.label }}</div>
-          </template>
-        </el-table-column>
+          prop="ednaId"
+          label="测点"
+         />
+         <el-table-column
+          align="center"
+          prop="pointValue"
+          label="值"
+         />
       </el-table>
-      <el-pagination
+      <!-- <el-pagination
         @current-change="handleCurrentChange"
         :current-page="page.currentPage"
         :page-size="page.pagesize"
@@ -84,184 +62,128 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="page.total"
       >
-      </el-pagination>
+      </el-pagination> -->
+    </div>
+    <div class="echarts">
+      <div style="height: 100%; margin-top: 10px;padding-top: 10px">
+        <div id="comonentsEcharts" style="width: 100vw; height: 330px" ></div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import {
-  getApihistorywindturbinegoodnesslist,
-  getApihistorywindturbinegoodnesslistGf,
-  getApiequipmentListByWp,
+  getComponentsHistoryData
 } from "@/api/monthlyPerformanceAnalysis";
+import dayjs from "dayjs";
+import dataJson from "./dataJson.json";
 export default {
   props: {
-    // historyCompanyOptions: {
-    //   type: Array,
-    //   default: () => [],
-    // },
-    tabIndex: { type: Number, required: true },
-    historyStationOptions: {
-      type: Array,
-      default: () => [],
+    hiswindVal: {
+      type: String,
+      default: () => ""
     },
+    hisuniVal: {
+      type: String,
+      default: () => ""
+    }
   },
   data() {
     return {
-      //   hiscompanyVal: "",
-      hisstationVal: "",
-      hiswindVal: "",
+      picknum: 300,
       pickerTimer: [],
-      historysingleMachineData: [],
-      hisWindOptions: [],
-      showBtn: true,
+      historyTurbineMonitor: [],
       page: {
         pagesize: 20,
         currentPage: 1,
         total: 0,
       },
-      tableHeader: [
-        { title: "日发电量(万kWh)", code: "rfdl" },
-        { title: "月发电量(万kWh)", code: "yfdl" },
-        { title: "年发电量(万kWh)", code: "nfdl" },
-        { title: "日平均风速", code: "rpjfs" },
-        { title: "月平均风速", code: "ypjfs" },
-        { title: "年平均风速", code: "npjfs" },
-        { title: "日运行小时(h)", code: "ryxxs" },
-        { title: "月运行小时(h)", code: "yyxxs" },
-        { title: "年运行小时(h)", code: "nyxxs" },
-        { title: "日待机小时(h)", code: "rdjxs" },
-        { title: "月待机小时(h)", code: "ydjxs" },
-        { title: "年待机小时(h)", code: "ndjxs" },
-        { title: "日故障小时(h)", code: "rgzxs" },
-        { title: "月故障小时(h)", code: "ygzxs" },
-        { title: "年故障小时(h)", code: "ngzxs" },
-        { title: "日检修小时(h)", code: "rjxxs" },
-        { title: "月检修小时(h)", code: "yjxxs" },
-        { title: "年检修小时(h)", code: "njxxs" },
-        { title: "日中断小时(h)", code: "rzdxs" },
-        { title: "月中断小时(h)", code: "yzdxs" },
-        { title: "年中断小时(h)", code: "nzdxs" },
-        { title: "日有效风时(h)", code: "ryxfs" },
-        { title: "月有效风时(h)", code: "yyxfs" },
-        { title: "年有效风时(h)", code: "nyxfs" },
-        { title: "日损失电量(万kWh)", code: "rssdl" },
-        { title: "月损失电量(万kWh)", code: "yssdl" },
-        { title: "年损失电量(万kWh)", code: "nssdl" },
-        { title: "日停机次数", code: "rtjcs" },
-        { title: "月停机次数", code: "ytjcs" },
-        { title: "年停机次数", code: "ntjcs" },
-        { title: "日设备可利用率", code: "rsbklyl" },
-        { title: "月设备可利用率", code: "ysbklyl" },
-        { title: "年设备可利用率", code: "nsbklyl" },
-        { title: "日平均温度", code: "rpjwd" },
-        { title: "月平均温度", code: "ypjwd" },
-        { title: "年平均温度", code: "npjwd" },
-      ],
-      tableHeaderGf: [
-        { title: "型号", code: "model" },
-        { title: "日系统效率", code: "rxtxl" },
-        { title: "日离散率", code: "rlsl" },
-        { title: "日转换效率", code: "rzhxl" },
-        { title: "月系统效率", code: "yxtxl" },
-        { title: "月离散率", code: "ylsl" },
-        { title: "月转换效率", code: "yzhxl" },
-        { title: "年系统效率", code: "nxtxl" },
-        { title: "年离散率", code: "nlsl" },
-        { title: "年转换效率", code: "nzhxl" },
-      ],
     };
   },
+  mounted() {
+    // this.historyTurbineMonitor = dataJson.data.historyTurbineMonitor
+    this.pickerTimer = [
+      dayjs(new Date()).add(-1, "day").format("YYYY-MM-DD HH:mm:ss"),
+      dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss")
+    ]
+    // this.changeData(dataJson.data.historyTurbineMonitor)
+    this.funGetHistoryTableData()
+  },
   methods: {
-    async init(row) {
-      //   this.hiscompanyVal = row.companyId;
-      this.hisstationVal = row.windtpowerstationId;
-      this.hiswindVal = row.windturbineId;
-      await this.getTableData();
-    },
-    dateTimeFn(row) {
-      return row.recordDate
-        ? row.recordDate.substring(0, row.recordDate.indexOf("T"))
-        : row.date.substring(0, row.date.indexOf("T"));
-    },
-    headerArr(label) {
-      let arr = label.split("");
-      let Newarr = [];
-      let num = 0;
-      let str = "";
-      arr.forEach((it, index) => {
-        num++;
-        str += it;
-        if (label.indexOf(it) + 1 !== label.length) {
-          if (num % 2 === 0) {
-            Newarr.push(str);
-            str = "";
-          }
-        } else {
-          Newarr.push(str);
+    funGetHistoryTableData() {
+      let that = this;
+      let params = {
+        startTs: new Date(that.pickerTimer[0]).getTime() / 1000,
+        endTs: new Date(that.pickerTimer[1]).getTime() / 1000,
+        windturbineId: that.hiswindVal,
+        uniformCode: that.hisuniVal,
+        interval: that.picknum
+      }
+      getComponentsHistoryData(params).then((res) => {
+        if (res) {
+          that.changeData(res)
         }
       });
-      return Newarr;
     },
-    async getWindPowerStation() {
-      const { data } = await getApiequipmentListByWp({
-        wpid: this.hisstationVal,
+    changeData(res) {
+      this.historyTurbineMonitor = res
+      let xAxis = []
+      let series = []
+      res.forEach(it => {
+        xAxis.push(dayjs(it.pointTime).format("MM-DD HH:mm:ss"))
+        series.push(it.pointValue)
       });
-      this.hisWindOptions = data.data;
-      if (!this.hiswindVal && data.data.length) {
-        this.hiswindVal = data.data[0].id;
-      }
-    },
-    // changeBtn(id) {
-    //   this.tabIndex = id;
-    //   this.$emit("getHisStationOptions", this.tabIndex, this.hiscompanyVal);
-    //   this.getTableData();
-    // },
-    changeStation(val) {
-      this.hisstationVal = val;
-      this.hiswindVal = "";
-      this.getWindPowerStation();
-    },
-    changeWind(val) {
-      this.hiswindVal = val;
-      this.getTableData();
-    },
-    seachData() {
-      this.getTableData();
+      this.getPowerLine(
+        xAxis,
+        series,
+        "comonentsEcharts"
+      );
     },
-    async getTableData() {
-      let params = {
-        type: this.tabIndex,
-        pageNum: this.page.currentPage,
-        pageSize: this.page.pagesize,
-        beginDate: this.pickerTimer[0],
-        endDate: this.pickerTimer[1],
-        wpId: this.hisstationVal,
-        wtId: this.hiswindVal,
+    getPowerLine(
+      xAxis,
+      series,
+      name
+    ) {
+      let myChart;
+
+      let option = {
+        tooltip: {
+          trigger: "axis",
+        },
+        grid: {
+          left: "3%",
+          right: "5%",
+          bottom: "0",
+          height: "300px",
+          containLabel: true,
+        },
+        xAxis: {
+          type: 'category',
+          data: xAxis
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: series,
+            type: 'line',
+          }
+        ]
       };
-      let datas = [];
 
-      //   this.historysingleMachineData = dataJson.data.data.records;
-      //   this.page.total = dataJson.data.data.length;
-      if (this.tabIndex == -1) {
-        datas = await getApihistorywindturbinegoodnesslist(params);
-        this.historysingleMachineData = datas.data.data.records;
-        this.page.total = datas.data.data.total;
-      } else {
-        // datas = await getApihistorywindturbinegoodnesslistGf(params);
-        // this.historysingleMachineData = datas.data.data;
-        // this.page.total = datas.data.data.length;
-      }
-    },
-    handleSizeChange(val) {
-      this.page.currentPage = 1;
-      this.page.pagesize = val;
-      this.getTableData();
+      // 基于准备好的dom,初始化echarts实例
+      let dom = document.getElementById(name);
+      dom && dom.removeAttribute("_echarts_instance_");
+      myChart = this.$echarts.init(dom);
+      myChart.setOption(option);
+      window.addEventListener("resize", () => {
+        myChart.resize();
+      });
     },
-    handleCurrentChange(val) {
-      this.page.currentPage = val;
-      this.getTableData();
+    dateTimeFn(row) {
+      return dayjs(row.pointTime).format("YYYY-MM-DD HH:mm:ss")
     },
     //转换时间
     getchangeTime(date) {
@@ -277,9 +199,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.historysingleMachine {
+.historyTurbineMonitor {
   height: 100%;
-  .historysingleMachine_top {
+  .historyTurbineMonitor_top {
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -332,7 +254,13 @@ export default {
     }
   }
   .economicTable1 {
-    height: calc(100% - 58px);
+    height: 55vh;
+  }
+  .echarts {
+    background: #142446 !important;
+    border-radius: 5px;
+    width: 100%;
+    height: 350px;
   }
 }
 .el-pagination ::v-deep {

+ 42 - 24
src/views/economicsOperation/windTurbineMonitor/index.vue

@@ -60,10 +60,17 @@
             align="center"
           >
             <template #header>
-              <div style="padding: 5px 0">
-                <div style="font-size: 14px">{{item.label}}</div>
-                <div style="font-size: 12px;color:#90a3b2">{{item.title}}</div>
-              </div>
+              <!-- <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="item.message"
+                placement="top"
+              > -->
+                <div style="padding: 5px 0">
+                    <div style="font-size: 14px">{{item.label}}</div>
+                    <div style="font-size: 12px;color:#90a3b2">{{item.title}}</div>
+                </div>
+              <!-- </el-tooltip> -->
             </template>
           </el-table-column>
         </el-table>
@@ -99,12 +106,14 @@
     >
       <template #title>
         <div class="dialog-title">
-          <div class="title">{{ dialogTitle }}</div>
+          <div class="title">{{hiswindVal}}风机{{hisuniVal}}测点{{dialogTitle}}</div>
         </div>
       </template>
       <div style="height: 100%">
         <history-detail
           ref="windhistoryDetail"
+          :hiswindVal="hiswindVal"
+          :hisuniVal="hisuniVal"
         >
         </history-detail>
       </div>
@@ -144,7 +153,8 @@ export default {
       pickerTimer: [],
       componentsData: [],
       selectComponentsData: [],
-
+      hiswindVal: "",
+      hisuniVal: "",
     };
   },
   watch: {},
@@ -161,20 +171,22 @@ export default {
         value: "UP2000-130"
       }
     ]
-    // this.tableColumn = [
-    //   {
-    //     label: "日平均风速",
-    //     title: "m/s",
-    //     code: "RPJFS"
-    //   },
-    //   {
-    //     label: "IGBT温度1",
-    //     title: "℃",
-    //     code: "AI002"
-    //   }
-    // ]
-    // this.componentsData = dataJson.data.components
-    // this.dataChange(dataJson.data.tableData)
+    this.tableColumn = [
+      {
+        label: "日平均风速",
+        title: "m/s",
+        code: "RPJFS",
+        message: "区域集控.惠安风场.一期.风机1107.日平均风速"
+      },
+      {
+        label: "IGBT温度1",
+        title: "℃",
+        code: "AI002",
+        message: "区域集控.惠安风场.一期.风机1106.IGBT温度1"
+      }
+    ]
+    this.componentsData = dataJson.data.components
+    this.dataChange(dataJson.data.tableData)
     this.dateTime = dayjs().format("YYYY-MM-DD HH:mm:ss"),
     this.getWindData();
   },
@@ -186,7 +198,8 @@ export default {
         let obj = {
           label: it.description,
           title: it.unit || "",
-          code: it.uniformCode
+          code: it.uniformCode,
+          message: it.code
         }
         this.tableColumn.push(obj)
       })
@@ -272,8 +285,12 @@ export default {
       }
     },
     cellClick(row, column, cell, event) {
-      this.dialogVisible = true;
-      this.dialogTitle = "历史数据查询";
+      if (column.property !== "code") {
+        this.dialogVisible = true;
+        this.dialogTitle = "历史数据查询";
+        this.hiswindVal = row.code 
+        this.hisuniVal = column.property
+      }
     },
     headerClick() {
       this.componentsVisible = true
@@ -428,7 +445,6 @@ export default {
 .el-overlay {
   .el-overlay-dialog {
     overflow-y: hidden !important;
-
     .componentsDia{
       margin-top: 10vh !important;
       .el-dialog__header{
@@ -441,6 +457,8 @@ export default {
       }
     }
     .historyDetailModel{
+      overflow-x: hidden !important;
+
       .el-dialog__header{
         .dialog-title{
           padding-left: 20px;

+ 37 - 0
src/views/nxReport/scrbTest/index.vue

@@ -0,0 +1,37 @@
+<template>
+  <div style="height: 100%">
+    <iframe
+      :src="url"
+      width="100%"
+      height="100%"
+      frameborder="0"
+      scrolling="auto"
+    ></iframe>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      url:
+        process.env.VUE_APP_REPORT2 +
+        "/jmreport/shareView/1171680579804438528?shareToken=cf8ab1ffe8478906e23dca80095a118d",
+    };
+  },
+};
+</script>
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+
+  .el-input {
+    width: 200px;
+  }
+}
+</style>