diff --git a/src/utils/api/index.js b/src/utils/api/index.js index 4d07a1f5..e4af0b43 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -695,3 +695,15 @@ export function listComparatorApi(data) { }, }); } + +//告警信息 +export function warningListApi(data) { + return request({ + url: "/warning/list", + method: "get", + params: data, + headers: { + "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", + }, + }); +} diff --git a/src/views/alarmRules/components/addRules.vue b/src/views/alarmRules/components/addRules.vue index 0001fd41..ae6c5957 100644 --- a/src/views/alarmRules/components/addRules.vue +++ b/src/views/alarmRules/components/addRules.vue @@ -7,7 +7,6 @@ width="520px" :close-on-click-modal="false" > - {{ this.sensorId }} +
+ +
+
+ + {{ + rulesData.typePoint.fieldDesc + }} + {{ + rulesData.comparatorDesc + }} + {{ + rulesData.operatorDesc + }} + + {{ rulesData.threshold }} + + + 停用 + + 启用 + + + + + + + + + + + +
+ 全选 + + + +
+ +
+
+ + + diff --git a/src/views/alarmRules/index.vue b/src/views/alarmRules/index.vue index f32c2894..68365e77 100644 --- a/src/views/alarmRules/index.vue +++ b/src/views/alarmRules/index.vue @@ -48,9 +48,9 @@ - + - + @@ -63,18 +63,19 @@ - + + @@ -115,6 +128,9 @@ export default { .el-table__empty-text { color: #fff; } + .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { + background-color: rgba(255, 27, 27, 0.2); + } .el-table::before { height: 0; } diff --git a/src/views/homePage/windingTemperature/index.vue b/src/views/homePage/windingTemperature/index.vue index c3b15437..824fe093 100644 --- a/src/views/homePage/windingTemperature/index.vue +++ b/src/views/homePage/windingTemperature/index.vue @@ -43,6 +43,11 @@ export default { "154,96,180", "234,124,204", "3,188,255", + "241,113,175", + "180,191,23", + "151,225,137", + "240,23,181", + "125,20,22", ], stime: "", eTime: "",