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

src/views/IntegratedAlarm/alarmConfig/customConfig/index.vue

@@ -146,7 +146,13 @@
           v-for="item in state.tableHeader"
           :key="item.code"
           :label="item.title"
-          align="center"
+          :align="
+            item.code == 'description' ||
+            item.code == 'expression' ||
+            item.code == 'name'
+              ? 'left'
+              : 'center'
+          "
           :prop="item.code"
           :minWidth="item.width ? item.width : 60"
           show-overflow-tooltip

src/views/IntegratedAlarm/alarmConfig/historyConfig/index.vue

@@ -104,7 +104,7 @@
             : state.tableHeader1"
           :key="item.code"
           :label="item.title"
-          align="center"
+          :align="item.code == 'description' ? 'left' : 'center'"
           :prop="item.code"
           show-overflow-tooltip
         >

src/views/IntegratedAlarm/alarmConfig/logs/index.vue

@@ -45,27 +45,27 @@
           prop="ruleName"
           label="规则名称"
           width="300"
-          align="center"
+          align="left"
         />
         <el-table-column
           prop="ruleType"
           label="规则类型"
           width="120"
-          align="center"
+          align="left"
         />
         <el-table-column
           prop="stationName"
           label="场站名称"
           width="140"
-          align="center"
+          align="left"
         />
         <el-table-column
           prop="modelId"
           label="风机型号"
           width="200"
-          align="center"
+          align="left"
         />
-        <el-table-column label="更改内容" show-overflow-tooltip>
+        <el-table-column label="更改内容" show-overflow-tooltip align="left">
           <template #default="scope">
             <div v-for="item in scope.row.infoList" :key="item">
               {{ item.fieldName }} :更改前: {{ item.beforValue }}

src/views/IntegratedAlarm/safe/components/safecomponent.vue

@@ -40,7 +40,7 @@
       <el-table-column
         prop="description"
         label="报警信息"
-        align="center"
+        align="left"
         show-overflow-tooltip
       />
       <!-- <el-table-column label="级别" width="80" show-overflow-tooltip>
@@ -131,7 +131,7 @@
             width="100"
             show-overflow-tooltip
           /> -->
-          <el-table-column label="报警描述" align="center">
+          <el-table-column label="报警描述" align="left">
             <template #default="scope">
               <span
                 class="alertDescCursor"
@@ -143,9 +143,13 @@
           <el-table-column
             prop="faultCause"
             label="报警故障原因"
-            align="center"
+            align="left"
             show-overflow-tooltip
-          />
+          >
+            <template #default="{ row }">
+              {{ row.faultCause == "NULL" ? "" : row.faultCause }}
+            </template>
+          </el-table-column>
           <el-table-column
             prop=""
             label="报警解除时间"
@@ -154,7 +158,7 @@
             show-overflow-tooltip
           >
             <template #default="scope">
-              <span>{{ scope.row.endts || scope.row.closeTime }}</span>
+              <span>{{ scope.row.endts || scope.row.closeTime||'' }}</span>
             </template>
           </el-table-column>
           <!-- <el-table-column

src/views/IntegratedAlarm/safe/customWarning/index.vue

@@ -187,6 +187,11 @@
             :width="item.width || ''"
             show-overflow-tooltip
             header-align="center"
+            :align="
+              item.code == 'description' || item.code == 'faultCause'
+                ? 'left'
+                : 'center'
+            "
           >
             <template #default="scope">
               <p :style="item.style && item.style(scope.row)">
@@ -206,7 +211,7 @@
                 </span>
                 <span v-else>
                   {{
-                    scope.row[item.code] != "NULL" ? scope.row[item.code] : "--"
+                    scope.row[item.code] != "NULL" ? scope.row[item.code] : ""
                   }}
                 </span>
               </p>
@@ -256,7 +261,7 @@
                 </span>
                 <span v-else>
                   {{
-                    scope.row[item.code] != "NULL" ? scope.row[item.code] : "--"
+                    scope.row[item.code] != "NULL" ? scope.row[item.code] : ""
                   }}
                 </span>
               </p>

src/views/IntegratedAlarm/safe/dataSearch/index.vue

@@ -91,7 +91,7 @@
             align="center"
             width="120"
           />
-          <el-table-column prop="name" label="名称" align="center" />
+          <el-table-column prop="name" label="名称" align="left" />
           <el-table-column prop="value" label="值" width="120" align="center">
             <template #default="scope">
               <el-tag

src/views/IntegratedAlarm/safe/historyWarning/index.vue

@@ -130,7 +130,8 @@
               format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               start-placeholder="开始"
-              end-placeholder="结束"   popper-class="date-select"
+              end-placeholder="结束"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>
@@ -179,7 +180,11 @@
             :key="item.code"
             :width="item.width || ''"
             show-overflow-tooltip
-            align="center"
+            :align="
+              item.code == 'description' || item.code == 'faultCause'
+                ? 'left'
+                : 'center'
+            "
           >
             <template #default="scope">
               <p :style="item.style && item.style(scope.row)">
@@ -202,7 +207,7 @@
                 </span>
                 <span v-else>
                   {{
-                    scope.row[item.code] != "NULL" ? scope.row[item.code] : "--"
+                    scope.row[item.code] != "NULL" ? scope.row[item.code] : ""
                   }}
                 </span>
               </p>
@@ -245,6 +250,9 @@
                 <span v-else-if="item.code == 'ts'">
                   {{ formatTime(scope.row.ts) }}
                 </span>
+                <span v-else-if="item.code == 'endts'">
+                  {{ scope.row.endts > 0 ? formatTime(scope.row.endts) : "" }}
+                </span>
                 <span
                   :style="`color:${
                     scope.row.confirmed ? '#05bb4c' : 'var(--el-color-danger)'
@@ -255,7 +263,7 @@
                 </span>
                 <span v-else>
                   {{
-                    scope.row[item.code] != "NULL" ? scope.row[item.code] : "--"
+                    scope.row[item.code] != "NULL" ? scope.row[item.code] : ""
                   }}
                 </span>
               </p>

src/views/IntegratedAlarm/safe/realWarning/index.vue

@@ -66,58 +66,6 @@ import Safecom from "@/views/IntegratedAlarm/safe/components/safecomponent.vue";
   width: 100%;
   height: 100%;
   padding: 20px 10px;
-  //   .topCard {
-  //     height: 24vh;
-  //     overflow-y: auto;
-  //     display: flex;
-  //     flex-wrap: wrap;
-  //     justify-content: flex-start;
-  //     align-content: flex-start;
-
-  //     .item {
-  //       width: 194px;
-  //       height: 90px;
-  //       padding: 6px 10px;
-  //       margin: 5px;
-  //       display: flex;
-  //       background-color: #f55d5d;
-  //       flex-direction: column;
-  //       -moz-user-select: none;
-  //       -webkit-user-select: none;
-  //       user-select: none;
-  //       cursor: pointer;
-
-  //       .title {
-  //         color: #fff;
-  //         font-size: 14px;
-  //       }
-
-  //       .warn_content {
-  //         flex: 1;
-  //         font-size: 12px;
-  //         color: rgb(133, 133, 133);
-  //         line-height: 1.3;
-  //         color: #fff;
-  //         overflow: hidden;
-  //         text-overflow: ellipsis;
-  //         display: -webkit-box;
-  //         -webkit-line-clamp: 2;
-  //         -webkit-box-orient: vertical;
-  //       }
-
-  //       .warn_btn {
-  //         display: flex;
-  //         justify-content: space-between;
-  //         font-size: 14px;
-  //         color: #fff;
-
-  //         .el-button--mini {
-  //           min-height: 20px;
-  //           padding: 0px;
-  //         }
-  //       }
-  //     }
-  //   }
 
   .bottomCard {
     display: flex;

src/views/IntegratedAlarm/safe/stopQuery/index.vue

@@ -115,13 +115,17 @@
           :prop="item.prop"
           show-overflow-tooltip
           header-align="center"
-          align="center"
+          :align="
+            item.prop == 'handleWay' || item.prop == 'faultView'
+              ? 'left'
+              : 'center'
+          "
           v-for="(item, index) in tHeader"
           :key="index"
         >
           <template #default="scope">
             <span>
-              {{ scope.row[item.prop] != "NULL" ? scope.row[item.prop] : "--" }}
+              {{ scope.row[item.prop] != "NULL" ? scope.row[item.prop] : "" }}
             </span>
           </template>
         </el-table-column>

src/views/stateMonitor/DetailMatrix/index.vue

@@ -217,6 +217,7 @@
                             : "0.00"
                         }}
                       </div>
+                      <!-- <input style="width: 200px" :value="val.power" /> -->
                     </div>
                     <div class="right-item">
                       <i
@@ -242,6 +243,18 @@
                             : "0.00"
                         }}
                       </div>
+                      <!-- <input
+                        style="width: 200px"
+                        :value="
+                          value.czlx == '-1'
+                            ? val.speed
+                              ? Number(val.speed)?.toFixed(2)
+                              : '0.00'
+                            : val.current
+                            ? Number(val.current)?.toFixed(2)
+                            : '0.00'
+                        "
+                      /> -->
                     </div>
                     <div class="right-item">
                       <i
@@ -267,6 +280,18 @@
                             : "0.00"
                         }}
                       </div>
+                      <!-- <input
+                        style="width: 200px"
+                        :value="
+                          value.czlx == '-1'
+                            ? val.transfer
+                              ? Number(val.transfer)?.toFixed(2)
+                              : '0.00'
+                            : val.voltage
+                            ? Number(val.voltage)?.toFixed(2)
+                            : '0.00'
+                        "
+                      /> -->
                     </div>
                   </div>
                 </div>
@@ -701,12 +726,12 @@ export default {
           if (Object.values(res.data.data).length) {
             this.BASE.closeLoading();
             let sourceMap = res.data.data;
-            // sourceMap.powerVos.forEach((item, index) => {
-            //   item["switch" + index] = true;
-            // });
+
             this.sourceMap = sourceMap;
-            if (this.fillFjzt) {
+            if (this.fillFjzt != "all") {
               this.handleClick(this.fillFjzt);
+            } else {
+              this.showMatrixList = this.sourceMap.powerVos;
             }
           } else {
             this.sourceMap = {};
@@ -714,6 +739,30 @@ 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) {
       this.fillFjzt = val;
@@ -726,6 +775,27 @@ export default {
     },
     // 状态切换改变数据
     handleClickWind() {
+      //   const tempWtArray = this.BASE.deepCopy(sourceMap.powerVos);
+
+      //   tempWtArray?.forEach((ele) => {
+      //     ele.spWtlist = this.chunkArray(ele.wtlist, 100);
+      //   });
+
+      //   sourceMap.powerVos.forEach((ele) => {
+      //     ele.wtlist = [];
+      //   });
+
+      //   for (let i = 0; i < sourceMap.powerVos.length; i++) {
+      //     const ele = sourceMap.powerVos[i];
+      //     for (let j = 0; j < tempWtArray[i]?.spWtlist?.length; j++) {
+      //       setTimeout(() => {
+      //         ele.wtlist = ele.wtlist.concat(tempWtArray[i].spWtlist[j]);
+      //       }, 500);
+      //     }
+      //   }
+
+      //   console.log(11, tempWtArray);
+      //   console.log(22, sourceMap);
       this.loading = false;
       this.showMatrixList = JSON.parse(JSON.stringify(this.sourceMap.powerVos));
       let matrixList = this.sourceMap.powerVos;
@@ -936,7 +1006,15 @@ export default {
       } else {
         this.showMatrixList = this.sourceMap.powerVos;
       }
+      const tempWtArray = this.chunkArray(this.showMatrixList, 3);
+      this.showMatrixList = tempWtArray[0];
+      for (let i = 1; i < tempWtArray.length; i++) {
+        setTimeout(() => {
+          this.showMatrixList.push(...tempWtArray[i]);
+        }, 5);
+      }
     },
+
     // 点击左侧数据弹出曲线
     handleLeftClick(wt, type, wpid) {
       this.displayMatrix = true;

src/views/stateMonitor/alarmCenter/commonAlarm/index.vue

@@ -136,7 +136,7 @@
             sortable
             :prop="item.code"
             :label="item.title"
-            align="center"
+            :align="item.code != 'description' ? 'center' : 'left'"
             :width="item.width"
           >
             <template #default="{ row }">
@@ -148,7 +148,7 @@
               <span v-else-if="item.code == 'endts'">{{
                 row.endts ? getTime(row.endts) : "--"
               }}</span>
-              <span v-else>{{ row[item.code] }}</span>
+              <span v-else>{{ row[item.code] || "--" }}</span>
             </template>
           </el-table-column>
         </el-table>

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

@@ -606,7 +606,6 @@ export default {
         this.stationCode = wpid;
         this.getSingleMatrix(true);
         this.getPowerStationAssets();
-        this.getBarValuesFDL();
       } else {
         clearInterval(this.timer);
         clearInterval(this.time2);
@@ -647,6 +646,7 @@ export default {
             },
           ];
           if (flag) {
+            this.getBarValuesFDL();
             this.getLossValuesAnalyse(this.dates);
           }
         });
@@ -713,11 +713,15 @@ export default {
         }
       }
     },
-    // 改变完成电量数据
+    // 改变日发电量数据
     getBarValuesFDL() {
       GetWpHisdata({ wpid: this.stationCode }).then(({ data }) => {
         let date = data.data.map((item) => item.recordDate);
-        let children = data.data.map((item) => item.rfdldb);
+        let children = data.data.map((item) =>
+          item.recordDate == dayjs().format("YYYY-MM-DD")
+            ? (this.wpInfos.rfdl || 0) * 10000
+            : item.rfdldb
+        );
         this.barList = [
           {
             name: "发电量",

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

@@ -601,7 +601,6 @@ export default {
         this.getSingleMatrix(true);
         this.getPowerStationAssets();
         this.getPoints();
-        this.getBarValuesFDL();
       } else {
         clearInterval(this.timer);
         clearInterval(this.time2);
@@ -642,6 +641,7 @@ export default {
             },
           ];
           if (flag) {
+            this.getBarValuesFDL();
             this.getLossValuesAnalyse(this.dates);
           }
         });
@@ -712,7 +712,12 @@ export default {
     getBarValuesFDL() {
       GetWpHisdata({ wpid: this.stationCode }).then(({ data }) => {
         let date = data.data.map((item) => item.recordDate);
-        let children = data.data.map((item) => item.rfdldb);
+        let children = data.data.map(
+          (item) =>
+            item.recordDate == dayjs().format("YYYY-MM-DD")
+              ? (this.wpInfos.rfdl || 0) * 10000
+              : item.rfdldb
+        );
         this.barList = [
           {
             name: "发电量",