diff --git a/packages/screen/src/views/cockpit/assets/img/common-panel-header-bg.png b/packages/screen/src/views/cockpit/assets/img/common-panel-header-bg.png
index a4bb9c7..412f21f 100644
Binary files a/packages/screen/src/views/cockpit/assets/img/common-panel-header-bg.png and b/packages/screen/src/views/cockpit/assets/img/common-panel-header-bg.png differ
diff --git a/packages/screen/src/views/cockpit/assets/img/weather-badge-bg.png b/packages/screen/src/views/cockpit/assets/img/weather-badge-bg.png
new file mode 100644
index 0000000..1a80615
Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/img/weather-badge-bg.png differ
diff --git a/packages/screen/src/views/cockpit/components/BlockEvent.vue b/packages/screen/src/views/cockpit/components/BlockEvent.vue
index 43dec11..3f483c3 100644
--- a/packages/screen/src/views/cockpit/components/BlockEvent.vue
+++ b/packages/screen/src/views/cockpit/components/BlockEvent.vue
@@ -14,9 +14,12 @@
{{ stat.title }}
-
{{ stat.value }}
-
公里
-

+
+
{{ stat.value }}
+
公里
+
+
+
@@ -113,13 +116,24 @@ const stats = ref([
}
.stat-unit {
- position: absolute;
- top: vh(50);
- right: vw(20);
+ // position: absolute;
+ // top: vh(50);
+ // right: vw(20);
color: rgba(255, 255, 255, 1);
font-size: fs(15);
}
+
+ .stat-value-container {
+ display: flex;
+ align-items: flex-end;
+ justify-content: space-between;
+ background: url(../assets/img/block-stat-decoration.png) no-repeat;
+ background-size: 100% auto;
+ background-position: bottom;
+ padding: 0 vw(40) vh(10) 0;
+ }
+
.stat-decoration {
width: vw(154);
height: vh(29);
diff --git a/packages/screen/src/views/cockpit/components/EmergencyResources.vue b/packages/screen/src/views/cockpit/components/EmergencyResources.vue
index 2b3edf2..0dcb8d9 100644
--- a/packages/screen/src/views/cockpit/components/EmergencyResources.vue
+++ b/packages/screen/src/views/cockpit/components/EmergencyResources.vue
@@ -13,24 +13,26 @@
应急设备
-
-
{{ index + 1 }}
-
{{ resource.name }}
-
{{ resource.stations }}
-
{{ resource.supplies }}
-
-
{{ resource.equipment }}
-

+
+
+
{{ index + 1 }}
+
{{ resource.qxmc }}
+
{{ resource.yhzCount }}
+
{{ resource.wzCount }}
+
+
{{ resource.sbCount }}
+

+
@@ -38,7 +40,8 @@