问题修改

.env.development

@@ -28,5 +28,5 @@ VUE_APP_REPORT=http://10.220.1.5:8001
 VUE_APP_GENERAT_URL=http://10.220.1.5:6060
 # VUE_APP_GENERAT_URL=http://10.112.33.5:6060
 
-VUE_APP_WS_URL=ws://10.220.1.5:6015
-# VUE_APP_WS_URL=ws://10.112.33.5:6015
+VUE_APP_WS_URL=ws://10.220.1.5:6014
+# VUE_APP_WS_URL=ws://10.112.33.5:6014

src/components/alarm-badge/index.vue

@@ -395,7 +395,7 @@ export default {
       };
       if (params.alarmType == "windturbine") {
         // params.stationid = "SXJ_KGDL_DJY_FDC_STA";
-        params.stationid = ""
+        params.stationid = "";
       } else if (params.alarmType == "inverter") {
         params.stationid = "SXJ_KGDL_JR_GDC_STA";
       }
@@ -533,7 +533,7 @@ export default {
     // websocket启动
     createWebSocket1() {
       //   let webSocketLink = `ws://192.168.1.102:6014/websocket/${this.$store.state.user.userId}_${this.$store.state.user.authToken}`;
-      let webSocketLink1 = `${process.env.VUE_APP_WS_URL}/websocket/nxf_${this.$store.state.user.authToken}`; // webSocket地址
+      let webSocketLink1 = `${process.env.VUE_APP_WS_URL}/websocket/nxf${this.$store.state.user.authToken}`; // webSocket地址
       try {
         if ("WebSocket" in window) {
           this.socketObj1 = new WebSocket(webSocketLink1);
@@ -607,7 +607,7 @@ export default {
     },
     // 接收到消息的回调
     getMessageCallback1: function (msg) {
-        console.log("msg11=====>>>", msg);
+      console.log("msg11=====>>>", msg);
       if (Object.keys(msg) && msg.data == "ok") {
         // 心跳回复——心跳检测重置
         // 收到心跳检测回复就说明连接正常

src/views/economicsOperation/nxfHomePage/index.vue

@@ -259,7 +259,7 @@
         watch: {
             $route: {
                 handler(val) {
-                    debugger
+                    // debugger
                     if (val.path !== "/economicsOperation") {
                         clearInterval(this.timmer);
                         this.timmer = null;

src/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue

@@ -259,7 +259,7 @@ const tableColumn = ref([]);
 const tableLoading = ref(false);
 const tableData = ref([]);
 /**tab  */
-const activeTab = ref("1");
+const activeTab = ref("2");
 /**chart Data */
 const xAxisData = ref([]);
 const chartRef = ref(); //chart 的ref
@@ -286,7 +286,7 @@ const xdLossTableDataColumn = ref([
   },
   {
     prop: "xdss",
-    label: "限电电量",
+    label: "限电电量(万kWh)",
   },
   {
     prop: "recordDate",
@@ -297,7 +297,7 @@ const lossDataParams = ref({
   startTs: 0,
   endTs: 0,
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 20,
   total: 0,
 });
 const getXdLossData = (params) => {

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/components/search.vue

@@ -62,6 +62,7 @@
 <script setup name="search">
 import { onMounted, reactive, ref } from "vue";
 import httpRequest from "@/utils/request.js";
+import dayjs from "dayjs";
 import SubmitBtn from "@/components/generatingCapacityComponent/SubmitBtn.vue";
 // import configStationJson from './configStation.json'
 
@@ -103,12 +104,12 @@ const getWtList = async () => {
 /**导出 */
 const emits = defineEmits(["submit"]);
 const funSubmit = async () => {
-  const startDate = new Date(queryForm.st).setHours(0, 0, 0, 0);
-  const endDate = new Date(queryForm.et).setHours(0, 0, 0, 0);
+  const startTs = dayjs(queryForm.st).unix();
+  const endTs = dayjs(queryForm.et).unix();
   const query = {
     windturbineId: queryForm.wt.toString() || "",
-    startTs: new Date(startDate).getTime() / 1000,
-    endTs: new Date(endDate).getTime() / 1000,
+    startTs,
+    endTs,
     interval: queryForm.interval,
   };
   switch (queryForm.interval) {

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/index.vue

@@ -228,7 +228,7 @@ const tableColumn = ref([]);
 const tableLoading = ref(false);
 const tableData = ref([]);
 /**tab  */
-const activeTab = ref("1");
+const activeTab = ref("2");
 /**chart Data */
 const xAxisData = ref([]);
 const chartRef = ref(); //chart 的ref
@@ -244,9 +244,9 @@ const createMark = (markInfo) => {
 };
 /**submit */
 const funSubmit = (params) => {
-  activeTab.value = "2";
+  //   activeTab.value = "2";
   tableShowId.value = "";
-  tableName.value = "AGC";
+  tableName.value = "风机功率风速分析";
   tableLoading.value = true;
   httpRequest
     .get("/agc/windturbine/curve", {

src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue

@@ -68,7 +68,7 @@
                 v-for="item in wtArray"
                 :key="item.id"
                 :value="item.id"
-                :label="item.name"
+                :label="item.aname"
               />
             </el-select>
           </div>
@@ -949,7 +949,7 @@ import {
   getApibjphlist,
   getApiglchat,
   getApifjfzy,
-  getApiequipmentList,
+  getApiequipmentListByWp2,
   getApiWeatherstation,
   getApiComMGTWP,
   getApiComMGTWT,
@@ -1261,7 +1261,7 @@ export default {
         lineIds: "",
         type: 0,
       };
-      const { data: datas } = await getApiequipmentList(params);
+      const { data: datas } = await getApiequipmentListByWp2(params);
       this.wtArray = datas.data;
       //   this.wtId = datas.data[0].id;
     },
@@ -1460,18 +1460,18 @@ export default {
         pageNum: "1",
         pageSize: "5",
       };
-      //   const { data: datas } = await getApigzjllist(params);
-      //   if (datas && datas.data && datas.data.records.length > 0) {
-      //     datas.data.records.forEach((ele) => {
-      //       ele.stopTime = new Date(ele.stopTime).formatDate(
-      //         "yyyy-MM-dd hh:mm:ss"
-      //       );
-      //       ele.starttime = ele.starttime
-      //         ? new Date(ele.starttime).formatDate("yyyy-MM-dd hh:mm:ss")
-      //         : "";
-      //     });
-      //     that.stopTableData.data = datas.data.records;
-      //   }
+        const { data: datas } = await getApigzjllist(params);
+        if (datas && datas.data && datas.data.records.length > 0) {
+          datas.data.records.forEach((ele) => {
+            ele.stopTime = new Date(ele.stopTime).formatDate(
+              "yyyy-MM-dd hh:mm:ss"
+            );
+            ele.starttime = ele.starttime
+              ? new Date(ele.starttime).formatDate("yyyy-MM-dd hh:mm:ss")
+              : "";
+          });
+          that.stopTableData.data = datas.data.records;
+        }
     },
     // tab1 - 获取当日限电数据
     async getXdData() {
@@ -1482,18 +1482,18 @@ export default {
         pageNum: "1",
         pageSize: "5",
       };
-      //   const { data: datas } = await getApixdjllist(params);
-      //   if (datas && datas.data && datas.data.records.length > 0) {
-      //     datas.data.records.forEach((ele) => {
-      //       ele.stopTime = new Date(ele.stopTime).formatDate(
-      //         "yyyy-MM-dd hh:mm:ss"
-      //       );
-      //       ele.starttime = ele.starttime
-      //         ? new Date(ele.starttime).formatDate("yyyy-MM-dd hh:mm:ss")
-      //         : "";
-      //     });
-      //     that.xdTableData.data = datas.data.records;
-      //   }
+        const { data: datas } = await getApixdjllist(params);
+        if (datas && datas.data && datas.data.records.length > 0) {
+          datas.data.records.forEach((ele) => {
+            ele.stopTime = new Date(ele.stopTime).formatDate(
+              "yyyy-MM-dd hh:mm:ss"
+            );
+            ele.starttime = ele.starttime
+              ? new Date(ele.starttime).formatDate("yyyy-MM-dd hh:mm:ss")
+              : "";
+          });
+          that.xdTableData.data = datas.data.records;
+        }
     },
     // tab2 ----------------------------------------
     // tab2 - 获取日发电量信息
@@ -1815,11 +1815,11 @@ export default {
       } else {
         this.hisWpid = this.wpId;
       }
-      if (index == 2) {
-        this.wpId = this.hisSubid ? this.hisSubid : this.cftlist[0].id;
-      } else {
-        this.wpId = this.hisWpid ? this.hisWpid : this.wpArray[0].id;
-      }
+    //   if (index == 2) {
+    //     this.wpId = this.hisSubid ? this.hisSubid : this.cftlist[0].id;
+    //   } else {
+    //     this.wpId = this.hisWpid ? this.hisWpid : this.wpArray[0].id;
+    //   }
       this.tabIndex = index;
       this.search();
     },