Эх сурвалжийг харах

feat:修改项提交2216

DOVER-GLOBAL\10093976 1 долоо хоног өмнө
parent
commit
0ebc78b8ea

+ 1 - 0
admin.ui.plus-master/src/views/admin/statement/alarmQuery/index.vue

@@ -129,6 +129,7 @@ const state = reactive({
     { prop: 'gasStation', label: '油站名称' },
     { prop: 'alarmType', label: '报警类型' },
     { prop: 'alarmDevice', label: '报警设备' },
+    { prop: 'alarmLevel', label: '报警等级' },
     { prop: 'ruleName', label: '规则名称' },
     { prop: 'pushUser', label: '推送用户' },
     { prop: 'content', label: '推送内容' },

+ 5 - 5
admin.ui.plus-master/src/views/admin/yujing/alarmRules/components/add-alarmRules.vue

@@ -862,11 +862,11 @@ const submitForm = async () => {
     return;
   }
   
-  // 验证油站选择
-  if (selectedStationIds.value.length === 0) {
-    ElMessage.warning('请选择油站');
-    return;
-  }
+  // // 验证油站选择
+  // if (selectedStationIds.value.length === 0) {
+  //   ElMessage.warning('请选择油站');
+  //   return;
+  // }
   
   // 验证推送配置(当isPush为true时)
   if (Data.isPush) {

+ 31 - 3
admin.ui.plus-master/src/views/admin/yujing/alarmRules/index.vue

@@ -57,8 +57,14 @@
         <el-card style="height: 76vh;" class="my-fill mt8" shadow="hover">
           <el-table ref="multipleTableRef" v-loading="Data.loading" stripe :data="Data.tableModel" row-key="id"
             style="width: 100%">
+            <!-- 报警等级列 - 使用彩色球体显示 -->
+            <el-table-column label="报警等级" align="center">
+              <template #default="{ row }">
+                <span class="level-dot" :class="`level-${row.alarmLevel?.toLowerCase()}`"></span>
+              </template>
+            </el-table-column>
             <el-table-column v-for="column in Data.dynamicColumns" :key="column.prop" :prop="column.prop"
-              :label="column.label" />
+              :label="column.label" align="center" />
             <el-table-column label="是否推送" width="100" align="center" show-overflow-tooltip>
               <template #default="{ row }">
                 <span>{{ row.isPush ? '是' : '否' }}</span>
@@ -142,7 +148,6 @@ const Data = reactive({
   /**动态表头 */
   dynamicColumns: [
     { prop: 'tag', label: '标签' },
-    { prop: 'alarmLevel', label: '报警等级' },
     { prop: 'ruleName', label: '规则名称' },
     { prop: 'pushMethod', label: '推送方式' },
     { prop: 'keyWord', label: '关键字匹配' },
@@ -354,4 +359,27 @@ onMounted(async () => {
 .my-el-link {
   margin: 0 6px;
 }
-</style>
+
+/* 报警等级球体样式 */
+.level-dot {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+}
+
+/* 红色等级 */
+.level-red {
+  background-color: #ff4d4f;
+}
+
+/* 黄色等级 */
+.level-yellow {
+  background-color: #faad14;
+}
+
+/* 灰色等级 */
+.level-grey {
+  background-color: #8c8c8c;
+}
+</style>