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/assets/legendTool/上箭头 .png b/packages/screen/src/views/cockpit/assets/legendTool/上箭头 .png new file mode 100644 index 0000000..8de26a6 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/上箭头 .png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/下箭头.png b/packages/screen/src/views/cockpit/assets/legendTool/下箭头.png new file mode 100644 index 0000000..950ef8e Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/下箭头.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/交调icon.png b/packages/screen/src/views/cockpit/assets/legendTool/交调icon.png new file mode 100644 index 0000000..bf20d63 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/交调icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/交调icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/交调icon定位.png new file mode 100644 index 0000000..5459349 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/交调icon定位.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/图例工具栏iconBg.png b/packages/screen/src/views/cockpit/assets/legendTool/图例工具栏iconBg.png new file mode 100644 index 0000000..8d15d3c Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/图例工具栏iconBg.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/应急力量icon.png b/packages/screen/src/views/cockpit/assets/legendTool/应急力量icon.png new file mode 100644 index 0000000..dbbbba3 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/应急力量icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/应急力量icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/应急力量icon定位.png new file mode 100644 index 0000000..115837b Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/应急力量icon定位.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/普通公路icon.png b/packages/screen/src/views/cockpit/assets/legendTool/普通公路icon.png new file mode 100644 index 0000000..87d8c2c Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/普通公路icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/普通公路icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/普通公路icon定位.png new file mode 100644 index 0000000..6e75d4e Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/普通公路icon定位.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/服务设施icon.png b/packages/screen/src/views/cockpit/assets/legendTool/服务设施icon.png new file mode 100644 index 0000000..444c036 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/服务设施icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/服务设施icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/服务设施icon定位.png new file mode 100644 index 0000000..9f264e7 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/服务设施icon定位.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/桥梁icon.png b/packages/screen/src/views/cockpit/assets/legendTool/桥梁icon.png new file mode 100644 index 0000000..17a0eec Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/桥梁icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/桥梁icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/桥梁icon定位.png new file mode 100644 index 0000000..33dfb42 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/桥梁icon定位.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/气象预警icon.png b/packages/screen/src/views/cockpit/assets/legendTool/气象预警icon.png new file mode 100644 index 0000000..19e0cfe Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/气象预警icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/涉灾隐患点icon.png b/packages/screen/src/views/cockpit/assets/legendTool/涉灾隐患点icon.png new file mode 100644 index 0000000..08e7f32 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/涉灾隐患点icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/涉灾隐患点icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/涉灾隐患点icon定位.png new file mode 100644 index 0000000..5badb1e Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/涉灾隐患点icon定位.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/视频icon.png b/packages/screen/src/views/cockpit/assets/legendTool/视频icon.png new file mode 100644 index 0000000..c51ec84 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/视频icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/视频icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/视频icon定位.png new file mode 100644 index 0000000..5e89340 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/视频icon定位.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/阻断事件icon.png b/packages/screen/src/views/cockpit/assets/legendTool/阻断事件icon.png new file mode 100644 index 0000000..cf9eef5 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/阻断事件icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/阻断事件icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/阻断事件icon定位.png new file mode 100644 index 0000000..40f81ed Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/阻断事件icon定位.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/隧洞icon.png b/packages/screen/src/views/cockpit/assets/legendTool/隧洞icon.png new file mode 100644 index 0000000..47e0e83 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/隧洞icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/隧洞icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/隧洞icon定位.png new file mode 100644 index 0000000..4bf18fa Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/隧洞icon定位.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/风险路段icon.png b/packages/screen/src/views/cockpit/assets/legendTool/风险路段icon.png new file mode 100644 index 0000000..349eb3e Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/风险路段icon.png differ diff --git a/packages/screen/src/views/cockpit/assets/legendTool/风险路段icon定位.png b/packages/screen/src/views/cockpit/assets/legendTool/风险路段icon定位.png new file mode 100644 index 0000000..bb0b716 Binary files /dev/null and b/packages/screen/src/views/cockpit/assets/legendTool/风险路段icon定位.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 @@ icon
{{ stat.title }}
-
{{ stat.value }}
-
公里
- decoration +
+
{{ 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/CockpitLayout.vue b/packages/screen/src/views/cockpit/components/CockpitLayout.vue index 3196e20..506bfae 100644 --- a/packages/screen/src/views/cockpit/components/CockpitLayout.vue +++ b/packages/screen/src/views/cockpit/components/CockpitLayout.vue @@ -9,6 +9,7 @@
+
@@ -26,6 +27,7 @@ import EmergencyResources from './EmergencyResources.vue' import MapCenter from './MapCenter.vue' import BlockEvent from './BlockEvent.vue' import YearStatistics from './YearStatistics.vue' +import LegendToolbar from './LegendToolbar.vue' diff --git a/packages/screen/src/views/cockpit/components/WeatherWarning.vue b/packages/screen/src/views/cockpit/components/WeatherWarning.vue index 42b1561..b5b20a6 100644 --- a/packages/screen/src/views/cockpit/components/WeatherWarning.vue +++ b/packages/screen/src/views/cockpit/components/WeatherWarning.vue @@ -15,16 +15,16 @@
- badge + /> --> {{ level.count }}
-
+
@@ -158,7 +158,7 @@ const districts = ref([ display: flex; flex-direction: column; align-items: center; - gap: vh(10); + // gap: vh(10); // 徽章和光圈容器 .badge-container { @@ -177,6 +177,7 @@ const districts = ref([ align-items: center; justify-content: center; z-index: 2; + background: url(../assets/img/weather-badge-bg.png) center center / 100% 100% no-repeat; .badge-bg { position: absolute; @@ -192,6 +193,7 @@ const districts = ref([ font-weight: normal; z-index: 1; line-height: 1; + margin-top: vh(-18); } }