Pārlūkot izejas kodu

feat:增加规侧告警升级类型的支持,替换新版logo的ico文件。

microrain 1 gadu atpakaļ
vecāks
revīzija
dce22bb75c

BIN
public/favicon.ico


+ 3 - 1
src/views/iot/alarm/log/component/detail.vue

@@ -7,7 +7,9 @@
         </el-form-item>
         <el-form-item label="告警类型">
           <span v-if="ruleForm.type == 1">规则告警</span>
-          <span v-else>设备自主告警</span>
+          <span v-else-if="ruleForm.type == 2">设备自主告警</span>
+          <span v-else-if="ruleForm.type == 3">规则告警升级</span>
+          <span v-else>设备告警</span>
         </el-form-item>
         <el-form-item label="产品名称">
           {{ product_name }}

+ 4 - 3
src/views/iot/alarm/log/index.vue

@@ -32,7 +32,9 @@
 				<el-table-column label="告警类型" prop="type" width="120" show-overflow-tooltip v-col="'type'">
 					<template #default="scope">
 						<span v-if="scope.row.type == 1">规则告警</span>
-						<span v-else>设备自主告警</span>
+            <span v-else-if="scope.row.type == 2">设备自主告警</span>
+            <span v-else-if="scope.row.type == 3">规侧告警升级</span>
+            <span v-else>设备自主告警</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="规则级别" prop="alarmLevel.name" width="100" align="center" show-overflow-tooltip v-col="'alarmLevel'"></el-table-column>
@@ -62,7 +64,7 @@
 		</el-card>
 	</div>
 </template>
-  
+
 <script lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { FormInstance } from 'element-plus';
@@ -175,4 +177,3 @@ export default defineComponent({
 	},
 });
 </script>
-  

+ 4 - 2
src/views/iot/iotmanager/dashboard.vue

@@ -52,8 +52,10 @@
 						<el-table-column label="ID" align="center" prop="id" width="100" v-col="'ID'" />
 						<el-table-column label="告警类型" width="120" prop="type" align="center" show-overflow-tooltip v-col="'type'">
 							<template #default="scope">
-								<span v-if="scope.row.type == 1">规则告警</span>
-								<span v-else>设备自主告警</span>
+                <span v-if="scope.row.type == 1">规则告警</span>
+                <span v-else-if="scope.row.type == 2">设备自主告警</span>
+                <span v-else-if="scope.row.type == 3">规侧告警升级</span>
+                <span v-else>设备自主告警</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="规则级别" width="120" align="center" prop="alarmLevel.name" show-overflow-tooltip v-col="'alarmLevel'" />