diff --git a/src/assets/common/sub_title_icon.png b/src/assets/common/sub_title_icon.png new file mode 100644 index 0000000..de0c384 Binary files /dev/null and b/src/assets/common/sub_title_icon.png differ diff --git a/src/assets/vehicleManage/train_card_bg.png b/src/assets/trainManage/train_card_bg.png similarity index 100% rename from src/assets/vehicleManage/train_card_bg.png rename to src/assets/trainManage/train_card_bg.png diff --git a/src/assets/vehicleManage/train_head.png b/src/assets/trainManage/train_head.png similarity index 100% rename from src/assets/vehicleManage/train_head.png rename to src/assets/trainManage/train_head.png diff --git a/src/assets/vehicleManage/vehicle_manage_bg.png b/src/assets/trainManage/train_manage_bg.png similarity index 100% rename from src/assets/vehicleManage/vehicle_manage_bg.png rename to src/assets/trainManage/train_manage_bg.png diff --git a/src/components/HeaderBar/homeSubTitle.vue b/src/components/HeaderBar/homeSubTitle.vue index 09643b4..05d283b 100644 --- a/src/components/HeaderBar/homeSubTitle.vue +++ b/src/components/HeaderBar/homeSubTitle.vue @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2025-03-06 15:52:40 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2025-08-12 16:29:23 + * @LastEditTime: 2025-09-05 14:00:15 * @FilePath: \vite-ai\data-dashboard\src\components\contentHeader.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -11,7 +11,7 @@ :style="{ 'background-image': `url(${sub_title_bg})`, 'background-size': 'cover', 'background-repeat': 'no-repeat', 'background-position': 'left bottom' }">
- +
{{ title }} @@ -40,7 +40,6 @@ const props = withDefaults(defineProps<{ // switch (Number(props.bgLayout)) { // default: // return sub_title_bg; - // } // }); diff --git a/src/styles/common.scss b/src/styles/common.scss index b82a2c5..4299907 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -177,7 +177,7 @@ width: 24px; height: 48px; margin-right: 12px; - background-image: url("@/assets/common/alarm_title.png"); + background-image: url("@/assets/common/sub_title_icon.png"); background-size: contain; background-position: center; background-repeat: no-repeat; diff --git a/src/views/dashboard/DataOverview.scss b/src/views/dashboard/DataOverview.scss index 24e8dbc..a936b9c 100644 --- a/src/views/dashboard/DataOverview.scss +++ b/src/views/dashboard/DataOverview.scss @@ -45,7 +45,6 @@ margin: 0 24px; background: url("@/assets/home/realTime_monitor_bg.png") no-repeat center; background-size: 100% 100%; - } .monitor-images { @@ -80,11 +79,21 @@ } } } + .rightInfo-box { + + // background: linear-gradient(180deg, rgba(7, 16, 19, 0) 0%, #081417 100%); - .device-info-box { - background: linear-gradient(180deg, rgba(7, 16, 19, 0) 0%, #081417 100%); + .right-info-content { + height: 359px; + background: linear-gradient(180deg, rgba(7, 16, 19, 0) 0%, #081417 100%); + box-shadow: inset 2px 2px 4px 0px rgba(32, 174, 254, 0.6), + inset -2px -2px 4px 0px rgba(32, 174, 254, 0.6); + border-radius: 0px 0px 0px 0px; + border: 1px solid #1fc6ff; + margin-top: 4px; + } - .device-info { + .device-info-box { .total-device { .device-total-icon { width: 96px; @@ -112,5 +121,9 @@ } } } + + .train-info-box{ + + } } } diff --git a/src/views/dashboard/DataOverview.vue b/src/views/dashboard/DataOverview.vue index a3be41a..a8209db 100644 --- a/src/views/dashboard/DataOverview.vue +++ b/src/views/dashboard/DataOverview.vue @@ -1,8 +1,12 @@