BUG修复、若干页面接口 404 修复

src/api/apiConfig.js

@@ -1,2 +1,2 @@
-// export const baseURL = "http://192.168.1.103:6015/";
+// export const baseURL = "http://192.168.1.108:6015/";
 export const baseURL = "http://10.81.3.154:6015/";

src/components/alarmPopupa/index.vue

@@ -74,6 +74,7 @@ export default {
       timeConnect: 0,
       limitConnect: 5,
       columnNumber: 2,
+      showSocketLog: false,
       requestAlarmHistoryParams: [
         {
           alarmType: "booststation",
@@ -122,10 +123,10 @@ export default {
           this.timeoutObj = setTimeout(() => {
             // 这里向后端发送一个心跳检测，后端收到后，会返回一个心跳回复
             this.vueThis.socketObj.send("HeartBeat");
-            console.log("发送心跳检测");
+            this.showSocketLog && console.log("发送心跳检测");
             this.serverTimeoutObj = setTimeout(() => {
               // 如果超过一定时间还没重置计时器，说明websocket与后端断开了
-              console.log("未收到心跳检测回复");
+              this.showSocketLog && console.log("未收到心跳检测回复");
               // 关闭WebSocket
               this.vueThis.socketObj.close();
             }, this.timeout);
@@ -342,7 +343,7 @@ export default {
         this.audioElement = new Audio();
         this.audioElement.src = "./static/sound/lv4.mp3";
         this.audioElement.addEventListener("ended", () => {
-          this.audioElement.removeEventListener(
+          this.audioElement?.removeEventListener(
             "ended",
             this.stopPlayAudioEffect
           );
@@ -393,7 +394,6 @@ export default {
     // websocket启动
     createWebSocket() {
       let webSocketLink = `ws://10.81.3.154:6014/websocket/${this.$store.state.user.userId}_${this.$store.state.user.authToken}`; // webSocket地址
-      //   let webSocketLink = `ws://192.168.1.108:6014/websocket/${this.$store.state.user.userId}_${this.$store.state.user.authToken}`; // webSocket地址
       try {
         if ("WebSocket" in window) {
           this.socketObj = new WebSocket(webSocketLink);
@@ -401,7 +401,7 @@ export default {
         // websocket事件绑定
         this.socketEventBind();
       } catch (e) {
-        console.log("catch" + e);
+        this.showSocketLog && console.log("catch" + e);
         // websocket重连
         this.socketReconnect();
       }
@@ -432,7 +432,7 @@ export default {
       this.socketReconnectLock = true;
       this.socketReconnectTimer && clearTimeout(this.socketReconnectTimer);
       this.socketReconnectTimer = setTimeout(() => {
-        console.log("WebSocket:重连中...");
+        this.showSocketLog && console.log("WebSocket:重连中...");
         this.socketReconnectLock = false;
         // websocket启动
         this.createWebSocket();
@@ -440,19 +440,19 @@ export default {
     },
     // 连接成功建立的回调
     onopenCallback: function (event) {
-      console.log("WebSocket:已连接");
+      this.showSocketLog && console.log("WebSocket:已连接");
       // 心跳检测重置
       this.heartCheck.reset().start();
     },
     // 连接发生错误的回调
     onerrorCallback: function (event) {
-      console.log("WebSocket:发生错误");
+      this.showSocketLog && console.log("WebSocket:发生错误");
       // websocket重连
       this.socketReconnect();
     },
     // 连接关闭的回调
     oncloseCallback: function (event) {
-      console.log("WebSocket:已关闭");
+      this.showSocketLog && console.log("WebSocket:已关闭");
       // 心跳检测重置
       this.heartCheck.reset();
       if (!this.socketLeaveFlag) {
@@ -465,7 +465,7 @@ export default {
     },
     // 向后端发送数据的回调
     onsendCallback: function () {
-      console.log("WebSocket:发送信息给后端");
+      this.showSocketLog && console.log("WebSocket:发送信息给后端");
     },
     // 接收到消息的回调
     getMessageCallback: function (msg) {
@@ -473,12 +473,12 @@ export default {
       if (Object.keys(msg) && msg.data == "ok") {
         // 心跳回复——心跳检测重置
         // 收到心跳检测回复就说明连接正常
-        console.log("收到心跳检测回复");
+        this.showSocketLog && console.log("收到心跳检测回复");
         // 心跳检测重置
         this.heartCheck.reset().start();
       } else {
         // 普通推送——正常处理
-        console.log("收到推送消息");
+        this.showSocketLog && console.log("收到推送消息");
         // 相关处理
         let alarmItem = JSON.parse(msg.data);
         if (alarmItem) {
@@ -502,7 +502,7 @@ export default {
 
     //     this.ws.onopen = () => {
     //       this.timeConnect = 0;
-    //       console.log("WebSocket 服务已建立");
+    //       this.showSocketLog && console.log("WebSocket 服务已建立");
     //     };
 
     //     this.ws.onerror = () => {

src/pages/alarmConfig/bj_windturbine/windturbine.vue

@@ -372,7 +372,7 @@ const export2Excel = async () => {
   });
 
   ElMessage.success(`导出成功!`);
-  outExportExcel(tableHeader, tableKey, res.records, "设备报警配置导出excel");
+  outExportExcel(tableHeader, tableKey, res.data.records, "设备报警配置导出excel");
 };
 // 模板下载
 const outExe = () => {

src/pages/baseData/fan_components/custom.vue

@@ -323,8 +323,8 @@ const tableKey = [
 const export2Excel = async () => {
   let { name, station, rank, modelId, category } = query;
   const res = await custombj_fetchTableData({
-    pagenum: 1,
-    pagesize: 999999,
+    pageNum: 1,
+    pageSize: 999999,
     name,
     station,
     rank,

src/pages/baseData/fan_components/windturbine.vue

@@ -281,8 +281,8 @@ const tableKey = [
 const export2Excel = async () => {
   let { name, stationId, modelId } = query;
   const res = await windturbinebj_fetchTableData({
-    pagenum: 1,
-    pagesize: 999999,
+    pageNum: 1,
+    pageSize: 999999,
     name,
     stationId,
     modelId,

src/pages/customWarning/index.vue

@@ -291,7 +291,7 @@ import {
   getWpList,
   confirmAlart,
 } from "/@/api/api.js";
-import { ElMessage } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
 import { initWebSocket } from "/@/websocket/indextest";
 import { outExportExcel } from "/@/utils/exportExcel"; //引入文件
 import { useStore } from "vuex";

src/pages/safe/datasearch.vue

@@ -325,7 +325,7 @@ const filterAIList = computed(() =>
 
 // get 实时data
 const getLatest = async (stationId, AIlist) => {
-  const data = await getAdapterLatest(stationId, AIlist);
+  const data = await getAdapterLatest(stationId, AIlist, state.stationId);
   state.AIList?.forEach((e) => {
     if (e.uniformCode.indexOf("AI") !== -1) {
       e.value = Number(data[e.uniformCode]?.doubleValue).toFixed(2);
@@ -341,12 +341,9 @@ const getLatest = async (stationId, AIlist) => {
 const getHistory = async (stationId, AIpoint) => {
   let startTs = dayjs(state.pickerVal[0]).valueOf();
   let endTs = dayjs(state.pickerVal[1]).valueOf();
-  let baseUrl = "";
-  if (stationId.includes("G_IN")) {
-    baseUrl = "http://10.81.3.152:8099/";
-  } else {
-    baseUrl = "http://10.81.3.152:8098/";
-  }
+  const baseUrl = `http://10.81.3.162:801${
+    /FDC/.test(state.stationId) ? "1" : "2"
+  }/`;
   const data = await getAdapterHistory(
     stationId,
     AIpoint,
@@ -371,12 +368,9 @@ const getHistory = async (stationId, AIpoint) => {
 const getHistorysnap = async (stationId, AIpoint, interval) => {
   let startTs = dayjs(state.pickerVal[0]).valueOf();
   let endTs = dayjs(state.pickerVal[1]).valueOf();
-  let baseUrl = "";
-  if (stationId.includes("G_IN")) {
-    baseUrl = "http://10.81.3.152:8099/";
-  } else {
-    baseUrl = "http://10.81.3.152:8098/";
-  }
+  const baseUrl = `http://10.81.3.162:801${
+    /FDC/.test(state.stationId) ? "1" : "2"
+  }/`;
   const data = await getAdapterHistorysnap(
     stationId,
     AIpoint,