diff --git a/src/assets/styles/date-picker.scss b/src/assets/styles/date-picker.scss index 0bebd16..4308e33 100644 --- a/src/assets/styles/date-picker.scss +++ b/src/assets/styles/date-picker.scss @@ -26,6 +26,23 @@ color: #829bc5 !important; } +/* Range inputs share one continuous surface; show the cyan frame only while active. */ +.el-date-editor.el-range-editor { + background: #12356c !important; + border: 1px solid #6384d8 !important; + box-shadow: none !important; +} + +.el-date-editor.el-range-editor.is-active, +.el-date-editor.el-range-editor:focus-within { + border-color: #20cbe5 !important; +} + +.el-date-editor.el-range-editor .el-range-input, +.el-date-editor.el-range-editor .el-range-separator { + background: transparent !important; +} + .el-picker-panel, .card-date-editor, .el-time-panel, @@ -147,3 +164,114 @@ .el-time-panel[x-placement^="top"] .popper__arrow::after { border-top-color: #0d2d5f !important; } + +/* Unified date picker surface and selected-date typography. */ +.el-picker-panel, +.el-date-picker, +.el-date-range-picker, +.el-time-panel, +.el-time-range-picker, +.card-date-editor { + background: #0b2351 !important; + background-color: #0b2351 !important; + border-radius: 2px !important; + box-shadow: 0 3px 5px 1px rgba(0, 0, 0, 0.25) !important; +} + +.el-picker-panel__body, +.el-picker-panel__content, +.el-date-range-picker__content, +.el-picker-panel__sidebar, +.el-time-panel__content, +.el-time-spinner__wrapper, +.el-time-spinner__list, +.el-picker-panel__footer { + background: #0b2351 !important; + background-color: #0b2351 !important; +} + +.el-date-table td.current:not(.disabled) span, +.el-date-table td.start-date span, +.el-date-table td.end-date span, +.el-date-table td.today span, +.el-month-table td.current:not(.disabled) .cell, +.el-year-table td.current:not(.disabled) .cell, +.el-time-spinner__item.active:not(.disabled) { + font-family: PingFangSC-Regular, "PingFang SC", sans-serif !important; + font-size: 12px !important; + color: #00ffff !important; + letter-spacing: -0.01px !important; + line-height: 20px !important; + text-align: center !important; + text-shadow: 0 0 6px rgba(2, 31, 73, 0.47) !important; + font-weight: 400 !important; +} + +.el-date-table td.current:not(.disabled) div, +.el-date-table td.start-date div, +.el-date-table td.end-date div { + background: transparent !important; +} + +.el-date-table td.in-range div, +.el-date-table td.in-range div:hover { + background: rgba(39, 106, 168, 0.45) !important; +} + +/* Date tables must not inherit the application's data-table zebra/grid rules. */ +.el-picker-panel table tbody tr:nth-child(n) > td, +.el-picker-panel table tbody tr:nth-child(n) > th, +.el-time-panel table tbody tr:nth-child(n) > td, +.el-time-panel table tbody tr:nth-child(n) > th { + background: transparent !important; + border: 0 !important; + border-color: transparent !important; + color: #c8d8f2 !important; + font-family: PingFangSC-Regular, "PingFang SC", sans-serif !important; + font-size: 12px !important; + font-weight: 400 !important; + line-height: 20px !important; +} + +.el-picker-panel table, +.el-picker-panel .el-date-table, +.el-picker-panel .el-month-table, +.el-picker-panel .el-year-table, +.el-time-panel table { + border: 0 !important; + border-collapse: collapse !important; + box-shadow: none !important; +} + +.el-picker-panel .el-date-table td.current:not(.disabled) span, +.el-picker-panel .el-date-table td.start-date span, +.el-picker-panel .el-date-table td.end-date span, +.el-picker-panel .el-date-table td.today span, +.el-picker-panel .el-month-table td.current:not(.disabled) .cell, +.el-picker-panel .el-year-table td.current:not(.disabled) .cell { + background: #00a6bf !important; + color: #00ffff !important; + font-family: PingFangSC-Regular, "PingFang SC", sans-serif !important; + font-size: 12px !important; + font-weight: 400 !important; + line-height: 20px !important; + text-shadow: 0 0 6px rgba(2, 31, 73, 0.47) !important; +} + +.el-picker-panel .el-date-table td.in-range div, +.el-picker-panel .el-date-table td.in-range div:hover { + background: rgba(255, 255, 255, 0.06) !important; +} + +/* Today is indicated by text only; do not render a filled background. */ +.el-picker-panel .el-date-table td.today span, +.el-picker-panel .el-month-table td.today .cell, +.el-picker-panel .el-year-table td.today .cell { + background: transparent !important; + color: #00ffff !important; + font-family: PingFangSC-Regular, "PingFang SC", sans-serif !important; + font-size: 12px !important; + font-weight: 400 !important; + line-height: 20px !important; + text-shadow: 0 0 6px rgba(2, 31, 73, 0.47) !important; +} diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index f6f841d..88632c4 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -91,13 +91,13 @@ .el-table { color: #071025; background: transparent; - border: 1px solid rgba(64, 146, 255, 0.95); + border: 1px solid transparent; border-bottom: none; font-size: 14px; &::before, &::after { - background-color: rgba(64, 146, 255, 0.95); + background-color: transparent; } .el-table__header-wrapper, .el-table__fixed-header-wrapper { @@ -105,21 +105,25 @@ th { word-break: break-word; - background-color: #06347f; - color: #ffffff; - height: 38px; - font-size: 14px; - font-weight: 700; - border-color: rgba(64, 146, 255, 0.95); + background-color: #012773 !important; + color: #ffffff !important; + font-size: 16px !important; + letter-spacing: 0 !important; + line-height: 16px !important; + font-weight: 600 !important; } } - th.el-table__cell, - td.el-table__cell { + th.el-table__cell { padding: 7px 0; border-color: #c7d7f4; } + td.el-table__cell { + padding: 0 !important; + border-color: #c7d7f4; + } + .el-table__body-wrapper { flex: 1 1 auto; min-height: 0; @@ -127,11 +131,11 @@ background: #dbe7fb; tr { - background-color: #e4edfc; + background-color: #ebf1ff; } tr:nth-child(even) { - background-color: #d7e4f8; + background-color: #e0eaff; } tr:hover > td.el-table__cell { @@ -150,7 +154,7 @@ .el-table__fixed, .el-table__fixed-right { - background: #dbe7fb; + background: #ebf1ff; } .el-checkbox__inner { @@ -177,15 +181,124 @@ } } +// Keep native table headers consistent with Element tables. +table thead th { + background-color: #012773 !important; + color: #ffffff !important; + font-size: 16px !important; + letter-spacing: 0 !important; + line-height: 16px !important; + font-weight: 600 !important; +} + +.el-table .el-table__header-wrapper th.el-table__cell, +.el-table .el-table__fixed-header-wrapper th.el-table__cell, +.el-table thead th.el-table__cell { + background: #012773 !important; + background-color: #012773 !important; +} + +// Element UI renders header labels in a direct .cell child of th. +.el-table th .cell { + font-family: inherit !important; + font-size: inherit !important; + color: inherit !important; + letter-spacing: inherit !important; + line-height: inherit !important; + font-weight: inherit !important; +} + +// Unified body-cell typography for every Element table. +.el-table tbody td.el-table__cell, +.el-table .el-table__fixed-body-wrapper td.el-table__cell { + padding-top: 0 !important; + padding-bottom: 0 !important; + font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif !important; + font-size: 14px !important; + color: #000000 !important; + letter-spacing: 0 !important; + line-height: 44px !important; + font-weight: 500 !important; +} + +.el-table tbody td.el-table__cell > .cell, +.el-table .el-table__fixed-body-wrapper td.el-table__cell > .cell { + font-family: inherit !important; + font-size: inherit !important; + color: inherit !important; + letter-spacing: inherit !important; + line-height: inherit !important; + font-weight: inherit !important; +} + +table tbody td { + font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif !important; + font-size: 14px !important; + color: #000000 !important; + letter-spacing: 0 !important; + line-height: 44px !important; + font-weight: 500 !important; +} + +table tbody td > .cell { + font-family: inherit !important; + font-size: inherit !important; + color: inherit !important; + letter-spacing: inherit !important; + line-height: inherit !important; + font-weight: inherit !important; +} + .el-table--border, .el-table--group { - border-color: rgba(64, 146, 255, 0.95); + border-color: transparent !important; } .el-table--border .el-table__cell { border-color: #c7d7f4; } +// Remove table grid and fixed-column separator lines. +.el-table, +.el-table--border, +.el-table--group, +.el-table__header, +.el-table__body, +.el-table__footer, +.el-table__header-wrapper, +.el-table__body-wrapper, +.el-table__footer-wrapper, +.el-table__fixed, +.el-table__fixed-right, +.el-table__fixed-header-wrapper, +.el-table__fixed-body-wrapper, +.el-table th.el-table__cell, +.el-table td.el-table__cell, +.el-table--border .el-table__cell, +.el-table--group .el-table__cell { + border: 0 !important; + border-color: transparent !important; +} + +.el-table::before, +.el-table::after, +.el-table--border::after, +.el-table--group::after, +.el-table__fixed::before, +.el-table__fixed-right::before, +.el-table__fixed-right::after { + background-color: transparent !important; +} + +// Use a horizontal separator between rows without restoring the table grid. +.el-table tbody tr > td.el-table__cell, +.el-table .el-table__fixed-body-wrapper tbody tr > td.el-table__cell, +table tbody tr > td { + border-bottom: 1px solid #acb5e3 !important; + border-left-color: transparent !important; + border-right-color: transparent !important; +} + .el-table .caret-wrapper .sort-caret.ascending { border-bottom-color: #ffffff; } @@ -228,20 +341,48 @@ border-radius: 2px; } - .el-button--primary { +.el-button--primary { color: #ffffff; - background: linear-gradient(180deg, #2d73ff 0%, #0b42c4 100%); - border-color: #2f80ff; - box-shadow: 0 0 8px rgba(47, 128, 255, 0.35) inset; + background-image: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + border-color: #397bff; + box-shadow: none; } - .el-button--default { +.el-button--default { color: #54ffff; background: rgba(5, 27, 91, 0.55); border-color: #1b7fff; } } +// Keep buttons aligned with the 32px form controls. +.el-button { + height: 32px !important; + min-height: 32px !important; + padding-top: 0 !important; + padding-bottom: 0 !important; + border-radius: 2px !important; + font-family: 'CN-Bold', 'Microsoft YaHei', sans-serif !important; + font-size: 12px !important; + letter-spacing: 0 !important; + line-height: 30px !important; + font-weight: 700 !important; +} + +.el-button--primary, +.task-toolbar-btn { + background-image: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + color: #ffffff !important; + text-align: center; +} + +.el-input__inner, +.el-date-editor.el-input__inner, +.el-date-editor .el-range-input { + height: 32px !important; + line-height: 30px !important; +} + /** 表单布局 **/ .form-header { font-size: 15px; @@ -887,3 +1028,108 @@ .el-textarea__inner::placeholder { color: rgba(220, 236, 255, 0.5); } + +// Unified table zebra striping across all Element and native tables. +.el-table .el-table__body tbody tr:nth-child(odd) > td.el-table__cell, +.el-table .el-table__fixed-body-wrapper tbody tr:nth-child(odd) > td.el-table__cell, +table tbody tr:nth-child(odd) > td { + background-color: #ebf1ff !important; +} + +.el-table .el-table__body tbody tr:nth-child(even) > td.el-table__cell, +.el-table .el-table__fixed-body-wrapper tbody tr:nth-child(even) > td.el-table__cell, +table tbody tr:nth-child(even) > td { + background-color: #e0eaff !important; +} + +// Restore the standard grid for tables that do not use the card-table custom layout. +.el-table:not(.card-table) { + border: 1px solid #acb5e3 !important; +} + +.el-table:not(.card-table) th.el-table__cell, +.el-table:not(.card-table) td.el-table__cell, +.el-table:not(.card-table) .el-table--border .el-table__cell { + border: 1px solid #acb5e3 !important; +} + +.el-table:not(.card-table)::before, +.el-table:not(.card-table)::after, +.el-table:not(.card-table).el-table--border::after, +.el-table:not(.card-table).el-table--group::after { + background-color: #acb5e3 !important; +} + +table:not(.card-table) { + border: 1px solid #acb5e3 !important; + border-collapse: collapse; +} + +table:not(.card-table) th, +table:not(.card-table) td { + border: 1px solid #acb5e3 !important; +} + +/* Search buttons use the requested gradient; other buttons retain their wireframe style. */ +.el-button.el-button--primary:has(.el-icon-search), +button.el-button--primary:has(.el-icon-search) { + background: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-image: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-color: transparent !important; + border-radius: 2px !important; +} + +.el-button.el-button--primary:has(.el-icon-search):hover, +.el-button.el-button--primary:has(.el-icon-search):focus, +.el-button.el-button--primary:has(.el-icon-search):active, +button.el-button--primary:has(.el-icon-search):hover, +button.el-button--primary:has(.el-icon-search):focus, +button.el-button--primary:has(.el-icon-search):active { + background: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-image: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-color: transparent !important; +} + +/* Scoped page styles can be more specific than the shared Element button rule. */ +body .el-form .el-button.el-button--primary:has(.el-icon-search), +body .el-form button.el-button--primary:has(.el-icon-search) { + background: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-image: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-color: transparent !important; + border-radius: 2px !important; +} + +body .el-form .el-button.el-button--primary:has(.el-icon-search):hover, +body .el-form .el-button.el-button--primary:has(.el-icon-search):focus, +body .el-form .el-button.el-button--primary:has(.el-icon-search):active, +body .el-form button.el-button--primary:has(.el-icon-search):hover, +body .el-form button.el-button--primary:has(.el-icon-search):focus, +body .el-form button.el-button--primary:has(.el-icon-search):active { + background: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-image: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-color: transparent !important; +} + +/* All non-search actions keep the existing blue wireframe treatment. */ +body .el-button.el-button--primary:not(:has(.el-icon-search)), +body button.el-button--primary:not(:has(.el-icon-search)), +body .task-toolbar-btn:not(:has(.el-icon-search)) { + background: linear-gradient(#01016b, #01016b) padding-box, + linear-gradient(135deg, #3988ff, #0351c6) border-box !important; + background-image: linear-gradient(#01016b, #01016b) padding-box, + linear-gradient(135deg, #3988ff, #0351c6) border-box !important; + border: 1px solid transparent !important; + color: #43c0ff !important; +} + +body .el-button.el-button--primary:not(:has(.el-icon-search)):hover, +body .el-button.el-button--primary:not(:has(.el-icon-search)):focus, +body .el-button.el-button--primary:not(:has(.el-icon-search)):active, +body .task-toolbar-btn:not(:has(.el-icon-search)):hover, +body .task-toolbar-btn:not(:has(.el-icon-search)):focus, +body .task-toolbar-btn:not(:has(.el-icon-search)):active { + background: linear-gradient(#01016b, #01016b) padding-box, + linear-gradient(135deg, #3988ff, #0351c6) border-box !important; + background-image: linear-gradient(#01016b, #01016b) padding-box, + linear-gradient(135deg, #3988ff, #0351c6) border-box !important; +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 5f45c41..fa88373 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -178,12 +178,14 @@ export default { display: block; position: absolute; left: 50%; - top: 50%; + // Chinese glyphs sit slightly below the line box center at this size. + top: 42%; margin: 0; transform: translate(-50%, -50%); color: #fff; + font-family: 'Microsoft YaHei', 'PingFang SC', sans-serif; font-size: 34px; - font-weight: 700; + font-weight: 700 !important; letter-spacing: 4px; white-space: nowrap; text-shadow: 0 0 6px rgba(84, 255, 255, 0.55), 0 2px 2px rgba(0, 17, 74, 0.65); @@ -222,8 +224,9 @@ export default { .platform-title { margin-left: 10px; color: #fff; + font-family: 'Microsoft YaHei', 'PingFang SC', sans-serif; font-size: 34px; - font-weight: 700; + font-weight: 700 !important; line-height: 1; white-space: nowrap; letter-spacing: 0; diff --git a/src/views/cards/assets/styles/index.scss b/src/views/cards/assets/styles/index.scss index 6bddfd3..1252b13 100644 --- a/src/views/cards/assets/styles/index.scss +++ b/src/views/cards/assets/styles/index.scss @@ -21,10 +21,12 @@ .el-table::before, .el-table--group::after, .el-table--border::after { - background-color: #40486a; + background-color: transparent !important; } .el-table { + border: 0 !important; + border-color: transparent !important; // 新页面中el-table的样式 border-color: #40486a; @@ -34,20 +36,22 @@ } th { - border-right-color: #40486a; - border-bottom-color: #40486a !important; + border-right-color: transparent !important; + border-bottom-color: transparent !important; .cell { - font-size: 14px; - color: #c6d3ec; - font-weight: bold; + font-size: inherit !important; + color: inherit !important; + letter-spacing: inherit !important; + line-height: inherit !important; + font-weight: inherit !important; // font-size: 18px; } } td { - border-right-color: #40486a; - border-bottom-color: #40486a; + border-right-color: transparent !important; + border-bottom-color: #acb5e3 !important; .cell, .cell div, diff --git a/src/views/cards/components/CardPagination/index.vue b/src/views/cards/components/CardPagination/index.vue index 1ca3f45..0a6cc14 100644 --- a/src/views/cards/components/CardPagination/index.vue +++ b/src/views/cards/components/CardPagination/index.vue @@ -116,8 +116,8 @@ export default { padding: 10px 16px; box-sizing: border-box; color: #dcecff; - background: #0b1140 !important; - border-top: 1px solid rgba(79, 166, 255, 0.35); + background: transparent !important; + border-top: 0 !important; } .pagination-total { diff --git a/src/views/cards/defectRecord/index.vue b/src/views/cards/defectRecord/index.vue index 758a6df..026a033 100644 --- a/src/views/cards/defectRecord/index.vue +++ b/src/views/cards/defectRecord/index.vue @@ -304,7 +304,7 @@ export default { .card-page ::v-deep .el-table th.el-table__cell { color: #ffffff !important; - background: #0b3d89 !important; + background: #012773 !important; border-color: #6f9ed8 !important; } diff --git a/src/views/cards/patrolPlan/notstart.vue b/src/views/cards/patrolPlan/notstart.vue index ff64911..123b1bd 100644 --- a/src/views/cards/patrolPlan/notstart.vue +++ b/src/views/cards/patrolPlan/notstart.vue @@ -495,6 +495,12 @@ export default { font-size: 20px; margin: 0 10px; cursor: pointer; + color: #0042A6; +} + +.fss:hover { + color: #0042A6; + opacity: 0.9; } .table-card { @@ -517,19 +523,32 @@ export default { width: 100% !important; background: transparent !important; color: #000000; - border-color: rgba(64, 146, 255, 0.95) !important; + border: 0 !important; + border-color: transparent !important; +} + +.card-page ::v-deep .el-table__header, +.card-page ::v-deep .el-table__body, +.card-page ::v-deep .el-table__header-wrapper, +.card-page ::v-deep .el-table__body-wrapper, +.card-page ::v-deep .el-table th.el-table__cell, +.card-page ::v-deep .el-table td.el-table__cell { + border: 0 !important; + border-color: transparent !important; } .card-page ::v-deep .el-table::before, .card-page ::v-deep .el-table::after, .card-page ::v-deep .el-table--border::after, .card-page ::v-deep .el-table--group::after { - background-color: rgba(64, 146, 255, 0.95) !important; + background-color: transparent !important; } .card-page ::v-deep .el-table__header-wrapper, .card-page ::v-deep .el-table__fixed-header-wrapper { - background: #06347f !important; + background: #012773 !important; + border: 1px solid #acb5e3 !important; + box-sizing: border-box; } .card-page ::v-deep .el-table__header, @@ -546,27 +565,39 @@ export default { } .card-page ::v-deep .el-table th.el-table__cell { - background: #06347f !important; - border-color: rgba(64, 146, 255, 0.95) !important; + background: #012773 !important; + font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif !important; + font-size: 16px !important; + color: #ffffff !important; + letter-spacing: 0 !important; + line-height: 16px !important; + font-weight: 600 !important; + border-color: transparent !important; } .card-page ::v-deep .el-table th.el-table__cell .cell { - color: #ffffff !important; + font-family: inherit !important; + font-size: inherit !important; + color: inherit !important; + letter-spacing: inherit !important; + line-height: inherit !important; + font-weight: inherit !important; } -.card-page ::v-deep .el-table th.el-table__cell.is-resizable:not(:last-child) .cell::after { - content: ""; - position: absolute; - top: 25%; - right: 1px; - width: 2px; - height: 50%; - background: rgba(255, 255, 255, 0.45); - cursor: col-resize; +// Keep draggable column boundaries visible in the inspection-plan header. +.card-page ::v-deep .el-table__header-wrapper th.el-table__cell, +.card-page ::v-deep .el-table__fixed-header-wrapper th.el-table__cell { + border-right: 1px solid #acb5e3 !important; + border-left: 0 !important; +} + +.card-page ::v-deep .el-table__header-wrapper th.el-table__cell:last-child, +.card-page ::v-deep .el-table__fixed-header-wrapper th.el-table__cell:last-child { + border-right: 0 !important; } .card-page ::v-deep .el-table__resize-proxy { - border-left: 2px solid #43c0ff; + border-left: 2px solid #acb5e3 !important; } .area-name-cell { @@ -578,10 +609,17 @@ export default { .card-page ::v-deep .el-table td.el-table__cell { background: transparent !important; - border-color: #c7d7f4 !important; + border-top-color: transparent !important; + border-left: 0 !important; + border-right: 1px solid #acb5e3 !important; + border-bottom: 1px solid #acb5e3 !important; color: #000000 !important; } +.card-page ::v-deep .el-table td.el-table__cell:last-child { + border-right: 0 !important; +} + .card-page ::v-deep .el-table td.el-table__cell .cell { color: #000000 !important; font-weight: 500; @@ -614,19 +652,17 @@ export default { .task-toolbar-btn { border: 1px solid transparent !important; - background: - linear-gradient(#01016b, #01016b) padding-box, - linear-gradient(135deg, #3988ff, #0351c6) border-box !important; - color: #43c0ff !important; + background: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-image: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + color: #ffffff !important; } .task-toolbar-btn:hover, .task-toolbar-btn:focus { border: 1px solid transparent !important; - background: - linear-gradient(#01016b, #01016b) padding-box, - linear-gradient(135deg, #3988ff, #0351c6) border-box !important; - color: #43c0ff !important; + background: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-image: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + color: #ffffff !important; opacity: 0.9; } diff --git a/src/views/cards/patrolReport/InspectionReporter.vue b/src/views/cards/patrolReport/InspectionReporter.vue index f34733e..d61b6fa 100644 --- a/src/views/cards/patrolReport/InspectionReporter.vue +++ b/src/views/cards/patrolReport/InspectionReporter.vue @@ -67,7 +67,7 @@ @@ -403,14 +403,16 @@ export default { width: 100% !important; background: transparent !important; color: #000000; - border-color: rgba(64, 146, 255, 0.95) !important; + border-right: 0 !important; + border-bottom: 0 !important; + border-color: transparent !important; } .card-page ::v-deep .el-table::before, .card-page ::v-deep .el-table::after, .card-page ::v-deep .el-table--border::after, .card-page ::v-deep .el-table--group::after { - background-color: rgba(64, 146, 255, 0.95) !important; + background-color: transparent !important; } .card-page ::v-deep .el-table__header-wrapper, @@ -424,20 +426,30 @@ export default { } .card-page ::v-deep .el-table th.el-table__cell { - background: #06347f !important; - border-color: rgba(64, 146, 255, 0.95) !important; + background: #012773 !important; + border-right-color: transparent !important; + border-bottom-color: #acb5e3 !important; } .card-page ::v-deep .el-table th.el-table__cell .cell { color: #ffffff !important; + white-space: nowrap !important; } .card-page ::v-deep .el-table td.el-table__cell { background: transparent !important; - border-color: #c7d7f4 !important; + border-right-color: transparent !important; + border-bottom-color: #acb5e3 !important; color: #000000 !important; } +.card-page ::v-deep .el-table__body-wrapper, +.card-page ::v-deep .el-table__footer-wrapper, +.card-page ::v-deep .el-table__fixed-right { + border-right: 0 !important; + border-bottom: 0 !important; +} + .card-page ::v-deep .el-table td.el-table__cell .cell { color: #000000 !important; font-weight: 500; @@ -471,10 +483,9 @@ export default { .task-toolbar-btn, .card-page ::v-deep .el-table .el-button--primary { border: 1px solid transparent !important; - background: - linear-gradient(#01016b, #01016b) padding-box, - linear-gradient(135deg, #3988ff, #0351c6) border-box !important; - color: #43c0ff !important; + background: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + background-image: linear-gradient(180deg, #397bff 0%, #0c0c8a 100%) !important; + color: #ffffff !important; } .task-toolbar-btn:hover, diff --git a/src/views/cards/patrolReport/patrolReportDetail.vue b/src/views/cards/patrolReport/patrolReportDetail.vue index 6dd8cd2..80148b3 100644 --- a/src/views/cards/patrolReport/patrolReportDetail.vue +++ b/src/views/cards/patrolReport/patrolReportDetail.vue @@ -655,7 +655,7 @@ export default { } ::v-deep .el-table th.el-table__cell { - background: #0b3d89 !important; + background: #012773 !important; border-color: #6f9ed8 !important; } diff --git a/src/views/cards/site_management/algorithm.vue b/src/views/cards/site_management/algorithm.vue index 7d8a80f..229decd 100644 --- a/src/views/cards/site_management/algorithm.vue +++ b/src/views/cards/site_management/algorithm.vue @@ -434,7 +434,7 @@ export default { ::v-deep .el-table__header-wrapper, ::v-deep .el-table__fixed-header-wrapper { - background: #06347f !important; + background: #012773 !important; } ::v-deep .el-table__body-wrapper, @@ -446,7 +446,7 @@ export default { } ::v-deep th.el-table__cell { - background: #06347f !important; + background: #012773 !important; border-color: rgba(64, 146, 255, 0.95) !important; color: #ffffff !important; } diff --git a/src/views/cards/site_management/components/chooseAlg.vue b/src/views/cards/site_management/components/chooseAlg.vue index fcc2b6a..54b254b 100644 --- a/src/views/cards/site_management/components/chooseAlg.vue +++ b/src/views/cards/site_management/components/chooseAlg.vue @@ -753,7 +753,7 @@ export default { } .dark-table ::v-deep .el-table__header th { - background-color: #06347f !important; + background-color: #012773 !important; color: #ffffff !important; border-color: rgba(64, 146, 255, 0.95) !important; border-bottom: 2px solid rgba(64, 146, 255, 0.95) !important; diff --git a/src/views/cards/site_management/site_management.vue b/src/views/cards/site_management/site_management.vue index fbb1c3e..754b2dd 100644 --- a/src/views/cards/site_management/site_management.vue +++ b/src/views/cards/site_management/site_management.vue @@ -181,7 +181,7 @@ style="width: 100%" class="custom-table resizable-table" :header-cell-style="{ - background: '#1a2a3a', + background: '#012773', color: '#ffffff', fontWeight: 'bold', borderBottom: '2px solid #0b374e', @@ -507,7 +507,7 @@ :data="currentRow.bindPoints" class="right-table" :header-cell-style="{ - background: '#1a2a3a', + background: '#012773', color: '#ffffff', borderBottom: '2px solid #0b374e', }" @@ -3565,7 +3565,7 @@ export default { /* 表格列拖拽时的样式 */ .resizable-table .el-table__header th.dragging { - background-color: #1e3a4a !important; + background-color: #012773 !important; } .resizable-table .el-table__header th.dragging::after { @@ -3993,7 +3993,7 @@ export default { overflow: hidden; ::v-deep .el-table__header th { - background-color: #1a2a3a !important; + background-color: #012773 !important; color: #ffffff !important; border-bottom: 2px solid #0b374e !important; font-weight: bold; @@ -4111,7 +4111,7 @@ export default { } .card-page ::v-deep .el-table th.el-table__cell { - background: #06347f !important; + background: #012773 !important; border-color: rgba(64, 146, 255, 0.95) !important; color: #ffffff !important; } diff --git a/src/views/cards/taskSummary/inspectionTask.vue b/src/views/cards/taskSummary/inspectionTask.vue index ea0ad86..40762f6 100644 --- a/src/views/cards/taskSummary/inspectionTask.vue +++ b/src/views/cards/taskSummary/inspectionTask.vue @@ -104,7 +104,7 @@ v-if="modelDialogIcon" >
- + :resizable="true" + show-overflow-tooltip + > + +