Просмотр исходного кода

告警中心修改提示颜色

xiaohaizhao 2 лет назад
Родитель
Сommit
ae06c2487e

+ 12 - 5
packageA/alerts/detail.vue

@@ -16,9 +16,9 @@
                 </view>
                 <view class="row">设备:{{ detail.devicename }}({{ detail.serialnumber }})</view>
                 <view class="time-row">最近告警时间: <view class="tag" :style="{
-                    color: tagStyleList[detail.lasteventlevel + 1].color,
-                    backgroundColor: tagStyleList[detail.lasteventlevel + 1].backgroundColor,
-                }">{{ tagStyleList[detail.lasteventlevel + 1].name }}</view> <text class="time">{{
+                    color: tagStyleList[detail.lasteventlevel - 1].color,
+                    backgroundColor: tagStyleList[detail.lasteventlevel - 1].backgroundColor,
+                }">{{ tagStyleList[detail.lasteventlevel - 1].name }}</view> <text class="time">{{
     detail.lasteventtime }}</text>
                 </view>
             </view>
@@ -31,7 +31,7 @@
             <view class="item" v-for="item in list" :key="item.eventtime">
                 <view class="time">{{ item.eventtime }}</view>
                 <view class="row">
-                    暂时没有描述,触发
+                    {{ item.showValue }}
                     <text class="text" :style="{ color: tagStyleList[item.level + 1].color }">
                         {{ tagStyleList[item.level + 1].name }}告警
                     </text>
@@ -115,7 +115,14 @@ export default {
                 content.pageNumber += 1;
                 content.pageTotal = res.pageTotal;
                 this.content = content;
-                this.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data)
+                let list = res.data.map(v => {
+                    v.showValue = ""
+                    v.paramvalues.forEach(item => {
+                        v.showValue += `当前设备${item.paramname}值为${item.paramvalue},${item.symbol + item.eventvalue}时触发`
+                    })
+                    return v
+                })
+                this.list = res.pageNumber == 1 ? list : this.list.concat(list)
                 this.empty = res.data.length == 0;
             })
         },

+ 8 - 1
packageA/alerts/index.vue

@@ -93,7 +93,14 @@ export default {
                 } catch (error) {
 
                 }
-                this.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data)
+                let list = res.data.map(v => {
+                    v.showValue = ""
+                    v.lasteventparamvalues.forEach(item => {
+                        v.showValue += `当前设备${item.paramname}值为${item.paramvalue},${item.symbol + item.eventvalue}时触发警告;`
+                    })
+                    return v
+                })
+                this.list = res.pageNumber == 1 ? list : this.list.concat(list)
                 this.content = content;
             })
         },

+ 7 - 9
packageA/alerts/modules/list.vue

@@ -3,15 +3,13 @@
         <navigator :url="'/packageA/alerts/detail?id=' + item.w_event_logid" class="item" hover-class="navigator-hover"
             v-for="item in list " :key="item.w_event_logid">
             <view class="tag" :style="{
-                color: tagStyleList[item.lasteventlevel + 1].color,
-                backgroundColor: tagStyleList[item.lasteventlevel + 1].backgroundColor,
-            }">{{ tagStyleList[item.lasteventlevel + 1].name }}</view>
-            <view class="title u-line-1">{{ item.eventname }}</view>
-            <view class="row u-line-1">设备:{{ item.prodname || ' --' }}</view>
-            <view class="row u-line-1">告警描述:{{ item.lasteventparamvalues || ' --' }}</view>
-            <view class="time">
-                最新告警时间:{{ item.lasteventtime }}
-            </view>
+                color: tagStyleList[item.lasteventlevel - 1].color,
+                backgroundColor: tagStyleList[item.lasteventlevel - 1].backgroundColor,
+            }">{{ tagStyleList[item.lasteventlevel - 1].name }}</view>
+            <view class="title u-line-1">{{ item.eventname || "--" }}</view>
+            <view class="row u-line-1">产品名称:{{ item.prodname || ' --' }}</view>
+            <view class="row u-line-1">告警描述:{{ item.showValue || ' --' }}</view>
+            <view class="time">最新告警时间:{{ item.lasteventtime }}</view>
         </navigator>
     </view>
 </template>

+ 5 - 5
packageA/alerts/modules/styleList.js

@@ -7,22 +7,22 @@ module.exports = {
     }, {
         name: "重要",
         color: "#E55800",
-        brColor: "#FFA972",
+        brColor: "#F47221",
         backgroundColor: "#FFE4D3"
     }, {
         name: "一般",
         color: "#27AD00",
-        brColor: "#87D96F",
+        brColor: "#55B43A",
         backgroundColor: "#E8FFE2"
     }, {
         name: "提醒",
         color: "#096dd9",
-        brColor: "#91d5ff",
+        brColor: "#3874F6",
         backgroundColor: "#e6f7ff"
     }, {
         name: "其他",
         color: "#777777",
-        brColor: "#CCCCCC",
-        backgroundColor: "F5F5F5"
+        brColor: "#BBBBBB",
+        backgroundColor: "#F5F5F5"
     }]
 }