diff --git a/assets/scss/common/pagination.scss b/assets/scss/common/pagination.scss index 503ccc4..7f41cb7 100644 --- a/assets/scss/common/pagination.scss +++ b/assets/scss/common/pagination.scss @@ -10,7 +10,7 @@ // box-shadow: none !important; background-color: map-deep-get($config, #{$theme}, "paging-background") !important; color: map-deep-get($config, #{$theme}, "paging-text") !important; - border: 0.5px solid #424242; + border: none; .ant-pagination-item-link { border: none; @@ -19,13 +19,13 @@ } .ant-pagination-item-active { - border-color: #1890ff !important; + border: 1px solid #1890ff !important; color: #1890ff !important } .ant-pagination-options-size-changer { .ant-select-selection { - border: 0.5px solid #424242; + border: 0.5px solid map-deep-get($config, #{$theme}, "v-input-fieldset-color") !important; background: map-deep-get($config, #{$theme}, "paging-background") !important; color: map-deep-get($config, #{$theme}, "paging-text") !important; } diff --git a/components/common/chartoptions/GaugeChart.js b/components/common/chartoptions/GaugeChart.js index d29225c..e2917cc 100644 --- a/components/common/chartoptions/GaugeChart.js +++ b/components/common/chartoptions/GaugeChart.js @@ -2,15 +2,13 @@ export default function getGaugeChartOption({ title, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) { const colorRanges = isDarkMode ? [ - [0.375, '#49AA19'], // Dark Green - // [0.5, '#B8860B'], // Dark Yellow - [0.625, '#D89614'], // Dark Orange + [60 / 160, '#49AA19'], // Dark Green + [100 / 160, '#D89614'], // Dark Orange [1, '#D32029'], // Dark Red ] : [ - [0.375, '#52C41A'], // Light Green - // [0.5, '#FFD700'], // Light Yellow - [0.625, '#FAAD14'], // Light Orange + [60 / 160, '#52C41A'], // Light Green + [100 / 160, '#FAAD14'], // Light Orange [1, '#F5222D'], // Light Red ]; // Old color range @@ -56,6 +54,7 @@ export default function getGaugeChartOption({ title, min = 0, max = 160, unit = endAngle: -45, min: min, max: max, + splitNumber: 8, // progress: { // show: true, // width: 15, diff --git a/components/common/chartoptions/LineChart.js b/components/common/chartoptions/LineChart.js index 66c517f..a7bc322 100644 --- a/components/common/chartoptions/LineChart.js +++ b/components/common/chartoptions/LineChart.js @@ -34,6 +34,8 @@ export default function getLineChartOption({ legend: { // data: legendData, icon: 'circle', + itemWidth: 15, // Width of the legend icon + itemHeight: 15, top: '0%', right: '5%', orient: 'horizontal', diff --git a/components/common/modal/ElecPowChrgPop.vue b/components/common/modal/ElecPowChrgPop.vue index 56efac4..7d16d41 100644 --- a/components/common/modal/ElecPowChrgPop.vue +++ b/components/common/modal/ElecPowChrgPop.vue @@ -17,20 +17,24 @@ {{ item.label }} - + + > + + diff --git a/components/common/modal/ReadPlcPop.vue b/components/common/modal/ReadPlcPop.vue index 0ea0e67..0046098 100644 --- a/components/common/modal/ReadPlcPop.vue +++ b/components/common/modal/ReadPlcPop.vue @@ -1,5 +1,5 @@