diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue index bee30dd..5ea93e2 100644 --- a/src/views/laboratory/equipment/config/list.vue +++ b/src/views/laboratory/equipment/config/list.vue @@ -53,7 +53,7 @@ columns: ref([ { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, - { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' }, + // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' }, { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' }, { text: 'IP地址', value: 'ip', align: 'center' }, { text: '端口', value: 'port', align: 'center' }, diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue index bee30dd..5ea93e2 100644 --- a/src/views/laboratory/equipment/config/list.vue +++ b/src/views/laboratory/equipment/config/list.vue @@ -53,7 +53,7 @@ columns: ref([ { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, - { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' }, + // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' }, { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' }, { text: 'IP地址', value: 'ip', align: 'center' }, { text: '端口', value: 'port', align: 'center' }, diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue index f0fd0d8..b4bcbcd 100644 --- a/src/views/laboratory/overview/components/message.vue +++ b/src/views/laboratory/overview/components/message.vue @@ -44,26 +44,35 @@ 报警总数{{ form.alarmTotal }} - - {{ form.unconfirmedCount }} - + + + {{ form.unconfirmedCount }} + + + - - {{ form.confirmedCount }} - + + + {{ form.confirmedCount }} + + - - {{ form.canceledCount }} - + + + {{ form.canceledCount }} + + -
- - - - - -
+ +
+ + + + + +
+
@@ -81,6 +90,7 @@ opacity: 1; align-items: center; transition: opacity 0.2s; + z-index: 10; } .carousel-item { diff --git a/src/views/laboratory/equipment/config/list.vue b/src/views/laboratory/equipment/config/list.vue index bee30dd..5ea93e2 100644 --- a/src/views/laboratory/equipment/config/list.vue +++ b/src/views/laboratory/equipment/config/list.vue @@ -53,7 +53,7 @@ columns: ref([ { text: '设备编号', value: 'deviceNo', align: 'center', width: '160' }, { text: '设备名称', value: 'deviceName', align: 'center' }, - { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' }, + // { text: '电流报警阈值', value: 'currentAlarmHigh', align: 'center' }, { text: '电压报警阈值', value: 'voltageAlarmHigh', align: 'center' }, { text: 'IP地址', value: 'ip', align: 'center' }, { text: '端口', value: 'port', align: 'center' }, diff --git a/src/views/laboratory/overview/components/message.vue b/src/views/laboratory/overview/components/message.vue index f0fd0d8..b4bcbcd 100644 --- a/src/views/laboratory/overview/components/message.vue +++ b/src/views/laboratory/overview/components/message.vue @@ -44,26 +44,35 @@ 报警总数{{ form.alarmTotal }} - - {{ form.unconfirmedCount }} - + + + {{ form.unconfirmedCount }} + + + - - {{ form.confirmedCount }} - + + + {{ form.confirmedCount }} + + - - {{ form.canceledCount }} - + + + {{ form.canceledCount }} + + -
- - - - - -
+ +
+ + + + + +
+
@@ -81,6 +90,7 @@ opacity: 1; align-items: center; transition: opacity 0.2s; + z-index: 10; } .carousel-item { diff --git a/src/views/laboratory/overview/index.vue b/src/views/laboratory/overview/index.vue index f17c0c1..cd200bd 100644 --- a/src/views/laboratory/overview/index.vue +++ b/src/views/laboratory/overview/index.vue @@ -429,7 +429,7 @@