diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..da979d7 Binary files /dev/null and b/public/favicon.ico differ diff --git a/src/assets/common/dialog_bg1.png b/src/assets/common/dialog_bg1.png new file mode 100644 index 0000000..c7b87de Binary files /dev/null and b/src/assets/common/dialog_bg1.png differ diff --git a/src/assets/common/dialog_bg2.png b/src/assets/common/dialog_bg2.png new file mode 100644 index 0000000..457fa5b Binary files /dev/null and b/src/assets/common/dialog_bg2.png differ diff --git a/src/assets/common/dialog_close_icon.png b/src/assets/common/dialog_close_icon.png new file mode 100644 index 0000000..f62e26b Binary files /dev/null and b/src/assets/common/dialog_close_icon.png differ diff --git a/src/assets/common/dialog_head_bg.png b/src/assets/common/dialog_head_bg.png new file mode 100644 index 0000000..7810009 Binary files /dev/null and b/src/assets/common/dialog_head_bg.png differ diff --git a/src/assets/common/dialog_title_bg.png b/src/assets/common/dialog_title_bg.png new file mode 100644 index 0000000..7810009 Binary files /dev/null and b/src/assets/common/dialog_title_bg.png differ diff --git a/src/assets/common/info_dialog_bg.png b/src/assets/common/info_dialog_bg.png new file mode 100644 index 0000000..21af0f3 Binary files /dev/null and b/src/assets/common/info_dialog_bg.png differ diff --git a/src/assets/common/info_dialog_title_bg.png b/src/assets/common/info_dialog_title_bg.png new file mode 100644 index 0000000..85ca289 Binary files /dev/null and b/src/assets/common/info_dialog_title_bg.png differ diff --git a/src/assets/common/title_before_icon.png b/src/assets/common/title_before_icon.png new file mode 100644 index 0000000..65021d9 Binary files /dev/null and b/src/assets/common/title_before_icon.png differ diff --git a/src/assets/deviceStatus/device_status_bg.png b/src/assets/deviceStatus/device_status_bg.png new file mode 100644 index 0000000..0cc97bd Binary files /dev/null and b/src/assets/deviceStatus/device_status_bg.png differ diff --git a/src/assets/footer/menu2.png b/src/assets/footer/menu2.png index e7104d2..bb2289e 100644 Binary files a/src/assets/footer/menu2.png and b/src/assets/footer/menu2.png differ diff --git a/src/assets/footer/menu5.png b/src/assets/footer/menu5.png index 44aeab9..7a896c1 100644 Binary files a/src/assets/footer/menu5.png and b/src/assets/footer/menu5.png differ diff --git a/src/assets/home/device_info_bg.png b/src/assets/home/device_info_bg.png new file mode 100644 index 0000000..c36927c Binary files /dev/null and b/src/assets/home/device_info_bg.png differ diff --git a/src/assets/home/sub_content_bg.png b/src/assets/home/sub_content_bg.png new file mode 100644 index 0000000..a734cc7 Binary files /dev/null and b/src/assets/home/sub_content_bg.png differ diff --git a/src/assets/home/sub_title_bg.png b/src/assets/home/sub_title_bg.png new file mode 100644 index 0000000..69fd85a Binary files /dev/null and b/src/assets/home/sub_title_bg.png differ diff --git a/src/assets/vehicleManage/vehicle_manage_bg.png b/src/assets/vehicleManage/vehicle_manage_bg.png new file mode 100644 index 0000000..18258e7 Binary files /dev/null and b/src/assets/vehicleManage/vehicle_manage_bg.png differ diff --git a/src/components/Charts/poleMonitorChart.vue b/src/components/Charts/poleMonitorChart.vue new file mode 100644 index 0000000..0f98df9 --- /dev/null +++ b/src/components/Charts/poleMonitorChart.vue @@ -0,0 +1,281 @@ + + + + + diff --git a/src/components/Charts/totalChart.vue b/src/components/Charts/totalChart.vue new file mode 100644 index 0000000..7bf3b42 --- /dev/null +++ b/src/components/Charts/totalChart.vue @@ -0,0 +1,320 @@ + + diff --git a/src/components/Charts/vehicleMonitorChart.vue b/src/components/Charts/vehicleMonitorChart.vue new file mode 100644 index 0000000..8fc0253 --- /dev/null +++ b/src/components/Charts/vehicleMonitorChart.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/components/CustomTable/src/baseTable.scss b/src/components/CustomTable/src/baseTable.scss index ef18e1b..d5ac457 100644 --- a/src/components/CustomTable/src/baseTable.scss +++ b/src/components/CustomTable/src/baseTable.scss @@ -97,7 +97,10 @@ /* full_table */ &.full_table { .el-table--large .el-table__cell { - padding: 4px 0; + padding: 8.5px 0; + } + .el-table__body .el-table__cell { + padding: 10px 0; } .baseTable_box { cursor: default; @@ -118,7 +121,6 @@ } &:hover td { background-color: transparent; - } } } diff --git a/src/components/HeaderBar/homeSubTitle.vue b/src/components/HeaderBar/homeSubTitle.vue new file mode 100644 index 0000000..5538059 --- /dev/null +++ b/src/components/HeaderBar/homeSubTitle.vue @@ -0,0 +1,54 @@ + + + + + + \ No newline at end of file diff --git a/src/styles/common.scss b/src/styles/common.scss index cf1e41a..cbd93ef 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -1,5 +1,5 @@ -@import url('./fonts.scss'); -@import url('./element-plus.scss'); +@import url("./fonts.scss"); +@import url("./element-plus.scss"); // 标题背景 .bg_title { @@ -17,15 +17,86 @@ } } -.bg_basic_content{ - background: linear-gradient( 180deg, rgba(7,16,19,0) 0%, #081417 100%);; +.bg-basic-content { + background: linear-gradient(180deg, rgba(7, 16, 19, 0) 0%, #081417 100%); } - -.bg_error_picture { +.bg-error-picture { width: 100%; height: 100%; background: url("@/assets/common/load_file_error.png") no-repeat center center; background-size: 50%; border: 1px dashed red; -} \ No newline at end of file +} + +// 标题字体 +.fg-title { + font-family: "DingTalk JinBuTi"; // 自定义字体名称 + // 字体样式(根据需求调整) + font-size: 16px; + font-weight: 700; // 加粗 + color: #96e6ff; // 初始字体颜色, 浅蓝色 + // 背景渐变和裁剪 + background: linear-gradient(to bottom, #ffffff, #96e6ff); + -webkit-background-clip: text; + background-clip: text; + -webkit-text-fill-color: transparent; +} +// 标题图标 +.fg-icon { + width: 17px; + height: 17px; + background-image: url("@/assets/common/title_before_icon.png"); + background-size: 100% 100%; + background-position: center; + background-repeat: no-repeat; +} +// 按钮 +.fg-button { + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + padding: 0 10px; + height: 28px; + border-radius: 2px 2px 2px 2px; +} +.fg-button-primary { + @apply fg-button; + background: #009dff; +} + +// 弹窗 +.fg-dialog { + background-color: transparent; + background-image: url("@/assets/common/dialog_bg1.png"); + background-size: 100% 100%; + background-position: center; + background-repeat: no-repeat; + padding: 0 !important; + &.fg-dialog2 { + width: 1202px; + height: 602px; + background-image: url("@/assets/common/dialog_bg2.png"); + } + .fg-dialog-header { + position: relative; + background-color: transparent; + background-image: url("@/assets/common/dialog_head_bg.png"); + background-repeat: no-repeat; + + .fg-dialog-header-close { + width: 50px; + height: 50px; + position: absolute; + right: -17px; + top: -17px; + z-index: 999999 !important; + + background-image: url("@/assets/common/dialog_close_icon.png"); + background-size: 100% 100%; + background-position: center; + background-repeat: no-repeat; + } + } +} diff --git a/src/styles/fonts.scss b/src/styles/fonts.scss index e00e877..3de71d5 100644 --- a/src/styles/fonts.scss +++ b/src/styles/fonts.scss @@ -1,7 +1,9 @@ // src/assets/fonts.scss @font-face { - font-family: 'DingTalk JinBuTi'; // 自定义字体名称 - src: url('@/assets/fonts/DingTalk JinBuTi.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} \ No newline at end of file + font-family: "DingTalk JinBuTi"; // 自定义字体名称 + src: url("@/assets/fonts/DingTalk JinBuTi.ttf") format("truetype"); + font-weight: normal; + font-style: normal; +} + + diff --git a/src/views/dashboard/DataOverview.scss b/src/views/dashboard/DataOverview.scss index 1a0ea58..8902ce1 100644 --- a/src/views/dashboard/DataOverview.scss +++ b/src/views/dashboard/DataOverview.scss @@ -1,72 +1,91 @@ .data-overview-wrap { padding-top: 30px; - // background: #002a5c; + height: 849px; color: white; font-family: "Arial", sans-serif; .grid-container { - display: flex; - grid-template-columns: repeat(3, 1fr); - gap: 20px; - margin-bottom: 20px; - width: 100%; + display: grid; + gap: 16px; .grid-item { - // background: rgba(74, 126, 191, 0.1); - background-image: url("@/assets/common/gridItemBg.png"); background-size: 100% 100%; background-position: center; background-repeat: no-repeat; - // border-radius: 8px; - width: 50%; - - &>li{ - width: 50%; - } - &>li:last-child{ - margin-left: 12px; - } .module-header { - color: #4a7ebf; - margin-bottom: 15px; + margin-bottom: 4px; .month-btn, .week-btn { width: 70px; height: 28px; font-size: 14px; - color: #FFF; - background: #0F2839; + color: #fff; + background: #0f2839; border: none; } .week-btn { margin-right: 20px; } - .active-btn { - background: #0B345E; - border: 1px solid #3FDDEB; + .active-btn { + background: #0b345e; + border: 1px solid #3fddeb; } } .chart-container { - // margin-top: 0px; - width: 100%; - height: 300px; + width: 431px; + height: 221px; + background: url("@/assets/home/sub_content_bg.png") no-repeat center; } - .chart-container-bar { - // margin-top: 0px; + } + } + + .onTime-monitor-box { + // background: red; + margin: 0 24px; + } + + + + .monitor-images { + display: flex; + box-sizing: border-box; + gap: 16px; + padding: 20px 16px; + flex-wrap: wrap; + .monitor-images-item { + width: calc(50% - 8px); + // background-color: red; + height: 349px; + border: 1px dashed #ccc; + } + .monitor-images-left, + .monitor-images-right { + // flex: 1; + // position: relative; + img { width: 100%; - height: 340px; + // height: 100%; } - .chart-pie-bg{ - margin-top: 19px; - background-image: url("@/assets/common/gridItemPieBg.png"); - background-size: 100% 100%; - background-position: center; - background-repeat: no-repeat; + .fault-info { + position: absolute; + padding: 0 10px; + // miomwidth: 80px; + height: 28px; + background: rgba(0, 0, 0, 0.6); + border-radius: 16px 16px 16px 16px; + top: 16px; + left: 16px; + font-size: 14px; + color: #fff; + text-align: center; + line-height: 28px; } } - .grid-item-pie { - background-image: none; - } } - .device-info { + + + + + + .device-info { .total-device { display: flex; align-items: center; @@ -76,8 +95,7 @@ .device-icon { width: 80px; height: 90px; - background: url('@/assets/common/deviceTotal.png') - no-repeat center; + background: url("@/assets/common/deviceTotal.png") no-repeat center; background-size: 100%; } @@ -94,7 +112,7 @@ .device-list { box-sizing: border-box; display: grid; - grid-template-columns: repeat(3, 1fr); + // grid-template-columns: repeat(3, 1fr); padding: 0 16px 20px; gap: 10px; @@ -114,36 +132,4 @@ } } } - - .monitor-images { - display: flex; - box-sizing: border-box; - gap: 16px; - padding: 20px 16px 20px 16px; - .monitor-images-left, - .monitor-images-right { - flex: 1; - position: relative; - img { - width: 100%; - height: 256px; - } - .fault-info { - position: absolute; - padding: 0 10px; - // miomwidth: 80px; - height: 28px; - background: rgba(0,0,0,0.6); - border-radius: 16px 16px 16px 16px; - top: 16px; - left: 16px; - font-size: 14px; - color: #FFF; - text-align: center; - line-height: 28px; - } - } - - } } - diff --git a/src/views/dashboard/DataOverview.vue b/src/views/dashboard/DataOverview.vue index 3956b43..1f23057 100644 --- a/src/views/dashboard/DataOverview.vue +++ b/src/views/dashboard/DataOverview.vue @@ -1,178 +1,28 @@ - - +// TODO 界面设计改版 - + diff --git a/src/views/dashboard/DeviceStatus.vue b/src/views/dashboard/DeviceStatus.vue index 4450b69..bd0ae19 100644 --- a/src/views/dashboard/DeviceStatus.vue +++ b/src/views/dashboard/DeviceStatus.vue @@ -1,108 +1,125 @@ - diff --git a/src/views/dashboard/DiggerMonitor.vue b/src/views/dashboard/DiggerMonitor.vue index 7569405..145e897 100644 --- a/src/views/dashboard/DiggerMonitor.vue +++ b/src/views/dashboard/DiggerMonitor.vue @@ -6,7 +6,7 @@
-
+
diff --git a/src/views/dashboard/VehiclManagement.scss b/src/views/dashboard/VehiclManagement.scss index c6fd71b..512b4ef 100644 --- a/src/views/dashboard/VehiclManagement.scss +++ b/src/views/dashboard/VehiclManagement.scss @@ -1,10 +1,11 @@ .vehicl-management-wrap{ height: 813px; - background-image: url("@/assets/common/device_status_bg_line.png"); + background-image: url("@/assets/vehicleManage/vehicle_manage_bg.png"); background-size: 100% 100%; background-position: bottom; background-repeat: no-repeat; + padding: 0 43px; } .vehicl-management-content-box{ diff --git a/src/views/dashboard/VehiclManagement.vue b/src/views/dashboard/VehiclManagement.vue index f2b89ed..f03b68a 100644 --- a/src/views/dashboard/VehiclManagement.vue +++ b/src/views/dashboard/VehiclManagement.vue @@ -1,59 +1,16 @@ - - - + diff --git a/src/views/dashboard/components/DiggerAlarmModal.vue b/src/views/dashboard/components/DiggerAlarmModal.vue index 45d0d5e..bedab07 100644 --- a/src/views/dashboard/components/DiggerAlarmModal.vue +++ b/src/views/dashboard/components/DiggerAlarmModal.vue @@ -1,5 +1,5 @@