diff --git a/src/assets/images/nav/inspection-task.png b/src/assets/images/nav/inspection-task.png new file mode 100644 index 0000000..fa14acf Binary files /dev/null and b/src/assets/images/nav/inspection-task.png differ diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index cba4358..12474a5 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -667,6 +667,69 @@ } } +/* Global dark form controls and option panels. */ +.el-input__inner, +.el-textarea__inner, +.el-date-editor.el-input__inner, +.el-date-editor .el-range-input { + color: #dcecff !important; + background-color: rgba(5, 27, 91, 0.82) !important; + border-color: #6384d8 !important; +} + +.el-input__inner::placeholder, +.el-textarea__inner::placeholder, +.el-date-editor .el-range-input::placeholder { + color: rgba(220, 236, 255, 0.5) !important; +} + +.el-input__inner:hover, +.el-textarea__inner:hover, +.el-input.is-active .el-input__inner, +.el-input__inner:focus, +.el-textarea__inner:focus, +.el-select .el-input.is-focus .el-input__inner { + border-color: #43cfff !important; +} + +.el-input.is-disabled .el-input__inner, +.el-textarea.is-disabled .el-textarea__inner { + color: rgba(220, 236, 255, 0.55) !important; + background-color: rgba(8, 25, 69, 0.82) !important; +} + +.el-select-dropdown .el-scrollbar, +.el-select-dropdown__wrap, +.el-select-dropdown__list, +.el-autocomplete-suggestion__wrap, +.el-autocomplete-suggestion li, +.el-cascader-panel, +.el-cascader-menu, +.el-picker-panel__body, +.el-picker-panel__content { + color: #dcecff !important; + background-color: #0f124a !important; + border-color: #0b2567 !important; +} + +.el-select-dropdown__empty, +.el-cascader-menu__empty-text, +.el-autocomplete-suggestion li { + color: #b9d8ff !important; +} + +.el-select-dropdown[x-placement^="bottom"] .popper__arrow::after, +.el-autocomplete-suggestion[x-placement^="bottom"] .popper__arrow::after, +.el-cascader__dropdown[x-placement^="bottom"] .popper__arrow::after { + border-bottom-color: #0f124a !important; +} + +.el-select-dropdown[x-placement^="top"] .popper__arrow::after, +.el-autocomplete-suggestion[x-placement^="top"] .popper__arrow::after, +.el-cascader__dropdown[x-placement^="top"] .popper__arrow::after { + border-top-color: #0f124a !important; +} + .splitpanes.default-theme .splitpanes__splitter { background-color: #0B2567 !important; border-color: #0B2567 !important; diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 33f461e..926a3fb 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -76,6 +76,15 @@ object-fit: contain; } + .menu-icon-placeholder { + display: inline-block; + width: 16px; + height: 16px; + margin-right: 16px; + vertical-align: -3px; + visibility: hidden; + } + .el-menu { border: none; height: 100%; diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 07a72c5..d8cd0d9 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -1,16 +1,21 @@ + + diff --git a/src/views/cards/tasksShow/dailyDisplay.vue b/src/views/cards/tasksShow/dailyDisplay.vue new file mode 100644 index 0000000..8b56c2c --- /dev/null +++ b/src/views/cards/tasksShow/dailyDisplay.vue @@ -0,0 +1,710 @@ + + + + + {{ formattedDate }} + + + 时间 + {{ dayOfWeek }} + + + + + + + + + + + + {{ formatHour(hour - 1) }}:00 + + + {{ formatHour(hour - 1) }}:30 + + + + + + + + + + + + + + + 加载中... + + + + + 暂无任务数据 + + + + + + {{ task.startTime }} - {{ task.endTime }} + {{ task.title }} + + + + + + + + + + diff --git a/src/views/cards/tasksShow/index.vue b/src/views/cards/tasksShow/index.vue new file mode 100644 index 0000000..0768fdf --- /dev/null +++ b/src/views/cards/tasksShow/index.vue @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + diff --git a/src/views/cards/tasksShow/monthlyDisplay.vue b/src/views/cards/tasksShow/monthlyDisplay.vue new file mode 100644 index 0000000..550b5e6 --- /dev/null +++ b/src/views/cards/tasksShow/monthlyDisplay.vue @@ -0,0 +1,791 @@ + + + + {{ displayYear }}年{{ displayMonth }}月 + + + + + < + > + + + + + + + {{ day }} + + + + + + + + + + {{ day }} + + + + {{ task.name }} + + + + + + + + + + + + {{ tooltipText }} + + + + + + + diff --git a/src/views/cards/tasksShow/yearDisplay.vue b/src/views/cards/tasksShow/yearDisplay.vue new file mode 100644 index 0000000..d725188 --- /dev/null +++ b/src/views/cards/tasksShow/yearDisplay.vue @@ -0,0 +1,300 @@ + + + + {{ currentYear }}年 + + + + + + + + + {{ getChineseMonth(month) }} + + + + 正在执行: + {{ + getMonthData(month).executing + }} + + + 已经完成: + {{ + getMonthData(month).executed + }} + + + 未 执 行 : + {{ + getMonthData(month).pending + }} + + + + + + + + + + +