实时报警页面修改，隐藏级别列

src/pages/alarmConfig/bj_custom/custom.vue

@@ -126,7 +126,7 @@
             :label="item.aname"
           ></el-option>
         </el-select>
-        <el-select
+        <!-- <el-select
           v-model="query.rank"
           clearable
           class="mr10"
@@ -140,7 +140,7 @@
             :value="item.id"
             :label="item.name"
           ></el-option>
-        </el-select>
+        </el-select> -->
         <el-input
           placeholder="请输入名称"
           v-model="query.name"
@@ -312,7 +312,7 @@ const state = reactive({
     { title: "表达式", code: "expression", width: "150" },
     { title: "描述", code: "description", width: "150" },
     { title: "所属部件", code: "relatedPartsName" },
-    { title: "级别", code: "rank" },
+    // { title: "级别", code: "rank" },
     { title: "类型", code: "category" },
     { title: "是否启用", code: "enable" },
   ],
@@ -322,7 +322,7 @@ const state = reactive({
     { title: "规则名称", code: "name" },
     { title: "表达式", code: "expression" },
     { title: "描述", code: "description" },
-    { title: "级别", code: "rank" },
+    // { title: "级别", code: "rank" },
     { title: "类型", code: "category" },
     { title: "是否启用", code: "enable" },
   ],
@@ -355,8 +355,9 @@ onMounted(() => {
   getWpArray();
   getfetchRelatePart();
   getequipmentmodel_list();
-  //   getData();
+  getData();
 });
+
 const dialogclose = () => {
   state.visible = false;
   state.form = {};

src/pages/alarmConfig/bj_windturbine/windturbine.vue

@@ -279,7 +279,7 @@ const state = reactive({
     { title: "特性", code: "characteristic" },
     { title: "设备类型", code: "deviceType" },
     { title: "报警类型", code: "alarmType" },
-    { title: "级别", code: "rankName" },
+    // { title: "级别", code: "rankName" },
     { title: "是否启用", code: "enable" },
     { title: "是否可复位", code: "resetTableName" },
   ],
@@ -290,7 +290,7 @@ const state = reactive({
     { title: "表达式", code: "expression" },
     { title: "描述", code: "description" },
     { title: "类型", code: "alarmType" },
-    { title: "级别", code: "rank" },
+    // { title: "级别", code: "rank" },
     { title: "是否启用", code: "enable" },
   ],
 });

src/pages/customWarning/index.vue

@@ -388,7 +388,7 @@ const state = reactive({
     { title: "故障原因", code: "faultCause" },
     // { title: "故障编码", code: "nemCode", width: "100" },
     // { title: "故障解决方法", code: "resolvent" },
-    { title: "级别", code: "rank", width: "80" },
+    // { title: "级别", code: "rank", width: "80" },
     {
       title: "状态",
       code: "isCloseName",
@@ -403,7 +403,7 @@ const state = reactive({
     { title: "时间", code: "ts", width: "150" },
     { title: "升压站", code: "stationname", width: "150" },
     { title: "报警信息", code: "description", width: "250" },
-    { title: "级别", code: "rank", width: "80" },
+    // { title: "级别", code: "rank", width: "80" },
     {
       title: "状态",
       code: "isCloseName",

src/pages/safe/historywaring.vue

@@ -390,7 +390,7 @@ const state = reactive({
     { title: "机组", code: "devicename", width: "150" },
     { title: "报警信息", code: "description", width: "180" },
     { title: "故障原因", code: "faultCause" },
-    { title: "级别", code: "rank", width: "80" },
+    // { title: "级别", code: "rank", width: "80" },
     { title: "故障编码", code: "nemCode", width: "100" },
     // { title: "故障解决方法", code: "resolvent" },
     {
@@ -407,7 +407,7 @@ const state = reactive({
     { title: "时间", code: "ts", width: "150" },
     { title: "升压站", code: "stationname", width: "150" },
     { title: "报警信息", code: "description" },
-    { title: "级别", code: "rank", width: "80" },
+    // { title: "级别", code: "rank", width: "80" },
     {
       title: "状态",
       code: "isCloseName",

src/pages/safe/realwaring.vue

@@ -44,41 +44,47 @@
         </div>
         <div class="lineItem card">
           <Safecom
+            title="风机预警"
+            deviceType="windturbine"
+            alarmType="custom"
+          />
+        </div>
+      </div>
+      <div class="cardLine">
+        <div class="lineItem card">
+          <Safecom
             title="光伏报警"
             deviceType="inverter"
             alarmType="inverter"
           />
         </div>
+
         <div class="lineItem card">
+          <Safecom title="光伏预警" deviceType="inverter" alarmType="custom" />
+        </div>
+        <!-- <div class="lineItem card">
           <Safecom
-            title="升压站报警"
+            title="升压站事件"
             deviceType="booststation"
-            alarmType="booststation"
+            alarmType="custom"
           />
-        </div>
+        </div> -->
       </div>
       <div class="cardLine">
-        <div class="lineItem card">
+        <div class="lineItem card" style="height: 100%">
           <Safecom
-            title="风机预警"
-            deviceType="windturbine"
-            alarmType="custom"
-          />
-        </div>
-        <div class="lineItem card">
-          <Safecom
-            title="光伏预警"
-            deviceType="inverter"
-            alarmType="custom"
+            title="升压站报警"
+            deviceType="booststation"
+            alarmType="booststation"
           />
         </div>
-        <div class="lineItem card">
+        <!-- <div class="lineItem card">
           <Safecom
             title="升压站事件"
             deviceType="booststation"
             alarmType="custom"
           />
-        </div>
+        </div> -->
       </div>
     </div>
     <!-- <div v-dialogdrag>
@@ -367,21 +373,20 @@ const formatTime = (val) => {
 
   .bottomCard {
     display: flex;
-    flex-direction: column;
-    justify-content: space-between;
     align-items: center;
     width: 100%;
     height: 100%;
-
+    justify-content: space-around;
     .cardLine {
-      width: 100%;
-      height: 47.5%;
+      width: calc(100% / 3 - 30px);
+      height: 100%;
       display: flex;
+      flex-direction: column;
       justify-content: space-between;
       align-items: center;
       .lineItem {
-        width: 31%;
-        height: 100%;
+        width: 100%;
+        height: calc(100% / 2 - 26px);
       }
     }
   }

src/pages/safe/safecomponent.vue

@@ -34,7 +34,7 @@
         label="报警信息"
         show-overflow-tooltip
       />
-      <el-table-column label="级别" width="80" show-overflow-tooltip>
+      <!-- <el-table-column label="级别" width="80" show-overflow-tooltip>
         <template #default="scope">
           <el-tag
             class="ml-2"
@@ -48,7 +48,7 @@
             >{{ scope.row.lvName }}</el-tag
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column label="状态" width="75" show-overflow-tooltip>
         <template #default="scope">
@@ -128,7 +128,7 @@
             label="报警解决方法"
             show-overflow-tooltip
           /> -->
-          <el-table-column label="级别" width="100" show-overflow-tooltip>
+          <!-- <el-table-column label="级别" width="100" show-overflow-tooltip>
             <template #default="scope">
               <el-tag
                 class="ml-2"
@@ -142,7 +142,7 @@
                 >{{ scope.row.lvName }}</el-tag
               >
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             label="报警是否解除"
             width="100"