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

src/utills/func.js

@@ -10,6 +10,7 @@ export function findUpColor(list, num) {
   let a = list.find((item) => item.id == num);
   return a.color;
 }
+
 // utill-合并数组 第一个数组为新对象的key，第二个为新对象的value
 export function getNewObj(a, b) {
   const obj = {};
@@ -19,4 +20,22 @@ export function getNewObj(a, b) {
   return obj;
 }
 
+//utill-数组分组
+export function chunkArray(arr, chunkSize) {
+  // 验证输入参数
+  if (!Array.isArray(arr) || typeof chunkSize !== "number" || chunkSize <= 0) {
+    throw new Error(
+      "Invalid input. Please provide a valid array and a positive chunk size."
+    );
+  }
+
+  // 初始化二维数组
+  const result = [];
 
+  // 遍历原始数组，按照指定长度分组
+  for (let i = 0; i < arr.length; i += chunkSize) {
+    result.push(arr.slice(i, i + chunkSize));
+  }
+
+  return result;
+}

src/views/stateMonitor/DetailMatrix/index.vue

@@ -361,7 +361,7 @@ import qushiDialog from "@/components/qushi/qushiDialog.vue";
 import windDetail from "@/components/windDetail/index";
 import lightDetail from "@/components/lightDetial/index.vue";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
-import { deepClone, findUpColor } from "@/utills/func.js";
+import { deepClone, findUpColor,chunkArray } from "@/utills/func.js";
 import HeaderNav from "@/components/headerNavSta/index.vue";
 import api from "@api/cockpit/matrix/index.js";
 export default {
@@ -712,7 +712,7 @@ export default {
   methods: {
     handleMouse() {},
     deepClone,
-    findUpColor,
+    findUpColor,chunkArray,
     // 头部tab选择
     typeFlag(activeTab) {
       this.activeTab = activeTab;
@@ -762,28 +762,7 @@ export default {
         });
     },
 
-    chunkArray(arr, chunkSize) {
-      // 验证输入参数
-      if (
-        !Array.isArray(arr) ||
-        typeof chunkSize !== "number" ||
-        chunkSize <= 0
-      ) {
-        throw new Error(
-          "Invalid input. Please provide a valid array and a positive chunk size."
-        );
-      }
-
-      // 初始化二维数组
-      const result = [];
-
-      // 遍历原始数组，按照指定长度分组
-      for (let i = 0; i < arr.length; i += chunkSize) {
-        result.push(arr.slice(i, i + chunkSize));
-      }
-
-      return result;
-    },
+   
 
     // 点击切换状态
     handleClick(val) {

src/views/stateMonitor/LightMatrix/index.vue

@@ -231,12 +231,7 @@
         </el-col>
       </el-row>
     </el-header>
-    <el-scrollbar
-      v-loading="loading"
-      element-loading-background="rgba(4, 12, 11, 0.8)"
-      element-loading-text="加载中..."
-      style="height: calc(100% - 62px)"
-    >
+    <el-scrollbar style="height: calc(100% - 62px)">
       <div
         class="wind_power_plant"
         v-for="(item, index) in showMatrixList"
@@ -413,7 +408,7 @@
 import qushiDialog from "@/components/qushi/qushiDialog.vue";
 import windDetail from "@/components/windDetail/index";
 import lightDetail from "@/components/lightDetial/index.vue";
-import { deepClone } from "@/utills/func.js";
+import { deepClone, chunkArray } from "@/utills/func.js";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import api from "@api/cockpit/matrix/index.js";
 import { setInterval, clearInterval } from "timers";
@@ -486,10 +481,17 @@ export default {
   // 函数
   methods: {
     deepClone,
+    chunkArray,
     typeFlag(activeTab, enterpriseIndex) {
       this.activeTab = activeTab;
       this.tabIndex = activeTab == "all" ? 0 : activeTab == "fc" ? -1 : -2;
       this.enterpriseIndex = enterpriseIndex;
+      this.requestData(true);
+      clearInterval(this.timmer);
+      this.timmer = null;
+      this.timmer = setInterval(() => {
+        this.requestData();
+      }, 5000);
     },
     // 根据风机状态码返回对应 class
     getColor(fjzt) {
@@ -528,7 +530,10 @@ export default {
       }
     },
     // 请求服务
-    requestData() {
+    requestData(first) {
+      if (first) {
+        this.BASE.showLoading();
+      }
       api
         .matrixPush({
           company:
@@ -538,12 +543,23 @@ export default {
           type: this.tabIndex.toString(),
         })
         .then((res) => {
-          this.loading = false;
+          this.BASE.closeLoading();
           if (Object.values(res.data.data).length) {
             this.sourceMap = res.data.data;
-            if (this.fillFjzt) {
+            if (first) {
+              const tempWtArray = this.chunkArray(this.sourceMap.powerVos, 3);
+              this.showMatrixList = tempWtArray[0];
+              for (let i = 1; i < tempWtArray.length; i++) {
+                setTimeout(() => {
+                  this.showMatrixList.push(...tempWtArray[i]);
+                }, 5);
+              }
+            } else {
               this.changeShow(this.fillFjzt);
             }
+            // if (this.fillFjzt) {
+            //   this.changeShow(this.fillFjzt);
+            // }
           } else {
             this.sourceMap = {};
             this.showMatrixList = [];
@@ -604,8 +620,8 @@ export default {
   created() {
     let that = this;
     that.$nextTick(() => {
-      this.loading = true;
-      that.requestData();
+      //   this.loading = true;
+      that.requestData(true);
       that.timmer = setInterval(() => {
         that.requestData();
       }, 5000);