Merge branch 'baiyanting' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into baiyanting

src/App.vue

@@ -220,6 +220,9 @@ export default {
           this.socketLeaveFlag = true;
           // 关闭WebSocket
           this.socketObj.close();
+        } else {
+          this.getBooster();
+          this.getCftlist();
         }
         if (res) {
           this.getBooster();

src/api/zhbj/index.js

@@ -29,7 +29,7 @@ export function GetTableData(data) {
         : ""
     }&pageNum=${data.pageNum}&pageSize=${data.pageSize}&description=${
       data.description
-    }`,
+    }${data.id ? `&id=${data.id}` : ""}`,
     method: "get",
   });
 }
@@ -51,4 +51,4 @@ export const confirmAlart = (data) => {
     data,
     timeout: 60000,
   });
-};
+};

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

@@ -848,7 +848,7 @@ export default {
       GetPointFitting({
         begin: dayjs().startOf("date").format("YYYY-MM-DD HH:mm:ss"),
         end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
+        interval: 60 * 60,
         pointIds: pointId,
       }).then((res) => {
         if (res.data.data.length) {
@@ -877,7 +877,7 @@ export default {
           .subtract(1, "days")
           .endOf("date")
           .format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
+        interval: 60 * 60,
         pointIds: pointId,
       }).then((res) => {
         if (res.data.data.length) {

src/views/stateMonitor/factoryMonitor/windPowerPlant/windhome/index.vue

@@ -814,7 +814,7 @@ export default {
       GetPointFitting({
         begin: dayjs().startOf("date").format("YYYY-MM-DD HH:mm:ss"),
         end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
+        interval: 60 * 60,
         pointIds: pointId,
       }).then((res) => {
         if (res.data.data.length) {
@@ -843,7 +843,7 @@ export default {
           .subtract(1, "days")
           .endOf("date")
           .format("YYYY-MM-DD HH:mm:ss"),
-        interval: 60 * 30,
+        interval: 60 * 60,
         pointIds: pointId,
       }).then((res) => {
         if (res.data.data.length) {