告警调整

packageA/alerts/detail.vue

@@ -31,9 +31,26 @@
             <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 }}告警
+                    告警级别：<!-- :style="{ color: tagStyleList[item.level - 1].color }" -->
+                    <text class="text">
+                        {{ tagStyleList[item.level - 1].name }}
+                    </text>
+                </view>
+                <view class="row">
+                    <text v-for="it in item.paramvalues" :key="it.w_dataparamid">
+                        当前设备
+                        <text style="color: rgb(234, 22, 45);"><!--  -->
+                            {{ it.paramname }}
+                        </text>
+                        值为
+                        <text style="color: rgb(234, 22, 45);">
+                            {{ it.paramvalue }}
+                        </text>
+                        ,
+                        <text style="color: rgb(234, 22, 45);">
+                            {{ it.symbol + it.eventvalue }}
+                        </text>
+                        时触发警告;
                     </text>
                 </view>
             </view>
@@ -204,11 +221,12 @@ export default {
     .time {
         color: #333;
         flex-wrap: bold;
-        margin-bottom: 8px;
     }
 
     .row {
         color: #999;
+        font-size: 12px;
+        margin-top: 6px;
     }
 }
 </style>

packageA/alerts/index.vue

@@ -93,14 +93,7 @@ export default {
                 } catch (error) {
 
                 }
-                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.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data)
                 this.content = content;
             })
         },

packageA/alerts/modules/list.vue

@@ -1,14 +1,33 @@
 <template>
     <view>
         <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">
+            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.showValue || ' --' }}</view>
+            <view v-if="isShowProdname" class="row u-line-1">产品名称：{{ item.prodname || ' --' }}</view>
+            <view class="row u-line-1">告警描述：
+                <text v-for="it in item.lasteventparamvalues" :key="it.w_dataparamid">
+                    当前设备
+                    <text><!-- style="color: rgb(234, 22, 45);" -->
+                        {{ it.paramname }}
+                    </text>
+                    值为
+                    <text>
+                        {{ it.paramvalue }}
+                    </text>
+                    ,
+                    <text>
+                        {{ it.symbol + it.eventvalue }}
+                    </text>
+                    时触发警告;
+                </text>
+            </view><!--  :style="{
+                color: item.status == '待处理' ? '#EA162D' : '#55B43A'
+            }" -->
+            <view class="row u-line-1">告警状态：<text>{{ item.status || ' --' }}</text></view>
             <view class="time">最新告警时间：{{ item.lasteventtime }}</view>
         </navigator>
     </view>
@@ -18,7 +37,11 @@ import { styleList } from "./styleList";
 export default {
     name: 'List',
     props: {
-        list: Array
+        list: Array,
+        isShowProdname: {
+            type: Boolean,
+            default: true
+        }
     },
     data() {
         return {