diff --git a/src/views/homeIndex/components/AlarmOverview.vue b/src/views/homeIndex/components/AlarmOverview.vue
index 0659e01..82a5f0e 100644
--- a/src/views/homeIndex/components/AlarmOverview.vue
+++ b/src/views/homeIndex/components/AlarmOverview.vue
@@ -32,10 +32,11 @@
justify-content: space-between;
width: 100%;
align-items: center;
- padding-top: 7.5vh;
+ margin-top: 7.5vh;
text-align: center;
font-size:0.8vw;
color: #DEEFFF;
+ padding: 1.5vw;
}
.alarmIMG {
diff --git a/src/views/homeIndex/components/RealTimeAlarm.vue b/src/views/homeIndex/components/RealTimeAlarm.vue
index 222094f..3614f4e 100644
--- a/src/views/homeIndex/components/RealTimeAlarm.vue
+++ b/src/views/homeIndex/components/RealTimeAlarm.vue
@@ -1,6 +1,125 @@
-
+
+
+
+
+
{{ item.alarmTime }}
+
{{ item.deviceType }}
+
{{ item.deviceIMEI }}
+
{{ item.alarmEvent }}
+
{{ item.alarmLocation }}
+
+
+
+
{{ item.alarmTime }}
+
{{ item.deviceType }}
+
{{ item.deviceIMEI }}
+
{{ item.alarmEvent }}
+
{{ item.alarmLocation }}
+
+
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/views/homeIndex/index.vue b/src/views/homeIndex/index.vue
index 65093f5..ea9b9a9 100644
--- a/src/views/homeIndex/index.vue
+++ b/src/views/homeIndex/index.vue
@@ -65,7 +65,7 @@
-
+
@@ -126,9 +126,9 @@ const currentTime = computed(() => {
.header-info {
position: absolute;
right: 6vh;
- top:3.8vh;
+ top: 3.8vh;
color: #fff;
- font-size:1.8vh;
+ font-size: 1.8vh;
}
/* 全屏地图 */
@@ -188,8 +188,7 @@ const currentTime = computed(() => {
left: 50%;
transform: translateX(-50%);
width: 44vw;
- height: 31vh;
- min-height: 180px;
+ height: calc(39vh - 9vh);
pointer-events: auto;
}
@@ -219,10 +218,13 @@ const currentTime = computed(() => {
}
-/* 模块内容 */
-.module-content {
- padding: 1.5vw;
- position: relative;
+.realtime-header {
+ left: 8vh;
+ top: 3.4vh;
}
+/* 模块内容 */
+.module-content {
+ position: relative;
+}