常规消缺

src/api/zhbj/index.js

@@ -270,6 +270,14 @@ export const GetAlarmIdCustom = (params) => {
     method: "get",
   });
 };
+// 获取预警描述列表
+export const GetAlarmIdCustomNew = (params) => {
+  return request({
+    url: `alertrule/querywtalarmdesclistnew?components=${params.components}&modelId=${params.modelId}&wpId=${params.wpId}`,
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+  });
+};
 //报警修改日志
 export const fetchruleventLogs = (pagenum, pagesize, ruleName, ruleType) => {
   return request({

src/nxfStyle.less

@@ -417,7 +417,8 @@
             .el-cascader-menu {
                 border-color: @gray;
             }
-            .el-select-dropdown__item{
+
+            .el-select-dropdown__item {
                 color: rgb(223, 232, 250);
             }
 

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

@@ -86,15 +86,17 @@
           </div>
         </div>
         <div class="search-item" v-if="state.typeVal !== 'booststation'">
-          <span class="label">报警描述：</span>
+          <span class="label">预警描述：</span>
           <div class="search-content">
             <el-select
+              class="multSelectTages"
               size="mini"
               v-model="state.alarmIds"
-              style="width: 120px"
+              style="width: 300px"
               multiple
               collapse-tags
               placeholder="全部描述"
+              filterable
             >
               <el-option
                 v-for="item in state.alarmIdList"
@@ -139,7 +141,7 @@
       <!--     @cell-click="handle" -->
       <el-table
         :data="state.tableData"
-        height="calc(100% - 30px)"
+        height="calc(100% - 30px - 12px)"
         stripe
         @sort-change="handleSortChange"
       >
@@ -279,6 +281,7 @@ import {
   fetchModel,
   fetchRelatePartAndAlarmType,
   GetAlarmIdCustom,
+  GetAlarmIdCustomNew,
   getWpList,
 } from "@/api/zhbj/index.js";
 import dayjs from "dayjs";
@@ -398,16 +401,17 @@ const getequipmentmodel_list = async () => {
 const getfetchRelatePart = async () => {
   const { data } = await fetchRelatePartAndAlarmType();
   state.fetchListAll = data;
+  getAlarmId();
 };
 //型号列表
 const modelList = [
   {
     id: "WT2000D121H85",
-    name: "WT2000D121H85",
+    name: "中车",
   },
   {
     id: "UP2000-130",
-    name: "UP2000-130",
+    name: "联合动力",
   },
 ];
 // const modelList = computed(() => {
@@ -437,177 +441,177 @@ const modelList = [
 // });
 //部件列表
 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",
-      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.changZhan == "") {
+    return [];
+  } else {
+    if (state.changZhan.includes("FDC")) {
+      return state.fetchListAll?.fjbj;
+    } else {
+      return state.fetchListAll?.gfbj;
+    }
+  }
+  // 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,
+  //   },
+  // ];
 });
 watch(
   () => [modelList, componentList],
@@ -645,7 +649,16 @@ function changeChangzhan(val) {
   getAlarmId();
 }
 function getAlarmId() {
-  GetAlarmIdCustom({
+  // {
+  //   id: "WT2000D121H85",
+  //   name: "WT2000D121H85",
+  // },
+  // {
+  //   id: "UP2000-130",
+  //   name: "UP2000-130",
+  // },
+  // GetAlarmIdCustom
+  GetAlarmIdCustomNew({
     components: state.components,
     modelId: state.modelId,
     wpId: state.changZhan,