diff --git a/admin/src/main/resources/static/assets/styles/style.css b/admin/src/main/resources/static/assets/styles/style.css index cd3bc019..065f253e 100644 --- a/admin/src/main/resources/static/assets/styles/style.css +++ b/admin/src/main/resources/static/assets/styles/style.css @@ -6637,6 +6637,9 @@ input[type=number] { width: 14rem; } .filter-wrap .component-btns { + min-width: -webkit-max-content; + min-width: -moz-max-content; + min-width: max-content; margin-top: auto; } .filter-wrap .btn { @@ -6704,6 +6707,9 @@ input[type=number] { .table-group .table-tit-group .bottom-btn-group { margin-top: 0; } +.table-group .table-tit-group .component-select { + width: 14rem; +} table { table-layout: fixed; @@ -7192,6 +7198,8 @@ table tbody th { justify-content: space-between; } .dounut-chart-area .chart-group { + -webkit-flex-wrap: wrap; + flex-wrap: wrap; display: -webkit-box; display: -webkit-flex; display: flex; @@ -7234,16 +7242,18 @@ table tbody th { margin-top: 3.2rem; } .dounut-chart-area .chart-group dl dd .percent { + margin-right: 2rem; position: relative; display: block; font-size: 5.6rem; font-weight: 700; + letter-spacing: -1px; } .dounut-chart-area .chart-group dl dd .percent::after { position: absolute; content: "%"; display: block; - right: -1.8rem; + right: -3.5rem; top: 0; } .dounut-chart-area .chart-group dl dd .d-flex { @@ -7289,8 +7299,8 @@ table tbody th { left: 50%; -webkit-transform: translateX(-50%); transform: translateX(-50%); - width: 4px; - height: 50px; + width: 0.2rem; + height: 3.5rem; background: #ffffff; } @@ -7303,8 +7313,8 @@ table tbody th { transform: translateX(-50%) rotate(calc(var(--percent) * 3.6deg)); -webkit-transform-origin: center 80px; transform-origin: center 80px; - width: 4px; - height: 50px; + width: 0.2rem; + height: 3.5rem; background: #ffffff; } diff --git a/front/src/main/resources/templates/common/menu-modal.html b/front/src/main/resources/templates/common/menu-modal.html index b0882169..b3e9d501 100644 --- a/front/src/main/resources/templates/common/menu-modal.html +++ b/front/src/main/resources/templates/common/menu-modal.html @@ -12,7 +12,32 @@ diff --git a/front/src/main/resources/templates/layout/layout-subar.html b/front/src/main/resources/templates/layout/layout-subar.html index 824ac97e..9de27790 100644 --- a/front/src/main/resources/templates/layout/layout-subar.html +++ b/front/src/main/resources/templates/layout/layout-subar.html @@ -36,7 +36,7 @@ - + diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index 116e3144..363ffe6d 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -37,7 +37,7 @@ - + diff --git a/front/src/main/resources/templates/record/daily/index.html b/front/src/main/resources/templates/record/daily/index.html index 625942ce..919da8d3 100644 --- a/front/src/main/resources/templates/record/daily/index.html +++ b/front/src/main/resources/templates/record/daily/index.html @@ -110,7 +110,7 @@ - + diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index 548ff5b4..e040b855 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -130,7 +130,7 @@ - + diff --git a/front/src/main/resources/templates/record/farming/index.html b/front/src/main/resources/templates/record/farming/index.html index 1385e2c2..2626c70c 100644 --- a/front/src/main/resources/templates/record/farming/index.html +++ b/front/src/main/resources/templates/record/farming/index.html @@ -133,7 +133,7 @@ - + diff --git a/front/src/main/resources/templates/record/forestry/index.html b/front/src/main/resources/templates/record/forestry/index.html index 467609a9..92683ec5 100644 --- a/front/src/main/resources/templates/record/forestry/index.html +++ b/front/src/main/resources/templates/record/forestry/index.html @@ -133,7 +133,7 @@ - + diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index 4d0a2b73..86c0727d 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -137,7 +137,7 @@ - + diff --git a/front/src/main/resources/templates/record/power/index.html b/front/src/main/resources/templates/record/power/index.html index cc1b9a0f..54d38d4e 100644 --- a/front/src/main/resources/templates/record/power/index.html +++ b/front/src/main/resources/templates/record/power/index.html @@ -118,7 +118,7 @@ - + diff --git a/front/src/main/resources/templates/record/work/index.html b/front/src/main/resources/templates/record/work/index.html index 0f51e0f7..49db622c 100644 --- a/front/src/main/resources/templates/record/work/index.html +++ b/front/src/main/resources/templates/record/work/index.html @@ -179,7 +179,7 @@ - +