综合报警功能迁移

src/views/IntegratedAlarm/reliability/customAnalyse/index.vue

@@ -2,11 +2,12 @@
   <div class="custom-analyse">
     <div class="form-wrapper">
       <div class="search-wrapper">
-        <div class="search-item" v-if="$store.state.showGf">
+        <div class="search-item">
           <span class="label">报警类型：</span>
           <div class="search-content">
             <el-select
               v-model="state.typeVal"
+              style="width: 100px"
               size="mini"
               placeholder="全部"
               popper-class="select"
@@ -28,6 +29,7 @@
             <el-select
               size="mini"
               v-model="state.changZhan"
+              style="width: 120px"
               @change="changeChangzhan"
               placeholder="全部场站"
             >
@@ -47,6 +49,7 @@
             <el-select
               size="mini"
               v-model="state.modelId"
+              style="width: 120px"
               @change="changeModel"
               placeholder="全部型号"
             >
@@ -66,6 +69,7 @@
             <el-select
               size="mini"
               v-model="state.components"
+              style="width: 150px"
               multiple
               collapse-tags
               placeholder="全部部件"
@@ -87,6 +91,7 @@
             <el-select
               size="mini"
               v-model="state.alarmIds"
+              style="width: 120px"
               multiple
               collapse-tags
               placeholder="全部描述"
@@ -129,25 +134,25 @@
             </el-date-picker>
           </div>
         </div>
-      </div>
-      <div class="btns">
-        <el-button round size="mini" class="buttons" @click="getTableList"
-          >查询</el-button
-        >
+        <div class="btns">
+          <el-button round size="mini" class="buttons" @click="getTableList"
+            >查询</el-button
+          >
+        </div>
       </div>
     </div>
 
     <!-- 页面下部---统计表 -->
     <div class="table_all">
-      <div class="leftContent">
+      <div class="leftContent" :data-type="$store.state.moreSty">
         <span>{{ pageTitle }}</span>
       </div>
       <!--     @cell-click="handle" -->
       <el-table
         :data="state.tableData"
+        style="height: calc(100% - 60px)"
         stripe
-        height="calc(100% - 40px)"
-        @sort-change="handleSort"
+        @sort-change="handleSortChange"
       >
         <el-table-column
           prop="wtname"
@@ -160,42 +165,66 @@
           v-for="(item, index) in state.tHeard"
           :key="index"
           :prop="item"
+          min-width="170"
           header-align="center"
           show-overflow-tooltip
-          sortable="custom"
+          sortable="customSort"
         >
-          <template #default="{ row }">
+          <template #default="scope">
             <div class="bar">
-              <div
-                class="bar-percent"
-                :style="{
+              <!-- :style="{
                   width:
                     row[`${item.code}_count`] && row[`${item.code}_time`]
-                      ? (row[`${item.code}_count`] /
-                          (row[`${item.code}_count`] +
-                            row[`${item.code}_time`])) *
+                      ? (Math.ceil(row[`${item.code}_count`]) /
+                          (Math.ceil(row[`${item.code}_count`]) +
+                            Math.ceil(row[`${item.code}_time`]))) *
                           100 +
                         'px'
                       : '0px',
+                }" -->
+              <div
+                class="bar-percent"
+                :style="{
+                  width:
+                  scope.row[`${item.code}_count`] > 0 ?
+                    (Math.ceil(scope.row[`${item.code}_count`]) /
+                      Math.ceil(scope.column.realWidth)) *
+                      100 +
+                    'px' : '0px',
                 }"
               ></div>
-              <span class="value">{{ row[`${item.code}_count`] }} 次数</span>
+              <!-- <span class="value">{{ row[`${item.code}_count`] }} 次</span> -->
+              <span class="value"
+                >{{ getCalcValue(scope.row[`${item.code}_count`]) }} 次</span
+              >
+              <!-- <span class="value">{{ showRow(scope) }} 次</span> -->
             </div>
             <div class="bar">
-              <div
-                class="bar-percent"
-                :style="{
+              <!-- :style="{
                   width:
                     row[`${item.code}_count`] && row[`${item.code}_time`]
-                      ? (row[`${item.code}_time`] /
-                          (row[`${item.code}_count`] +
-                            row[`${item.code}_time`])) *
+                      ? (Math.ceil(row[`${item.code}_time`]) /
+                          (Math.ceil(row[`${item.code}_count`]) +
+                            Math.ceil(row[`${item.code}_time`]))) *
                           100 +
                         'px'
                       : '0px',
+                }" -->
+              <div
+                class="bar-percent"
+                :style="{
+                  width:
+                  scope.row[`${item.code}_time`] > 0 ?
+                    (Math.ceil(scope.row[`${item.code}_time`]) /
+                      Math.ceil(scope.column.realWidth)) *
+                      100 +
+                    'px' : '0px',
                 }"
               ></div>
-              <span class="value">{{ row[`${item.code}_time`] }} 分钟</span>
+              <!-- <span class="value">{{ row[`${item.code}_time`] }} 分钟</span> -->
+              <span class="value"
+                >{{ getCalcValue(scope.row[`${item.code}_time`]) }} 分钟</span
+              >
             </div>
           </template>
         </el-table-column>
@@ -241,9 +270,8 @@
 
 <script setup>
 import { useStore } from "vuex";
-import { getStation } from "@/api/performance";
 import BASE from "@tools/basicTool.js";
-import dataJson from "./dataJson.json"
+import dataJson from "./dataJson.json";
 import {
   ref,
   onMounted,
@@ -265,7 +293,8 @@ onMounted(() => {
   getWpArray();
   getequipmentmodel_list();
   getfetchRelatePart();
-    // getTableList();
+  //   state.tHeard = dataJson.data.data.title;
+  //   state.tableData = dataJson.data.data.data;
 });
 const pageTitle = "预警分析";
 const store = useStore();
@@ -285,15 +314,15 @@ const state = reactive({
       label: "风机",
       value: "windturbine",
     },
-    {
-      label: "光伏",
-      value: "inverter",
-    },
+    // {
+    //   label: "光伏",
+    //   value: "inverter",
+    // },
   ],
   tableData: [],
   tHeard: [],
   changZhan: "",
-  components: "", //部件
+  components: ["FDJ", "CLX"], //部件
   modelId: "", //型号
   alarmIds: "",
   alarmIdList: [],
@@ -304,6 +333,25 @@ const state = reactive({
   dialogVisible: false,
 });
 
+const getCalcValue = (num) => {
+  if (!num) {
+    return 0;
+  } else {
+    return Math.ceil(num);
+  }
+};
+// :style="showSty(scope, '_count')"
+// :style="showSty(scope, '_time')"
+
+const showSty = (scope, type) => {
+  let str = "";
+  let num =
+    (Math.ceil(scope.row[`${item.code}${type}`]) /
+      Math.ceil(scope.column.realWidth)) *
+    100;
+  return (str = "width:" + num + "px");
+};
+
 const changeType = async (value) => {
   state.typeVal = value;
   state.tHeard = [];
@@ -319,19 +367,16 @@ const changeType = async (value) => {
   getWpArray();
 };
 
+const showRow = (row) => {
+  debugger;
+};
+
 const getWpArray = async () => {
-  const { data } = await getStation({
-    companyids: 0,
-    type: -1,
-  });
-  changZhanArray.value = data.data;
-  state.changZhan =
-    state.typeVal == "windturbine" ? "SXJ_KGDL_DJY_FDC_STA" : data.data[0]?.id;
-  //   const { data } = await getWpList(state.typeVal);
-  //   changZhanArray.value = data;
+  const { data } = await getWpList(state.typeVal);
+  changZhanArray.value = data;
 
-  //   state.changZhan =
-  //     state.typeVal == "windturbine" ? "SXJ_KGDL_DJY_FDC_STA" : data[0]?.id;
+  state.changZhan = data[0]?.id;
+  getTableList();
 };
 // 机型
 const getequipmentmodel_list = async () => {
@@ -350,27 +395,36 @@ const modelList = computed(() => {
   //   } else {
   //     return state.modelListAll[state.changZhan];
   //   }
-  return [
-    {
-      id: "SEC-W02B-1250kW",
-      nemCode: "SEC-W02B-1250kW",
-      name: "SEC-W02B-1250kW",
-      aname: "SEC-W02B-1250kW",
-      description: "DI",
-      powerProduction: 1250,
-      windturbineManufacturerId: "SHDQ_MF",
-      photo: null,
-      unit: null,
-      cutinwindSpeed: 3,
-      ratedwindSpeed: 11,
-      cutoutwindSpeed: "25",
-      sweptArea: 5800,
-      equipmentCategory: "F",
-    },
-  ];
+  // return [
+  //   {
+  //     id: "SEC-W02B-1250kW",
+  //     nemCode: "SEC-W02B-1250kW",
+  //     name: "SEC-W02B-1250kW",
+  //     aname: "SEC-W02B-1250kW",
+  //     description: "DI",
+  //     powerProduction: 1250,
+  //     windturbineManufacturerId: "SHDQ_MF",
+  //     photo: null,
+  //     unit: null,
+  //     cutinwindSpeed: 3,
+  //     ratedwindSpeed: 11,
+  //     cutoutwindSpeed: "25",
+  //     sweptArea: 5800,
+  //     equipmentCategory: "F",
+  //   },
+  // ];
 });
 //部件列表
 const componentList = computed(() => {
+  //   if (state.changZhan == "") {
+  //     return [];
+  //   } else {
+  //     if (state.changZhan.includes("FDC")) {
+  //       return state.fetchListAll?.fjbj;
+  //     } else {
+  //       return state.fetchListAll?.gfbj;
+  //     }
+  //   }
   return [
     {
       id: "1",
@@ -533,28 +587,19 @@ const componentList = computed(() => {
       enable: 1,
     },
   ];
-  //   if (state.changZhan == "") {
-  //     return [];
-  //   } else {
-  //     if (state.changZhan.includes("FDC")) {
-  //       return state.fetchListAll?.fjbj;
-  //     } else {
-  //       return state.fetchListAll?.gfbj;
-  //     }
-  //   }
 });
 watch(
   () => [modelList, componentList],
   (val) => {
     let arr = val.map((item) => item.value);
     if (arr[0] && arr[0].length && arr[1] && arr[1].length) {
-      state.modelId = [arr[0][0]?.nemCode];
+      // state.modelId = [arr[0][0]?.nemCode];
       let componenDefaultSelect =
         arr[1]?.find((ele) => {
           return ele.nemCode === "FDJ";
         })?.nemCode || "";
       componenDefaultSelect
-        ? (state.components = [componenDefaultSelect])
+        ? (state.components = ["FDJ", "CLX"])
         : arr[1]?.[0]?.nemCode
         ? (state.components = [arr[1]?.[0]?.nemCode])
         : (state.components = []);
@@ -579,82 +624,100 @@ function changeChangzhan(val) {
   getAlarmId();
 }
 function getAlarmId() {
-  //   GetAlarmIdCustom({
-  //     components: state.components,
-  //     modelId: state.modelId,
-  //     wpId: state.changZhan,
-  //   }).then(({ data }) => {
-  //     state.alarmIdList = data;
-  //     // state.alarmIds = [];
-  //     state.alarmIds =
-  //       data.length <= 5
-  //         ? data.map((item) => item.alarmId)
-  //         : data.slice(0, 5).map((item) => item.alarmId);
+  GetAlarmIdCustom({
+    components: state.components,
+    modelId: state.modelId,
+    wpId: state.changZhan,
+  }).then(({ data }) => {
+    state.alarmIdList = data;
+    // state.alarmIds = [];
+    state.alarmIds =
+      data.length <= 5
+        ? data.map((item) => item.alarmId)
+        : data.slice(0, 5).map((item) => item.alarmId);
 
-  //     getTableList();
-  //   });
-  state.alarmIdList = [
-    {
-      alarmId: "10",
-      description: "发电机转速大于900，并且 任意齿轮箱轴温度每分钟上升超过1.5",
-    },
-  ];
-  getTableList();
+    getTableList();
+  });
+  // state.alarmIdList = [
+  //   {
+  //     alarmId: "10",
+  //     description: "发电机转速大于900，并且 任意齿轮箱轴温度每分钟上升超过1.5",
+  //   },
+  // ];
+  // getTableList();
 }
 // 获取列表数据 调用接口
 function getTableList() {
-  //   if (state.components?.length || state.typeVal === "booststation") {
-  //     getWarningCountList({
-  //       stationid: state.changZhan || "",
-  //       begin: state.starttime,
-  //       end: state.endtime,
-  //       timeType: "m",
-  //       components: state.typeVal === "booststation" ? [] : state.components,
-  //       modelId: state.modelId,
-  //       alarmIds: state.alarmIds,
-  //       deviceType: state.typeVal,
-  //     }).then((res) => {
-  //       if (res.length) {
-  //         let tableData = [];
-  //         let tHeard = [];
-  //         let data = res;
-  //         data.forEach((pEle) => {
-  //           for (let wtId in pEle) {
-  //             let wtItem = data.find((tableItem) => {
-  //               return wtId === tableItem.windturbineId;
-  //             });
-  //             !wtItem && (wtItem = { wtId });
-  //             pEle[wtId].forEach((cEle) => {
-  //               let someRes = tHeard.some((findEle) => {
-  //                 return findEle.label == cEle.alertText;
-  //               });
+  if (state.components?.length || state.typeVal === "booststation") {
+    getWarningCountList({
+      stationid: state.changZhan || "",
+      begin: state.starttime,
+      end: state.endtime,
+      timeType: "m",
+      components: state.typeVal === "booststation" ? [] : state.components,
+      modelId: state.modelId,
+      alarmIds: state.alarmIds,
+      deviceType: state.typeVal,
+    }).then((res) => {
+      changeTableData(res);
+    }).catch(() =>{
+      changeTableData(dataJson.data.data.dataList);
+    });
+  } else {
+    BASE.showMsg({
+      msg: "部件至少选择一项才可查询",
+    });
+  }
+}
 
-  //               if (!someRes) {
-  //                 tHeard.push({
-  //                   label: cEle.alertText,
-  //                   code: cEle.alarmid,
-  //                 });
-  //               }
-  //               wtItem[`${cEle.alarmid}_count`] = cEle.count;
-  //               wtItem[`${cEle.alarmid}_time`] = cEle.time;
-  //               wtItem["wtname"] = cEle.windturbineCode;
-  //             });
-  //             tableData.push(wtItem);
-  //           }
-  //         });
-  //         state.tHeard = tHeard;
-  //         state.tableData = tableData;
-  //       } else {
-  //
-  //       }
-  //     });
-  //   } else {
-  //     BASE.showMsg({
-  //       msg: "部件至少选择一项才可查询",
-  //     });
-  //   }
-  state.tHeard = dataJson.data.data.title;
-  state.tableData = dataJson.data.data.data;
+const changeTableData = (res) => {
+  if (res.length) {
+    let tableData = [];
+    let tHeard = [];
+    let data = res;
+    data.forEach((pEle) => {
+      for (let wtId in pEle) {
+        let wtItem = data.find((tableItem) => {
+          return wtId === tableItem.windturbineId;
+        });
+        !wtItem && (wtItem = { wtId });
+        pEle[wtId].forEach((cEle) => {
+          let someRes = tHeard.some((findEle) => {
+            return findEle.label == cEle.alertText;
+          });
+
+          if (!someRes) {
+            tHeard.push({
+              label: cEle.alertText,
+              code: cEle.alarmid,
+            });
+          }
+          wtItem[`${cEle.alarmid}_count`] = cEle.count;
+          wtItem[`${cEle.alarmid}_time`] = cEle.time;
+          wtItem["wtname"] = cEle.windturbineCode;
+        });
+        tableData.push(wtItem);
+      }
+    });
+    state.tHeard = tHeard;
+    state.tableData = tableData;
+  } else {
+    state.tHeard = [];
+    state.tableData = [];
+  }
+};
+
+const handleSortChange = ({ column, prop, order }) => {
+    let code = prop.code+'_count';
+    state.tableData = state.tableData.slice().sort((a, b) => {
+        if (order === 'ascending') {
+        return a[code] - b[code];
+        } else if (order === 'descending') {
+        return b[code] - a[code];
+        } else {
+        // return 0;
+        }
+    });
 }
 
 const handleSort = function (val) {
@@ -664,15 +727,20 @@ const handleSort = function (val) {
     state.tableData = list.sort(compare(`${item.code}_count`));
   } else if (val.order == "descending") {
     state.tableData = list.sort(compare(`${item.code}_count`)).reverse();
+  } else {
+    state.tableData = list.sort(compare(`${item.code}_count`));
   }
 };
 //排序函数
 const compare = function (property) {
-  return function (a, b) {
-    var value1 = a[property];
-    var value2 = b[property];
-    return value1 - value2;
-  };
+  if (property !== 0) {
+    return function (a, b) {
+      var value1 = a[property];
+      var value2 = b[property];
+      return value1 - value2;
+    };
+  
+  }
 };
 //     // 单元格点击事件
 //     handle(row, column, event, cell) {
@@ -718,8 +786,6 @@ const compare = function (property) {
 <style lang="less" scoped>
 .custom-analyse {
   height: 100%;
-  width: 100%;
-  padding: 0 20px;
   padding-bottom: 10px;
   .form-wrapper ::v-deep {
     display: flex;
@@ -734,6 +800,7 @@ const compare = function (property) {
       font-weight: 400;
       color: #b3b3b3;
       margin-bottom: 10px;
+      margin-left: 20px;
       .search-item {
         display: flex;
         margin-right: 10px;
@@ -751,15 +818,6 @@ const compare = function (property) {
       }
     }
 
-    .btns {
-      display: flex;
-      justify-content: flex-end;
-      margin-right: 10px;
-      position: absolute;
-      right: 0;
-      top: 53px;
-    }
-
     .buttons {
       background-color: rgba(5, 187, 76, 0.2);
       border: 1px solid #3b6c53;
@@ -773,21 +831,26 @@ const compare = function (property) {
     }
   }
   .table_all {
-    height: calc(100% - 47px);
-    width: 100%;
+    width: calc(100% - 20px);
+    height: calc(100% - 130px);
+    padding: 20px;
+    .leftContent[data-type~="greenSty"] {
+      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
+    }
+    .leftContent[data-type~="blueSty"] {
+      background: url("~@/assets/imgs/title_left_bg.png") no-repeat;
+    }
     .leftContent {
       width: 242px;
       height: 41px;
       display: flex;
       align-items: center;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
 
       span {
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
-        // color: #05bb4c;
-        color: #2169c3;
+        color: #05bb4c;
         margin-left: 25px;
       }
     }
@@ -808,10 +871,8 @@ const compare = function (property) {
     align-items: center;
     height: 16px;
     margin: 8px 0;
-
     .bar-percent {
       height: 100%;
-    //   background: #05bb4c;
       background: #2169c3;
       margin-right: 8px;
     }

src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -9,6 +9,7 @@
           <div class="search-content">
             <el-select
               v-model="state.typeVal"
+              style="width: 100px"
               size="mini"
               placeholder="全部"
               popper-class="select"
@@ -30,6 +31,7 @@
             <el-select
               size="mini"
               v-model="state.changZhan"
+              style="width: 120px"
               @change="changeChangzhan"
               placeholder="全部场站"
             >
@@ -49,6 +51,7 @@
             <el-select
               size="mini"
               v-model="state.modelId"
+              style="width: 120px"
               @change="changeModel"
               placeholder="全部型号"
             >
@@ -67,6 +70,7 @@
           <div class="search-content">
             <el-select
               v-model="state.components"
+              style="width: 150px"
               multiple
               size="mini"
               collapse-tags
@@ -89,6 +93,7 @@
           <div class="search-content">
             <el-select
               v-model="state.alarmIds"
+              style="width: 120px"
               multiple
               size="mini"
               clearable
@@ -133,24 +138,24 @@
             </el-date-picker>
           </div>
         </div>
-      </div>
-      <div class="btns">
-        <el-button class="buttons" size="mini" round @click="getTableList"
-          >查询</el-button
-        >
+        <div class="btns">
+          <el-button class="buttons" size="mini" round @click="getTableList"
+            >查询</el-button
+          >
+        </div>
       </div>
     </div>
 
     <!-- 页面下部---统计表 -->
     <div class="table_all">
-      <div class="leftContent">
+      <div class="leftContent" :data-type="$store.state.moreSty">
         <span>{{ pageTitle }}</span>
       </div>
       <el-table
         :data="state.tableData"
         stripe
-        height="calc(100% - 40px)"
-        @sort-change="handleSort"
+        style="height: calc(100% - 60px)"
+        @sort-change="handleSortChange"
       >
         <el-table-column
           prop="wtname"
@@ -163,15 +168,14 @@
           v-for="(item, index) in state.tHeard"
           :key="index"
           :prop="item"
+          min-width="170"
           header-align="center"
           show-overflow-tooltip
-          sortable="custom"
+          sortable="customSort"
         >
-          <template #default="{ row }">
+          <template #default="scope">
             <div class="bar">
-              <div
-                class="bar-percent"
-                :style="{
+                <!-- :style="{
                   width:
                     row[`${item.code}_count`] || row[`${item.code}_time`]
                       ? (row[`${item.code}_count`] /
@@ -180,14 +184,17 @@
                           100 +
                         'px'
                       : '0px',
-                }"
+                }" -->
+              <div
+                class="bar-percent"
+                :style="{width: scope.row[`${item.code}_count`] > 0 ? (Math.ceil(scope.row[`${item.code}_count`]) / 
+                Math.ceil(scope.column.realWidth))*100 + 'px' : '0px'}"
               ></div>
-              <span class="value">{{ row[`${item.code}_count`] }} 次数</span>
+              <!-- <span class="value">{{ row[`${item.code}_count`] }} 次</span> -->
+              <span class="value">{{ getCalcValue(scope.row[`${item.code}_count`]) }} 次</span>
             </div>
             <div class="bar">
-              <div
-                class="bar-percent"
-                :style="{
+                <!-- :style="{
                   width:
                     row[`${item.code}_count`] || row[`${item.code}_time`]
                       ? (row[`${item.code}_time`] /
@@ -196,9 +203,14 @@
                           100 +
                         'px'
                       : '0px',
-                }"
+                }" -->
+              <div
+                class="bar-percent"
+                :style="{width: scope.row[`${item.code}_time`] > 0 ? (Math.ceil(scope.row[`${item.code}_time`]) / 
+                Math.ceil(scope.column.realWidth))*100 + 'px' : '0px'}"
               ></div>
-              <span class="value">{{ row[`${item.code}_time`] }} 分钟</span>
+              <!-- <span class="value">{{ row[`${item.code}_time`] }} 分钟</span> -->
+              <span class="value">{{ getCalcValue(scope.row[`${item.code}_time`]) }} 分钟</span>
             </div>
           </template>
         </el-table-column>
@@ -244,9 +256,8 @@
 
 <script setup>
 import { useStore } from "vuex";
-import { getStation } from "@/api/performance";
 import BASE from "@tools/basicTool.js";
-import dataJson from "./dataJson.json"
+import dataJson from "./dataJson.json";
 import {
   ref,
   onMounted,
@@ -268,7 +279,9 @@ onMounted(() => {
   getWpArray();
   getequipmentmodel_list();
   getfetchRelatePart();
-  //   getTableList();
+//   state.tHeard = dataJson.data.data.title;
+//   state.tableData = dataJson.data.data.dataList;
+  // getTableList();
 });
 const pageTitle = "报警分析";
 const store = useStore();
@@ -276,10 +289,10 @@ const changZhanArray = ref([]);
 const state = reactive({
   typeVal: "windturbine",
   typeList: [
-    {
-      label: "升压站",
-      value: "booststation",
-    },
+    // {
+    //   label: "升压站",
+    //   value: "booststation",
+    // },
     // {
     //   label: "自定义",
     //   value: "custom",
@@ -296,7 +309,7 @@ const state = reactive({
   tableData: [],
   tHeard: [],
   changZhan: "",
-  components: "", //部件
+  components: ["FDJ", "CLX"], //部件
   modelId: "", //型号
   alarmIds: "",
   alarmIdList: [],
@@ -307,29 +320,30 @@ const state = reactive({
   dialogVisible: false,
 });
 
+const getCalcValue = (num) => {
+  if (!num) {
+    return 0;
+  } else {
+    return Math.ceil(num);
+  }
+};
+
 const changeType = (value) => {
   state.typeVal = value;
   getWpArray();
 };
 
 const getWpArray = async () => {
-  const { data } = await getStation({
-    companyids: 0,
-    type: -1,
-  });
-  changZhanArray.value = data.data;
-  state.changZhan =
-    state.typeVal == "windturbine" ? "SXJ_KGDL_DJY_FDC_STA" : data.data[0]?.id;
-  //   const { data } = await getWpList(state.typeVal);
-  //   changZhanArray.value = data;
-  //   if (state.typeVal != "booststation") {
-  //     state.changZhan =
-  //       state.typeVal == "windturbine" ? "SXJ_KGDL_DJY_FDC_STA" : "";
-  //   } else {
-  //     state.changZhan = "";
-  //     state.modelId = "";
-  //     getTableList();
-  //   }
+  const { data } = await getWpList(state.typeVal);
+  changZhanArray.value = data;
+  if (state.typeVal != "booststation") {
+    state.changZhan = data[0]?.id
+    getTableList();
+
+  } else {
+    state.changZhan = "";
+    state.modelId = "";
+  }
 };
 // 机型
 const getequipmentmodel_list = async () => {
@@ -547,13 +561,13 @@ watch(
     if (state.typeVal != "booststation") {
       let arr = val.map((item) => item.value);
       if (arr[0] && arr[0].length && arr[1] && arr[1].length) {
-        state.modelId = [arr[0][0]?.nemCode];
+        // state.modelId = [arr[0][0]?.nemCode];
         let componenDefaultSelect =
           arr[1]?.find((ele) => {
-            return ele.nemCode === "ZZ";
+            return ele.nemCode === "FDJ";
           })?.nemCode || "";
         componenDefaultSelect
-          ? (state.components = [componenDefaultSelect])
+          ? (state.components = ["FDJ", "CLX"])
           : arr[1]?.[0]?.nemCode
           ? (state.components = [arr[1]?.[0]?.nemCode])
           : (state.components = []);
@@ -604,60 +618,79 @@ function getAlarmId() {
 }
 // 获取列表数据 调用接口
 function getTableList() {
-  state.tHeard = dataJson.data.data.title;
-  state.tableData = dataJson.data.data.data;
-  //   if (state.components?.length) {
-  //     getAlarmCountList({
-  //       stationid: state.changZhan || "",
-  //       begin: state.starttime,
-  //       end: state.endtime,
-  //       timeType: "m",
-  //       components: state.typeVal === "booststation" ? "" : state.components,
-  //       modelId: state.modelId,
-  //       alarmIds: state.alarmIds,
-  //       alarmType: state.typeVal,
-  //     }).then((res) => {
-  //       if (res.length) {
-  //         let tableData = [];
-  //         let tHeard = [];
-  //         let data = res;
-  //         data.forEach((pEle) => {
-  //           for (let wtId in pEle) {
-  //             let wtItem = data.find((tableItem) => {
-  //               return wtId === tableItem.windturbineId;
-  //             });
-  //             !wtItem && (wtItem = { wtId });
-  //             pEle[wtId].forEach((cEle) => {
-  //               let someRes = tHeard.some((findEle) => {
-  //                 return findEle.label == cEle.alertText;
-  //               });
-  //               if (!someRes) {
-  //                 tHeard.push({
-  //                   label: cEle.alertText,
-  //                   code: cEle.alarmid,
-  //                 });
-  //               }
-  //               wtItem[`${cEle.alarmid}_count`] = cEle.count;
-  //               wtItem[`${cEle.alarmid}_time`] = cEle.time;
-  //               wtItem["wtname"] = cEle.windturbineCode;
-  //             });
-  //             tableData.push(wtItem);
-  //           }
-  //         });
-  //         state.tHeard = tHeard;
-  //         state.tableData = tableData;
-  //       } else {
-  //         state.tHeard = [];
-  //         state.tableData = [];
-  //       }
-  //     });
-  //   } else {
-  //     BASE.showMsg({
-  //       msg: "部件至少选择一项才可查询",
-  //     });
-  //   }
+  if (state.components?.length) {
+    getAlarmCountList({
+      stationid: state.changZhan || "",
+      begin: state.starttime,
+      end: state.endtime,
+      timeType: "m",
+      components: state.typeVal === "booststation" ? "" : state.components,
+      modelId: state.modelId,
+      alarmIds: state.alarmIds,
+      alarmType: state.typeVal,
+    }).then((res) => {
+      changeTableData(res)
+    }).catch(() =>{
+      changeTableData(dataJson.data.data.dataList)
+    });
+  } else {
+    BASE.showMsg({
+      msg: "部件至少选择一项才可查询",
+    });
+  }
+}
+
+const changeTableData = (res) => {
+    if (res.length) {
+        let tableData = [];
+        let tHeard = [];
+        let data = res;
+        data.forEach((pEle) => {
+          for (let wtId in pEle) {
+            let wtItem = data.find((tableItem) => {
+              return wtId === tableItem.windturbineId;
+            });
+            !wtItem && (wtItem = { wtId });
+            pEle[wtId].forEach((cEle) => {
+              let someRes = tHeard.some((findEle) => {
+                return findEle.label == cEle.alertText;
+              });
+
+              if (!someRes) {
+                tHeard.push({
+                  label: cEle.alertText,
+                  code: cEle.alarmid,
+                });
+              }
+              wtItem[`${cEle.alarmid}_count`] = cEle.count;
+              wtItem[`${cEle.alarmid}_time`] = cEle.time;
+              wtItem["wtname"] = cEle.windturbineCode;
+            });
+            tableData.push(wtItem);
+          }
+        });
+        state.tHeard = tHeard;
+        state.tableData = tableData;
+      } else {
+        state.tHeard = [];
+        state.tableData = [];
+      }
+}
+
+const handleSortChange = ({ column, prop, order }) => {
+    let code = prop.code+'_count';
+    state.tableData = state.tableData.slice().sort((a, b) => {
+        if (order === 'ascending') {
+        return a[code] - b[code];
+        } else if (order === 'descending') {
+        return b[code] - a[code];
+        } else {
+        // return 0;
+        }
+    });
 }
 
+
 const handleSort = function (val) {
   let item = val.prop;
   let list = JSON.parse(JSON.stringify(state.tableData));
@@ -720,9 +753,6 @@ const compare = function (property) {
 <style lang="less" scoped>
 .history-analyse {
   height: 100%;
-  width: 100%;
-  padding: 0 20px;
-  padding-bottom: 10px;
   .form-wrapper ::v-deep {
     display: flex;
     flex-direction: column;
@@ -736,6 +766,7 @@ const compare = function (property) {
       font-weight: 400;
       color: #b3b3b3;
       margin-bottom: 10px;
+      margin-left: 20px;
       .search-item {
         display: flex;
         margin-right: 10px;
@@ -753,15 +784,6 @@ const compare = function (property) {
       }
     }
 
-    .btns {
-      display: flex;
-      justify-content: flex-end;
-      margin-right: 10px;
-      position: absolute;
-      right: 0;
-      top: 53px;
-    }
-
     .buttons {
       background-color: rgba(5, 187, 76, 0.2);
       border: 1px solid #3b6c53;
@@ -775,21 +797,26 @@ const compare = function (property) {
     }
   }
   .table_all {
-    height: calc(100% - 47px);
-    width: 100%;
+    width: calc(100% - 20px);
+    height: calc(100% - 130px);
+    padding: 20px;
+    .leftContent[data-type~="greenSty"] {
+      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
+    }
+    .leftContent[data-type~="blueSty"] {
+      background: url("~@/assets/imgs/title_left_bg.png") no-repeat;
+    }
     .leftContent {
       width: 242px;
       height: 41px;
       display: flex;
       align-items: center;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
 
       span {
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
-        // color: #05bb4c;
-        color: #2169c3;
+        color: #05bb4c;
         margin-left: 25px;
       }
     }
@@ -810,11 +837,9 @@ const compare = function (property) {
     align-items: center;
     height: 16px;
     margin: 8px 0;
-
     .bar-percent {
       height: 100%;
-    //   background: #05bb4c;
-    background: #2169c3;
+      background: #2169c3;
       margin-right: 8px;
     }
   }

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

@@ -18,7 +18,7 @@
     <el-table :data="alarmList" style="width: 100%" height="calc(100% - 51px)">
       <el-table-column
         prop="tsName"
-        label="报警时间"
+        label="时间"
         width="120"
         show-overflow-tooltip
         align="center"
@@ -27,6 +27,7 @@
         prop="wpName"
         label="场站"
         align="center"
+        width="180"
         show-overflow-tooltip
       />
       <el-table-column
@@ -37,10 +38,11 @@
         width="50"
         show-overflow-tooltip
       />
+      <!-- :prop="alarmType==='custom' ? characteristic : description" -->
       <el-table-column
-        prop="description"
-        label="报警信息"
-        align="left"
+        :prop="alarmType==='custom' ? 'characteristic' : 'description'"
+        align="center"
+        label="信息"
         show-overflow-tooltip
       />
       <!-- <el-table-column label="级别" width="80" show-overflow-tooltip>
@@ -69,8 +71,8 @@
           <span
             :style="`color:${
               scope.row.isClose
-                ? '#2999a0'
-                : '#ff6271'
+                ? 'var(--el-color-success)'
+                : 'var(--el-color-danger)'
             }`"
             >{{ scope.row.isClose ? "已解除" : "未解除" }}</span
           >
@@ -105,7 +107,7 @@
         >
           <el-table-column
             prop="fullTsName"
-            label="报警时间"
+            label="时间"
             width="220"
             align="center"
             show-overflow-tooltip
@@ -120,29 +122,29 @@
 
           <el-table-column
             prop="code"
-            label="报警设备"
+            label="设备"
             width="100"
             align="center"
             show-overflow-tooltip
           />
           <!-- <el-table-column
             prop="characteristic"
-            label="报警特征"
+            label="特征"
             width="100"
             show-overflow-tooltip
           /> -->
-          <el-table-column label="报警描述" align="left">
+          <el-table-column label="描述" align="left">
             <template #default="scope">
               <span
                 class="alertDescCursor"
                 @click="goToAlertDescPage(scope.row)"
-                >{{ scope.row.description || "--" }}</span
+                >{{ alarmType==='custom' ? scope.row.characteristic : scope.row.description || "--" }}</span
               >
             </template>
           </el-table-column>
           <el-table-column
             prop="faultCause"
-            label="报警故障原因"
+            label="故障原因"
             align="left"
             show-overflow-tooltip
           >
@@ -152,7 +154,7 @@
           </el-table-column>
           <el-table-column
             prop=""
-            label="报警解除时间"
+            label="解除时间"
             align="center"
             width="220"
             show-overflow-tooltip
@@ -163,7 +165,7 @@
           </el-table-column>
           <!-- <el-table-column
             prop="resolvent"
-            label="报警解决方法"
+            label="解决方法"
             show-overflow-tooltip
           /> -->
           <!-- <el-table-column label="级别" width="100" show-overflow-tooltip>
@@ -182,7 +184,7 @@
             </template>
           </el-table-column> -->
           <el-table-column
-            label="报警是否解除"
+            label="是否解除"
             width="120"
             align="center"
             show-overflow-tooltip
@@ -202,7 +204,7 @@
             <template #default="scope">
               <el-button
                 type="text"
-                style="color: #05bb4c"
+                style="color: #1890ff !important"
                 size="small"
                 @click="confirm(scope.row)"
                 >确认本条</el-button
@@ -212,11 +214,7 @@
         </el-table>
       </el-card>
       <template #footer>
-        <el-button
-          type="info"
-          plain
-          @click="confirmAll"
-          :disabled="!dialogTableData.length"
+        <el-button type="primary" plain @click="confirmAll"
           >确认所有报警</el-button
         >
       </template>
@@ -250,7 +248,22 @@ export default {
 
   data() {
     return {
-      alarmList: [],
+      alarmList: [
+        {
+          tsName: "06-11 12:00:00",
+          wpName: "风电场1",
+          deviceName: "#36",
+          description: "变频器报告电网已接入",
+          isClose: true,
+        },
+        {
+          tsName: "06-11 12:00:00",
+          wpName: "风电场2",
+          deviceName: "#58",
+          description: "风机等待运行就绪",
+          isClose: false,
+        },
+      ],
       iconfontsObj: {
         booststation: "iconIOTtubiao_huabanfuben",
         windturbine: "iconfengji",
@@ -265,23 +278,7 @@ export default {
   },
 
   created() {
-    // this.initWarningList();
-    this.alarmList = [
-        {
-            tsName: '06-11 12:00:00',
-            wpName: '风电场1',
-            deviceName: '#36',
-            description: '变频器报告电网已接入',
-            isClose: true
-        },
-        {
-            tsName: '06-11 12:00:00',
-            wpName: '风电场2',
-            deviceName: '#58',
-            description: '风机等待运行就绪',
-            isClose: false
-        }
-    ]
+    this.initWarningList();
   },
 
   methods: {
@@ -314,6 +311,7 @@ export default {
       //   return b.ts - a.ts;
       // });
       this.alarmList = alarmList;
+      console.log("alarmList===>>>>", this.alarmList)
       if (!this.stopUpdate) {
         this.dialogTableData = dialogTableData;
       }
@@ -356,38 +354,45 @@ export default {
 
     confirmAll() {
       this.stopUpdate = true;
-      this.$confirm("您确定要执行此操作吗？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          confirmAlart(this.dialogTableData)
-            .then((res) => {
-              if (res.code === 200) {
+      if (!this?.dialogTableData?.length) {
+        this.BASE.showMsg({
+          type: "error",
+          msg: "暂无报警可进行确认",
+        });
+      } else {
+        this.$confirm("您确定要执行此操作吗？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            confirmAlart(this.dialogTableData)
+              .then((res) => {
+                if (res.code === 200) {
+                  this.BASE.showMsg({
+                    type: "success",
+                    msg: `全部${this.title}确认成功`,
+                  });
+                  this.$store.commit("removeWarningList", this.dialogTableData);
+                }
+                this.stopUpdate = false;
+              })
+              .catch(() => {
                 this.BASE.showMsg({
-                  type: "success",
-                  msg: `全部${this.title}确认成功`,
+                  msg: "确认失败，请重试",
                 });
-                this.$store.commit("removeWarningList", this.dialogTableData);
-              }
-              this.stopUpdate = false;
-            })
-            .catch(() => {
-              this.BASE.showMsg({
-                msg: "确认失败，请重试",
               });
-            });
-        })
-        .catch(() => {
-          this.stopUpdate = false;
-        });
+          })
+          .catch(() => {
+            this.stopUpdate = false;
+          });
+      }
     },
 
     goToAlertDescPage(alertItem) {
       if (this.alarmType == "custom") {
         this.$router.push({
-          path: "/integratedAlarm/safe/customWarning",
+          path: "/integratedAlarm/customWarning",
           query: {
             deviceId: alertItem.deviceId,
             alarmId: alertItem.alarmId,
@@ -396,7 +401,7 @@ export default {
         });
       } else if (this.alarmType == "booststation") {
         this.$router.push({
-          path: "/integratedAlarm/safe/historyWarning",
+          path: "/integratedAlarm/historyWarning",
           query: {
             deviceId: alertItem.wpName,
             alarmId: alertItem.alarmId,
@@ -405,7 +410,7 @@ export default {
         });
       } else {
         this.$router.push({
-          path: "/integratedAlarm/safe/historyWarning",
+          path: "/integratedAlarm/historyWarning",
           query: {
             deviceId: alertItem.deviceId,
             alarmId: alertItem.alarmId,
@@ -418,7 +423,7 @@ export default {
   },
 
   watch: {
-    "$store.state.warningList.length"() {
+    "$store.state.warningList.length"(value) {
       this.initWarningList();
     },
   },

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

@@ -12,6 +12,7 @@
           <div class="search-content">
             <el-select
               v-model="state.typeVal"
+              style="width: 100px"
               clearable
               size="mini"
               placeholder="全部"
@@ -40,6 +41,7 @@
           <div class="search-content">
             <el-select
               v-model="state.stationId"
+              style="width: 120px"
               clearable
               size="mini"
               placeholder="全部"
@@ -60,6 +62,7 @@
           <div class="search-content">
             <el-select
               v-model="state.deviceId"
+              style="width: 120px"
               clearable
               size="mini"
               placeholder="全部"
@@ -80,6 +83,7 @@
           <div class="search-content">
             <el-select
               v-model="state.modelId"
+              style="width: 120px"
               clearable
               size="mini"
               placeholder="全部"
@@ -100,6 +104,7 @@
           <div class="search-content">
             <el-select
               v-model="state.components"
+              style="width: 120px"
               clearable
               size="mini"
               placeholder="全部"
@@ -144,38 +149,37 @@
         </div>
       </div>
       <div class="btns">
-        <el-button class="buttons" round size="mini">查询</el-button>
-        <!--  @click="getAlarmHistoryt" -->
+        <el-button class="buttons" round size="mini" @click="getAlarmHistoryt"
+          >查询</el-button
+        >
         <el-button
           size="mini"
           class="buttons"
           round
+          @click="export2Excel"
           :disabled="state.tableData?.length == 0 ? true : false"
         >
           导出</el-button
         >
-        <!--   @click="export2Excel" -->
-        <el-button
+        <!-- <el-button
           round
           class="buttons"
           size="mini"
           :disabled="!state.tableData?.length"
           @click="confirmItem(state.tableData)"
           >确认本页</el-button
-        >
-        <!--   @click="confirmItem(state.tableData)" -->
+        > -->
       </div>
     </div>
 
     <div class="table-wrapper">
-      <div class="leftContent">
+      <div class="leftContent" :data-type="$store.state.moreSty">
         <span>{{ pageTitle }}</span>
       </div>
       <el-table
         size="mini"
         :data="state.tableData"
-        height="calc(100% - 35px - 55px)"
-        style="width: 100%"
+        style="width: 100%; height: calc(100% - 35px - 55px)"
         stripe
       >
         <template v-if="state.isshowwindturbineName">
@@ -224,8 +228,14 @@
             align="center"
           >
             <template #default="scope">
-              <el-button style="color: #05bb4c" type="text">确认本条</el-button>
-              <!--  @click="confirmItem([scope.row])" -->
+              <el-button
+                :style="`color: ${
+                  $store.state.theme ? '#1890ff' : '#47aee7'
+                } !important`"
+                type="text"
+                @click="confirmItem([scope.row])"
+                >确认本条</el-button
+              >
             </template>
           </el-table-column>
         </template>
@@ -270,8 +280,12 @@
             align="center"
           >
             <template #default="scope">
-              <el-button style="color: #05bb4c" type="text">确认本条</el-button>
-              <!--   @click="confirmItem([scope.row])" -->
+              <el-button
+                style="color: #05bb4c"
+                type="text"
+                @click="confirmItem([scope.row])"
+                >确认本条</el-button
+              >
             </template>
           </el-table-column>
         </template>
@@ -298,7 +312,6 @@
 </template>
 
 <script setup>
-import { getStation } from "@/api/performance";
 import {
   watch,
   reactive,
@@ -335,11 +348,55 @@ onMounted(() => {
   state.deviceId = route.query.deviceId || "";
   state.alarmId = route.query.alarmId || "";
   state.modelId = route.query.modelId || "";
+
+  state.tableData = new Array(5).fill({
+    tbName: null,
+    alarmId: "SQ_0125",
+    alarmType: "windturbine",
+    characteristic: "预警",
+    components: "BPQ",
+    confirmed: false,
+    description: "变频器故障27",
+    deviceId: "SXJ_KGDL_XWT_F_WT_0014_EQ",
+    devicename: "14号风机",
+    deviceType: "windturbine",
+    enabled: true,
+    lineid: "SXJ_KGDL_XWTF01_LN",
+    linename: "一号风机线",
+    modelId: "SEC-W02B-1250kW",
+    projectid: "SXJ_KGDL_XWTF01_EG",
+    projectname: "一期项目",
+    rank: 3,
+    resettable: false,
+    stationid: "GJNY_SXGS_ZZ_FDC_STA",
+    stationname: "13风电场",
+    subcomponents: "NULL",
+    suffix: null,
+    tagid: "FD-YYXWT-ShangQi.140623F1412MDL01BF399DB0122SP01RAW00",
+    triggertype: 1463,
+    uniformcode: "BJ0001",
+    superTableName: null,
+    ts: 1718160795000,
+    val: 1,
+    oval: null,
+    endts: 0,
+    timelong: 0,
+    name: null,
+    nemCode: "状态码1463",
+    faultCause: "13.7s>信号<=14.2s",
+    resolvent: "输入端142功率上升延迟300s",
+    wpName: "13风电场",
+    code: "#14",
+    wpId: null,
+    faultType: null,
+    id: "sxj_kgdl_xwt_f_wt_0014_eq_sq_0125",
+  });
+
   getStationList();
   getequipmentmodel_list();
   getfetchRelatePart();
 
-  getAlarmHistoryt()
+  getAlarmHistoryt();
 });
 
 // 机型
@@ -354,7 +411,7 @@ const getfetchRelatePart = async () => {
 };
 
 const confirmItem = (alarmItem) => {
-  ElMessageBox("您确定要执行此操作吗？", "提示", {
+  ElMessageBox.confirm("您确定要执行此操作吗？", "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
@@ -405,7 +462,7 @@ const state = reactive({
     // },
   ],
   c: "windturbine",
-  stationId: "",
+  stationId: "GJNY_SXGS_ZZ_FDC_STA",
   alarmId: "",
   typeVal: "windturbine",
   windturbineList: [],
@@ -424,8 +481,9 @@ const state = reactive({
     { title: "时间", code: "ts", width: "150" },
     { title: "场站", code: "stationname", width: "150" },
     { title: "机组", code: "devicename", width: "150" },
-    { title: "报警信息", code: "description", width: "250" },
-    { title: "故障原因", code: "faultCause" },
+    { title: "部件", code: "components", width: "200" },
+    { title: "预警信息", code: "characteristic" },
+    // { title: "故障原因", code: "faultCause" },
     // { title: "故障编码", code: "nemCode", width: "100" },
     // { title: "故障解决方法", code: "resolvent" },
     // { title: "级别", code: "rank", width: "80" },
@@ -461,26 +519,21 @@ const state = reactive({
 const stationList = ref([]);
 
 const getStationList = async () => {
-  //   const { data } = await getWpList(state.typeVal);
-  //   stationList.value = data;
-  const { data } = await getStation({
-    companyids: 0,
-    type: state.typeVal == "windturbine" ? -1 : -2,
-  });
-
-  stationList.value = data.data;
-  //   if (state.deviceId) {
-  //     let station = data.find((i) => {
-  //       let st = i.id.split("_")[2];
-  //       let dt = state.deviceId.split("_")[2];
-  //       if (st == dt) {
-  //         return i;
-  //       }
-  //     });
-  //     state.stationId = station?.id;
-  //   } else {
+  const { data } = await getWpList(state.typeVal);
+  stationList.value = data;
+  if (state.deviceId) {
+    let station = data.find((i) => {
+      let st = i.id.split("_")[2];
+      let dt = state.deviceId.split("_")[2];
+      if (st == dt) {
+        return i;
+      }
+    });
+    // state.stationId = station?.id;
+  }
+  //    else {
   //     state.stationId =
-  //       state.typeVal == "windturbine" ? "SXJ_KGDL_DJY_FDC_STA" : data[0]?.id;
+  //       state.typeVal == "windturbine" ? "GJNY_SXGS_FSG_FDC_STA" : data[0]?.id;
   //   }
   if (stationList.value.length) {
     await getWindturbineList();
@@ -543,118 +596,48 @@ const componentList = computed(() => {
 //get 风机
 const getWindturbineList = async () => {
   state.deviceId = "";
-  //   const { data } = await fetchWindturbineList(state.stationId);
-  //   state.windturbineList = data;
-  state.windturbineList = [
-    {
-      id: "SXJ_KGDL_XWT_F_WT_0001_EQ",
-      nemCode: "#1",
-      windpowerstationId: "SXJ_KGDL_XWT_FDC_STA",
-      longitude: 112.415335,
-      latitude: 40.281307,
-      modelId: "SEC-W02B-1250kW",
-      status: "NULL",
-      projectId: "SXJ_KGDL_XWTF01_EG",
-      lineId: "SXJ_KGDL_XWTF01_LN",
-      firstIntegratedTime: "2008-07-27T16:00:00.000+0000",
-      photo: "NULL",
-      name: "01号风机",
-      aname: "#1",
-      isStandard: 1,
-      regionId: "NX_FGS",
-      companyId: "SXJ_KGDL_FLFD_ZGS",
-      isable: 1,
-      equipmentCategory: -1,
-      parentId: "NULL",
-      squareId: "NULL",
-      spare1: "WT",
-      spare2: "1",
-      spare3: "NULL",
-      spare4: "NULL",
-      orderNum: 271,
-      substationId: "SXJ_KGDL_XWTF01_SBS",
-    },
-  ];
+  const { data } = await fetchWindturbineList(state.stationId);
+  state.windturbineList = data;
 };
 const query = reactive({
   page: 1,
-  limit: 21,
+  limit: 1000,
   pageTotal: null,
 });
 const tableLoading = ref(false);
 // 获取历史记录表
 const getAlarmHistoryt = async () => {
-  //   if (route.params.deviceId && route.params.alarmId) {
-  //     state.stationId = "";
-  //   }
-  //   tableLoading.value = true;
-  //   let params = {
-  //     pageNum: query.page,
-  //     pageSize: query.limit,
-  //     alarmId: state.alarmId,
-  //     alarmType: "custom",
-  //     deviceType: state.typeVal,
-  //     stationid: state.stationId,
-  //     deviceid:
-  //       state.deviceId || (state.typeVal == "booststation" ? "" : state.deviceId),
-  //     modelId: state.typeVal == "booststation" ? "" : state.modelId,
-  //     components: state.components,
-  //     description: state.description,
-  //     begin: state.dateTime[0],
-  //     end: state.dateTime[1],
-  //   };
-  //   const { data } = await alarm_history(params);
-  //   tableLoading.value = false;
-  //   query.pageTotal = data?.total;
-  //   data?.ls?.forEach((ele) => {
-  //     ele.isCloseName = ele.endts ? "已解除" : "未解除";
-  //     ele.deviceTypeName = tableFilter(ele.deviceType);
-  //     ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "--";
-  //   });
-  //   state.tableData = data?.ls;
-  state.tableData = new Array(5).fill({
-    tbName: null,
-    alarmId: "SQ_0125",
-    alarmType: "windturbine",
-    characteristic: "预警",
-    components: "BPQ",
-    confirmed: false,
-    description: "变频器故障27",
-    deviceId: "SXJ_KGDL_XWT_F_WT_0014_EQ",
-    devicename: "14号风机",
-    deviceType: "windturbine",
-    enabled: true,
-    lineid: "SXJ_KGDL_XWTF01_LN",
-    linename: "一号风机线",
-    modelId: "SEC-W02B-1250kW",
-    projectid: "SXJ_KGDL_XWTF01_EG",
-    projectname: "一期项目",
-    rank: 3,
-    resettable: false,
-    stationid: "SXJ_KGDL_XWT_FDC_STA",
-    stationname: "13风电场",
-    subcomponents: "NULL",
-    suffix: null,
-    tagid: "FD-YYXWT-ShangQi.140623F1412MDL01BF399DB0122SP01RAW00",
-    triggertype: 1463,
-    uniformcode: "BJ0001",
-    superTableName: null,
-    ts: 1718160795000,
-    val: 1,
-    oval: null,
-    endts: 0,
-    timelong: 0,
-    name: null,
-    nemCode: "状态码1463",
-    faultCause: "13.7s>信号<=14.2s",
-    resolvent: "输入端142功率上升延迟300s",
-    wpName: "13风电场",
-    code: "#14",
-    wpId: null,
-    faultType: null,
-    id: "sxj_kgdl_xwt_f_wt_0014_eq_sq_0125",
+  tableLoading.value = true;
+  let params = {
+    pageNum: query.page,
+    pageSize: query.limit,
+    alarmId: state.alarmId,
+    alarmType: "custom",
+    deviceType: state.typeVal,
+    stationid: state.stationId,
+    deviceid:
+      state.deviceId || (state.typeVal == "booststation" ? "" : state.deviceId),
+    modelId: state.typeVal == "booststation" ? "" : state.modelId,
+    components: state.components,
+    description: state.description,
+    begin: state.dateTime[0],
+    end: state.dateTime[1],
+  };
+  const { data } = await alarm_history(params);
+  tableLoading.value = false;
+  query.pageTotal = data?.total;
+  data?.ls?.forEach((ele) => {
+    ele.isCloseName = ele.endts ? "已解除" : "未解除";
+    ele.deviceTypeName = tableFilter(ele.deviceType);
+    ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "--";
+    ele.devicename = changName(ele)
   });
+  state.tableData = data?.ls;
 };
+const changName = (ele) => {
+  let str = ele.stationname.substring(0, ele.stationname.indexOf('风电场'))
+  return ele.devicename.substring(str.length, ele.devicename.length)
+}
 //报警类型变化
 const typechange = () => {
   state.alarmId = "";
@@ -666,12 +649,12 @@ const typechange = () => {
 const export2Excel = async () => {
   let params = {
     pageNum: query.page,
-    pageSize: query.pageTotal,
+    pageSize: query.limit,
     alarmId: state.alarmId,
     alarmType: "custom",
     deviceType: state.typeVal,
-    stationid: state.stationId,
-    deviceid:
+    stationId: state.stationId,
+    deviceId:
       state.deviceId || (state.typeVal == "booststation" ? "" : state.deviceId),
     modelId: state.typeVal == "booststation" ? "" : state.modelId,
     components: state.components,
@@ -696,11 +679,11 @@ const export2Excel = async () => {
       tableHeader = state.tableHeader1.map((item) => item.title);
       tableKey = state.tableHeader1.map((item) => item.code);
     }
-    const stationName = stationList.value.find((ele) => {
-      return ele.id === state.stationId;
-    }).name;
+    const stationName =
+      stationList.value.find((ele) => {
+        return ele.id === state.stationId;
+      })?.name || "";
     const fileName = `${stationName} ${state.dateTime[0]} ~ ${state.dateTime[1]} 数据表`;
-    console.log(data.ls);
     outExportExcel(
       tableHeader,
       tableKey,
@@ -759,9 +742,8 @@ p {
   margin: 0;
 }
 .custom-warning {
-  height: 100%;
-  width: 100%;
-  padding: 0 20px;
+  height: calc(100% - 40px);
+  padding-left: 20px;
   padding-bottom: 10px;
   .form-wrapper ::v-deep {
     display: flex;
@@ -798,8 +780,9 @@ p {
       justify-content: flex-end;
       margin-right: 10px;
       position: absolute;
-      right: 0;
-      top: 53px;
+      right: 100px;
+      // top: 53px;
+      top: 13px;
     }
 
     .buttons {
@@ -815,14 +798,19 @@ p {
     }
   }
   .table-wrapper {
-    height: calc(100% - 43px);
-    width: 100%;
+    height: calc(100% - 60px);
+    width: calc(100% - 20px);
+    .leftContent[data-type~="greenSty"] {
+      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
+    }
+    .leftContent[data-type~="blueSty"] {
+      background: url("~@/assets/imgs/title_left_bg.png") no-repeat;
+    }
     .leftContent {
       width: 242px;
       height: 41px;
       display: flex;
       align-items: center;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
 
       span {
         font-size: 16px;

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

@@ -7,6 +7,7 @@
           <div class="search-content">
             <el-select
               v-model="state.typeVal"
+              style="width: 100px"
               clearable
               size="mini"
               placeholder="全部"
@@ -35,6 +36,7 @@
           <div class="search-content">
             <el-select
               v-model="state.stationId"
+              style="width: 120px"
               clearable
               size="mini"
               placeholder="全部"
@@ -55,6 +57,7 @@
           <div class="search-content">
             <el-select
               v-model="state.deviceId"
+              style="width: 120px"
               clearable
               size="mini"
               placeholder="全部"
@@ -75,6 +78,7 @@
           <div class="search-content">
             <el-select
               v-model="state.modelId"
+              style="width: 120px"
               clearable
               size="mini"
               placeholder="全部"
@@ -95,10 +99,13 @@
           <div class="search-content">
             <el-select
               v-model="state.components"
+              style="width: 120px"
               clearable
               size="mini"
               placeholder="全部"
               popper-class="select"
+              multiple
+              collapse-tags
             >
               <el-option
                 v-for="item in componentList"
@@ -138,8 +145,9 @@
         </div>
       </div>
       <div class="btns">
-        <el-button class="buttons" round size="mini">查询</el-button>
-        <!-- @click="getAlarmHistoryt" -->
+        <el-button class="buttons" round size="mini" @click="getAlarmHistoryt"
+          >查询</el-button
+        >
         <el-button
           size="mini"
           class="buttons"
@@ -149,27 +157,25 @@
         >
           导出</el-button
         >
-        <!--  @click="export2Excel" -->
-        <el-button
+        <!-- <el-button
           class="buttons"
           round
           size="mini"
           :disabled="!state.tableData?.length"
+          @click="confirmItem(state.tableData)"
           >确认本页</el-button
-        >
-        <!-- @click="confirmItem(state.tableData)" -->
+        > -->
       </div>
     </div>
 
     <div class="table-wrapper">
-      <div class="leftContent">
+      <div class="leftContent" :data-type="$store.state.moreSty">
         <span>{{ pageTitle }}</span>
       </div>
       <el-table
         size="mini"
         :data="state.tableData"
-        height="calc(100% - 35px - 55px)"
-        style="width: 100%"
+        style="width: 100%; height: calc(100% - 35px - 55px)"
         stripe
       >
         <template v-if="state.isshowwindturbineName">
@@ -205,6 +211,10 @@
                 >
                   {{ scope.row.confirmed ? "是" : "否" }}
                 </span>
+                <span v-else-if="item.code == 'components'">
+                  <!-- {{ getComponentsName(scope.row.components) }} -->
+                  {{ scope.row.components }}
+                </span>
                 <span v-else>
                   {{
                     scope.row[item.code] != "NULL" ? scope.row[item.code] : "--"
@@ -220,8 +230,14 @@
             align="center"
           >
             <template #default="scope">
-              <el-button type="text" style="color: #05bb4c">确认本条</el-button>
-              <!-- @click="confirmItem([scope.row])" -->
+              <el-button
+                type="text"
+                :style="`color: ${
+                  $store.state.theme ? '#1890ff' : '#47aee7'
+                } !important`"
+                @click="confirmItem([scope.row])"
+                >确认本条</el-button
+              >
             </template>
           </el-table-column>
         </template>
@@ -270,8 +286,12 @@
             fixed="right"
           >
             <template #default="scope">
-              <el-button type="text" style="color: #05bb4c">确认本条</el-button>
-              <!--   @click="confirmItem([scope.row])" -->
+              <el-button
+                type="text"
+                style="color: #05bb4c"
+                @click="confirmItem([scope.row])"
+                >确认本条</el-button
+              >
             </template>
           </el-table-column>
         </template>
@@ -285,8 +305,8 @@
           :total="query.pageTotal"
           @size-change="
             (value) => {
-              query.page = 1;
               query.limit = value;
+              query.page = 1;
               getAlarmHistoryt();
             }
           "
@@ -298,8 +318,6 @@
 </template>
 
 <script setup name="historyWarning">
-import { getStation } from "@/api/performance";
-import { getApiequipmentListByWp } from "@/api/monthlyPerformanceAnalysis.js";
 import { watch, reactive, nextTick, computed, onMounted, ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import BASE from "@/tools/basicTool.js";
@@ -321,6 +339,14 @@ const store = useStore();
 
 const route = useRoute();
 
+const getComponentsName = (components) => {
+  const listItem =
+    componentList?.value?.find((ele) => {
+      return ele.nemCode === components;
+    }) || {};
+  return listItem?.name || "";
+};
+
 onMounted(() => {
   state.dateTime = [
     dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
@@ -338,15 +364,59 @@ onMounted(() => {
     state.typeVal = route.query.deviceType || "booststation";
   }
   state.isshowwindturbineName = state.typeVal == "booststation" ? false : true;
-
-  getAlarmHistoryt()
   //   if (route.query.ts) {
   //     state.dateTime = [
   //       `${dayjs(Number(route.query.ts)).format("YYYY-MM-DD")} 00:00:00`,
   //       dayjs(Number(route.query.ts)).format("YYYY-MM-DD HH:mm:ss"),
   //     ];
   //   }
-  // getStationList(); //场站
+
+  state.tableData = new Array(5).fill({
+    tbName: null,
+    alarmId: "SQ_0125",
+    alarmType: "windturbine",
+    characteristic: "报警",
+    components: "BPQ",
+    confirmed: false,
+    description: "变频器故障27",
+    deviceId: "SXJ_KGDL_XWT_F_WT_0014_EQ",
+    devicename: "14号风机",
+    deviceType: "windturbine",
+    enabled: true,
+    lineid: "SXJ_KGDL_XWTF01_LN",
+    linename: "一号风机线",
+    modelId: "SEC-W02B-1250kW",
+    projectid: "SXJ_KGDL_XWTF01_EG",
+    projectname: "一期项目",
+    rank: 3,
+    resettable: false,
+    stationid: "",
+    stationname: "13风电场",
+    subcomponents: "NULL",
+    suffix: null,
+    tagid: "FD-YYXWT-ShangQi.140623F1412MDL01BF399DB0122SP01RAW00",
+    triggertype: 1463,
+    uniformcode: "BJ0001",
+    superTableName: null,
+    ts: 1718160795000,
+    val: 1,
+    oval: null,
+    endts: 0,
+    timelong: 0,
+    name: null,
+    nemCode: "状态码1463",
+    faultCause: "13.7s>信号<=14.2s",
+    resolvent: "输入端142功率上升延迟300s",
+    wpName: "13风电场",
+    code: "#14",
+    wpId: null,
+    faultType: null,
+    id: "sxj_kgdl_xwt_f_wt_0014_eq_sq_0125",
+  });
+
+  getStationList(); //场站
+  // getAlarmHistoryt();
+
   getequipmentmodel_list(); //机型
   getfetchRelatePart(); //部件
 });
@@ -362,7 +432,7 @@ const getfetchRelatePart = async () => {
 };
 
 const confirmItem = (alarmItem) => {
-  ElMessageBox("您确定要执行此操作吗？", "提示", {
+  ElMessageBox.confirm("您确定要执行此操作吗？", "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
@@ -413,7 +483,7 @@ const state = reactive({
     // },
   ],
   typeVal: "windturbine",
-  stationId: "",
+  stationId: "GJNY_SXGS_ZZ_FDC_STA",
   stationName: "",
   alarmId: "",
   windturbineList: [],
@@ -421,7 +491,7 @@ const state = reactive({
   modelListAll: {},
   fetchListAll: {},
   modelId: "", //型号
-  components: "", //部件
+  components: [], //部件
   description: "", //描述
   dateTime: [],
   startDate: null,
@@ -431,12 +501,12 @@ const state = reactive({
   ts: "",
   tableHeader: [
     { title: "时间", code: "ts", width: "150" },
-    { title: "场站", code: "stationname", width: "150" },
-    { title: "机组", code: "devicename", width: "150" },
-    { title: "报警信息", code: "description", width: "180" },
-    { title: "故障原因", code: "faultCause" },
+    { title: "场站", code: "stationname", width: "120" },
+    { title: "机组", code: "devicename", width: "100" },
+    { title: "报警信息", code: "description" },
+    // { title: "故障原因", code: "faultCause" },
     // { title: "级别", code: "rank", width: "80" },
-    { title: "故障编码", code: "nemCode", width: "100" },
+    { title: "部件类型", code: "components", width: "120" },
     // { title: "故障解决方法", code: "resolvent" },
     { title: "报警解除时间", code: "endtsName", width: "150" },
     {
@@ -470,34 +540,28 @@ const state = reactive({
 const stationList = ref([]);
 //获取场站列表
 const getStationList = async () => {
-  const { data } = await getStation({
-    companyids: 0,
-    type: state.typeVal == "windturbine" ? -1 : -2,
-  });
-
-  stationList.value = data.data;
-
-  state.stationId = stationList.value[0]?.id;
-  getWindturbineList();
-  //   if (state.deviceId && state.typeVal != "booststation") {
-  //     let station = data.data.find((i) => {
-  //       let st = i.id.split("_")[2];
-  //       let dt = state.deviceId.split("_")[2];
-  //       if (st == dt) {
-  //         return i;
-  //       }
-  //     });
-  //     state.stationId = station?.id;
-  //   } else if (state.typeVal == "booststation") {
-  //     let station = data.data.find((i) => i.name == state.stationName);
-  //     state.stationId = station ? station?.id : data.data[0]?.id;
-  //   } else {
-  //     state.stationId = data.data[0]?.id;
-  //   }
+  const { data } = await getWpList(state.typeVal);
+  stationList.value = data;
+  if (state.deviceId && state.typeVal != "booststation") {
+    let station = data.find((i) => {
+      let st = i.id.split("_")[2];
+      let dt = state.deviceId.split("_")[2];
+      if (st == dt) {
+        return i;
+      }
+    });
+    // state.stationId = station?.id;
+  } else if (state.typeVal == "booststation") {
+    let station = data.find((i) => i.name == state.stationName);
+    // state.stationId = station ? station?.id : data[0]?.id;
+  } else {
+    // state.stationId = data[0]?.id;
+  }
 
-  //   state.stationId = route.query.stationId || state.stationId;
-  //   route.query.stationId ? (state.modelId = modelList.value?.[0]?.id || "") : "";
+  state.stationId = route.query.stationId || state.stationId;
+  route.query.stationId ? (state.modelId = modelList.value?.[0]?.id || "") : "";
   if (stationList.value.length) {
+    getWindturbineList();
   }
 };
 
@@ -517,17 +581,17 @@ const getStationList = async () => {
 watch(
   () => route,
   (val, old) => {
-    // if (route.query.deviceType != "booststation") {
-    //   state.deviceId = route.query.deviceId || "";
-    //   state.alarmId = route.query.alarmId || "";
-    //   state.typeVal = route.query.deviceType || "windturbine";
-    //   state.modelId = route.query.modelId || "";
-    // } else {
-    //   state.stationName = route.query.deviceId;
-    //   state.deviceId = "";
-    //   state.alarmId = route.query.alarmId || "";
-    //   state.typeVal = route.query.deviceType || "booststation";
-    // }
+    if (route.query.deviceType != "booststation") {
+      state.deviceId = route.query.deviceId || "";
+      state.alarmId = route.query.alarmId || "";
+      state.typeVal = route.query.deviceType || "windturbine";
+      state.modelId = route.query.modelId || "";
+    } else {
+      state.stationName = route.query.deviceId;
+      state.deviceId = "";
+      state.alarmId = route.query.alarmId || "";
+      state.typeVal = route.query.deviceType || "booststation";
+    }
     state.isshowwindturbineName =
       state.typeVal == "booststation" ? false : true;
     getStationList();
@@ -539,336 +603,85 @@ watch(
 );
 //型号列表
 const modelList = computed(() => {
-  return [
-    {
-      id: "SEC-W02B-1250kW",
-      nemCode: "SEC-W02B-1250kW",
-      name: "SEC-W02B-1250kW",
-      aname: "SEC-W02B-1250kW",
-      description: "DI",
-      powerProduction: 1250,
-      windturbineManufacturerId: "SHDQ_MF",
-      photo: null,
-      unit: null,
-      cutinwindSpeed: 3,
-      ratedwindSpeed: 11,
-      cutoutwindSpeed: "25",
-      sweptArea: 5800,
-      equipmentCategory: "F",
-    },
-  ];
-  //   if (state.typeVal != "booststation") {
-  //     if (state.stationId == "") {
-  //       return [];
-  //     } else {
-  //       state.modelId = route.query.deviceId ? route.query.modelId : "";
-  //       return state.modelListAll[state.stationId];
-  //     }
-  //   } else {
-  //     return [];
-  //   }
+  if (state.typeVal != "booststation") {
+    if (state.stationId == "") {
+      return [];
+    } else {
+      state.modelId = route.query.deviceId ? route.query.modelId : "";
+      return state.modelListAll[state.stationId];
+    }
+  } else {
+    return [];
+  }
 });
 //部件列表
 const componentList = computed(() => {
-  return [
-    {
-      id: "1",
-      category: "alertrule_category",
-      nemCode: "YP",
-      name: "叶片",
-      orderNumber: 1,
-      enable: 1,
-    },
-    {
-      id: "2",
-      category: "alertrule_category",
-      nemCode: "LG",
-      name: "轮毂",
-      orderNumber: 2,
-      enable: 1,
-    },
-    {
-      id: "3",
-      category: "alertrule_category",
-      nemCode: "TJ",
-      name: "塔架",
-      orderNumber: 3,
-      enable: 1,
-    },
-    {
-      id: "4",
-      category: "alertrule_category",
-      nemCode: "JC",
-      name: "机舱",
-      orderNumber: 4,
-      enable: 1,
-    },
-    {
-      id: "5",
-      category: "alertrule_category",
-      nemCode: "KZXT",
-      name: "控制系统",
-      orderNumber: 5,
-      enable: 1,
-    },
-    {
-      id: "6",
-      category: "alertrule_category",
-      nemCode: "BJXT",
-      name: "变桨系统",
-      orderNumber: 6,
-      enable: 1,
-    },
-    {
-      id: "7",
-      category: "alertrule_category",
-      nemCode: "PHXT",
-      name: "偏航系统",
-      orderNumber: 7,
-      enable: 1,
-    },
-    {
-      id: "8",
-      category: "alertrule_category",
-      nemCode: "CLX",
-      name: "齿轮箱",
-      orderNumber: 8,
-      enable: 1,
-    },
-    {
-      id: "9",
-      category: "alertrule_category",
-      nemCode: "FDJ",
-      name: "发电机",
-      orderNumber: 9,
-      enable: 1,
-    },
-    {
-      id: "10",
-      category: "alertrule_category",
-      nemCode: "BPQ",
-      name: "变频器",
-      orderNumber: 10,
-      enable: 1,
-    },
-    {
-      id: "11",
-      category: "alertrule_category",
-      nemCode: "YYXT",
-      name: "液压系统",
-      orderNumber: 11,
-      enable: 1,
-    },
-    {
-      id: "12",
-      category: "alertrule_category",
-      nemCode: "FZXT",
-      name: "辅助系统",
-      orderNumber: 12,
-      enable: 1,
-    },
-    {
-      id: "13",
-      category: "alertrule_category",
-      nemCode: "CFXT",
-      name: "测风系统",
-      orderNumber: 13,
-      enable: 1,
-    },
-    {
-      id: "14",
-      category: "alertrule_category",
-      nemCode: "DWXT",
-      name: "电网系统",
-      orderNumber: 14,
-      enable: 1,
-    },
-    {
-      id: "15",
-      category: "alertrule_category",
-      nemCode: "TDG",
-      name: "塔底柜",
-      orderNumber: 15,
-      enable: 1,
-    },
-    {
-      id: "16",
-      category: "alertrule_category",
-      nemCode: "CDL",
-      name: "传动链",
-      orderNumber: 16,
-      enable: 1,
-    },
-    {
-      id: "17",
-      category: "alertrule_category",
-      nemCode: "QT",
-      name: "其他",
-      orderNumber: 17,
-      enable: 1,
-    },
-    {
-      id: "42",
-      category: "alertrule_category",
-      nemCode: "CGQ",
-      name: "传感器",
-      orderNumber: 19,
-      enable: 1,
-    },
-    {
-      id: "41",
-      category: "alertrule_category",
-      nemCode: "BYQ",
-      name: "变压器",
-      orderNumber: 18,
-      enable: 1,
-    },
-    {
-      id: "44",
-      category: "alertrule_category",
-      nemCode: "ZZ",
-      name: "主轴",
-      orderNumber: 20,
-      enable: 1,
-    },
-  ];
-  //   if (state.typeVal != "booststation") {
-  //     if (state.stationId == "") {
-  //       return [];
-  //     } else {
-  //       if (state.stationId.includes("FDC")) {
-  //         return state.fetchListAll?.fjbj;
-  //       } else {
-  //         return state.fetchListAll?.gfbj;
-  //       }
-  //     }
-  //   } else {
-  //     return [];
-  //   }
+  if (state.typeVal != "booststation") {
+    if (state.stationId == "") {
+      return [];
+    } else {
+      if (state.stationId.includes("FDC")) {
+        return state.fetchListAll?.fjbj;
+      } else {
+        return state.fetchListAll?.gfbj;
+      }
+    }
+  } else {
+    return [];
+  }
 });
 //get 风机
 const getWindturbineList = async () => {
   state.deviceId = "";
-
-  //   const { data } = await getApiequipmentListByWp({ wpid: state.stationId });
-
-  state.windturbineList = [
-    {
-      id: "SXJ_KGDL_XWT_F_WT_0001_EQ",
-      nemCode: "#1",
-      windpowerstationId: "SXJ_KGDL_XWT_FDC_STA",
-      longitude: 112.415335,
-      latitude: 40.281307,
-      modelId: "SEC-W02B-1250kW",
-      status: "NULL",
-      projectId: "SXJ_KGDL_XWTF01_EG",
-      lineId: "SXJ_KGDL_XWTF01_LN",
-      firstIntegratedTime: "2008-07-27T16:00:00.000+0000",
-      photo: "NULL",
-      name: "01号风机",
-      aname: "#1",
-      isStandard: 1,
-      regionId: "NX_FGS",
-      companyId: "SXJ_KGDL_FLFD_ZGS",
-      isable: 1,
-      equipmentCategory: -1,
-      parentId: "NULL",
-      squareId: "NULL",
-      spare1: "WT",
-      spare2: "1",
-      spare3: "NULL",
-      spare4: "NULL",
-      orderNum: 271,
-      substationId: "SXJ_KGDL_XWTF01_SBS",
-    },
-  ];
+  const { data } = await fetchWindturbineList(state.stationId || "");
+  state.windturbineList = data;
   //   state.modelId = modelList.value?.[0]?.id || "";
   await getAlarmHistoryt();
 };
 const query = reactive({
   page: 1,
-  limit: 21,
+  limit: 1000,
   pageTotal: null,
 });
 
 // 获取历史记录表
 const getAlarmHistoryt = async () => {
-  //   if (route.params.deviceId && route.params.alarmId) {
-  //     state.stationId = "";
-  //   }
-  //   BASE.showLoading();
-  //   let params = {
-  //     pageNum: query.page,
-  //     pageSize: query.limit,
-  //     alarmId: state.alarmId,
-  //     alarmType: state.typeVal,
-  //     stationid: state.stationId,
-  //     deviceid: state.typeVal == "booststation" ? "" : state.deviceId,
-  //     modelId: state.typeVal == "booststation" ? "" : state.modelId,
-  //     components: state.components,
-  //     description: state.description,
-  //     begin: state.dateTime[0],
-  //     end: state.dateTime[1],
-  //   };
-  //   const { data } = await alarm_history(params);
-  //   BASE.closeLoading();
-  //   query.pageTotal = data?.total;
-  //   data?.ls?.forEach((ele) => {
-  //     ele.isCloseName = ele.endts ? "已解除" : "未解除";
-  //     ele.alarmTypeName =
-  //       ele.alarmType === "booststation"
-  //         ? "升压站"
-  //         : ele.alarmType === "windturbine"
-  //         ? "风机"
-  //         : ele.alarmType === "inverter"
-  //         ? "光伏"
-  //         : "";
-  //     ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "--";
-  //   });
-  //   state.tableData = data?.ls;
-  state.tableData = new Array(5).fill({
-    tbName: null,
-    alarmId: "SQ_0125",
-    alarmType: "windturbine",
-    characteristic: "报警",
-    components: "BPQ",
-    confirmed: false,
-    description: "变频器故障27",
-    deviceId: "SXJ_KGDL_XWT_F_WT_0014_EQ",
-    devicename: "14号风机",
-    deviceType: "windturbine",
-    enabled: true,
-    lineid: "SXJ_KGDL_XWTF01_LN",
-    linename: "一号风机线",
-    modelId: "SEC-W02B-1250kW",
-    projectid: "SXJ_KGDL_XWTF01_EG",
-    projectname: "一期项目",
-    rank: 3,
-    resettable: false,
-    stationid: "SXJ_KGDL_XWT_FDC_STA",
-    stationname: "13风电场",
-    subcomponents: "NULL",
-    suffix: null,
-    tagid: "FD-YYXWT-ShangQi.140623F1412MDL01BF399DB0122SP01RAW00",
-    triggertype: 1463,
-    uniformcode: "BJ0001",
-    superTableName: null,
-    ts: 1718160795000,
-    val: 1,
-    oval: null,
-    endts: 0,
-    timelong: 0,
-    name: null,
-    nemCode: "状态码1463",
-    faultCause: "13.7s>信号<=14.2s",
-    resolvent: "输入端142功率上升延迟300s",
-    wpName: "13风电场",
-    code: "#14",
-    wpId: null,
-    faultType: null,
-    id: "sxj_kgdl_xwt_f_wt_0014_eq_sq_0125",
+  BASE.showLoading();
+  let params = {
+    pageNum: query.page,
+    pageSize: query.limit,
+    alarmId: state.alarmId,
+    alarmType: state.typeVal,
+    stationid: state.stationId,
+    deviceid: state.typeVal == "booststation" ? "" : state.deviceId,
+    modelId: state.typeVal == "booststation" ? "" : state.modelId,
+    components: state.components.toString(),
+    description: state.description,
+    begin: state.dateTime[0],
+    end: state.dateTime[1],
+  };
+  const { data } = await alarm_history(params);
+  BASE.closeLoading();
+  query.pageTotal = data?.total;
+  data?.ls?.forEach((ele) => {
+    ele.isCloseName = ele.endts ? "已解除" : "未解除";
+    ele.alarmTypeName =
+      ele.alarmType === "booststation"
+        ? "升压站"
+        : ele.alarmType === "windturbine"
+        ? "风机"
+        : ele.alarmType === "inverter"
+        ? "光伏"
+        : "";
+    ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "--";
+    ele.devicename = changName(ele)
   });
+  state.tableData = data?.ls;
 };
+const changName = (ele) => {
+  let str = ele.stationname.substring(0, ele.stationname.indexOf('风电场'))
+  return ele.devicename.substring(str.length, ele.devicename.length)
+}
 //报警类型变化
 const typechange = () => {
   state.alarmId = "";
@@ -880,10 +693,10 @@ const typechange = () => {
 const export2Excel = async () => {
   let params = {
     pageNum: query.page,
-    pageSize: query.pageTotal,
+    pageSize: query.limit,
     alarmType: state.typeVal,
-    stationid: state.stationId,
-    deviceid: state.typeVal == "booststation" ? "" : state.deviceId,
+    stationId: state.stationId,
+    deviceId: state.typeVal == "booststation" ? "" : state.deviceId,
     modelId: state.modelId,
     components: state.components,
     description: state.description,
@@ -899,7 +712,8 @@ const export2Excel = async () => {
   } else {
     let tableHeader = [];
     let tableKey = [];
-    const { data } = await alarm_history(params);
+    // const { data } = await alarm_history(params);
+    const data = { ls: state?.tableData || [] };
     if (state.isshowwindturbineName) {
       tableHeader = state.tableHeader.map((item) => item.title);
       tableKey = state.tableHeader.map((item) => item.code);
@@ -907,9 +721,10 @@ const export2Excel = async () => {
       tableHeader = state.tableHeader1.map((item) => item.title);
       tableKey = state.tableHeader1.map((item) => item.code);
     }
-    const stationName = stationList.value.find((ele) => {
-      return ele.id === state.stationId;
-    }).name;
+    const stationName =
+      stationList.value.find((ele) => {
+        return ele.id === state.stationId;
+      })?.name || "";
     const fileName = `${stationName} ${state.dateTime[0]} ~ ${state.dateTime[1]} 数据表`;
     outExportExcel(
       tableHeader,
@@ -975,8 +790,7 @@ p {
   margin: 0;
 }
 .history-warning {
-  height: 100%;
-  width: 100%;
+  height: calc(100% - 40px);
   padding: 0 20px;
   padding-bottom: 10px;
   .form-wrapper ::v-deep {
@@ -1014,8 +828,8 @@ p {
       justify-content: flex-end;
       margin-right: 10px;
       position: absolute;
-      right: 0;
-      top: 53px;
+      right: 80px;
+      top: 13px;
     }
 
     .buttons {
@@ -1031,14 +845,19 @@ p {
     }
   }
   .table-wrapper {
-    height: calc(100% - 43px);
-    width: 100%;
+    height: calc(100% - 60px);
+    width: calc(100% - 20px);
+    .leftContent[data-type~="greenSty"] {
+      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
+    }
+    .leftContent[data-type~="blueSty"] {
+      background: url("~@/assets/imgs/title_left_bg.png") no-repeat;
+    }
     .leftContent {
       width: 242px;
       height: 41px;
       display: flex;
       align-items: center;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
 
       span {
         font-size: 16px;

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

@@ -1406,7 +1406,7 @@
     const funCheckwindsAll = () => {
         checkAllWind.value = !checkAllWind.value;
         if (checkAllWind.value) {
-            state.windSObj = windSList.value.map((o) => o.processId);
+            state.windSObj = windSList.value.map((o) => o.id);
         } else {
             state.windSObj = [];
         }