From 2cf00c088045c636e653771af8387abd04c0982d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguyen=20Van=20Luan/=28Nguyen=20Van=20Luan=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074472@skcc.com> Date: Wed, 6 Aug 2025 19:02:19 +0900 Subject: [PATCH 1/4] update code fixbug --- assets/scss/common.scss | 8 ++++++++ assets/scss/common/button.scss | 6 ++++++ assets/scss/var.scss | 2 ++ components/common/Chart.vue | 6 ++++-- components/common/Grid.vue | 2 -- components/common/button/ActionButtons.vue | 4 ++-- components/common/button/BtnSearch.vue | 2 +- .../common/modal/EnrgUsePlanModiPop.vue | 19 ++++++++++--------- components/pages/ems/EccInfo/EccIaoTab.vue | 2 +- .../ems/ReadObjInfo/ReadObjAddInfoTab.vue | 9 +++++---- pages/comm/auth/UserRoleMngPage.vue | 4 ++-- pages/ems/base/EnrgCostCenterMngPage.vue | 16 +++++++++++----- pages/ems/base/ReadObjectMngPage.vue | 2 +- pages/ems/effc/EnrgUsePlanPage.vue | 2 +- 14 files changed, 54 insertions(+), 30 deletions(-) diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 3c6f2d4..cdaef9f 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -445,6 +445,10 @@ a { gap: 8px; } + .tui-grid-cell-content-editor{ + // min-height: 32px !important; + } + .v-navigation-drawer { background: map-deep-get($config, #{$theme}, "menu-bg-color"); } @@ -484,6 +488,10 @@ a { border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-header-border"); } + .custom-chart{ + border: 1px solid map-deep-get($config, #{$theme}, "v-chart-border"); + } + .btn-header { background-color: map-deep-get($config, #{$theme}, "v-btn-header-background"); border:1px solid map-deep-get($config, #{$theme}, "v-btn-header-border"); diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss index 505da79..5836aae 100644 --- a/assets/scss/common/button.scss +++ b/assets/scss/common/button.scss @@ -66,6 +66,12 @@ } } + .custom-action-btn{ + height: 24px; + width: 24px; + font-size: 12px; + } + .v-btn { background-color: map-deep-get($config, #{$theme}, diff --git a/assets/scss/var.scss b/assets/scss/var.scss index b4b3846..6bbd9f4 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -175,6 +175,7 @@ $config: ( btn-header-select-color:#FFFFFFD9, subtitle-tab: #FFFFFFA6, v-header-border: #424242, + v-chart-border: #424242, v-sidebar-border: #303030, ), light: (w-g5: $--color-gray_555, @@ -314,6 +315,7 @@ $config: ( btn-header-select-bg:#FFFFFF, subtitle-tab: #000000A6, v-header-border: #D9D9D9, + v-chart-border: #D9D9D9, v-sidebar-border: #F0F0F0, ), ); \ No newline at end of file diff --git a/components/common/Chart.vue b/components/common/Chart.vue index 4dcc7c1..3aacaf6 100644 --- a/components/common/Chart.vue +++ b/components/common/Chart.vue @@ -61,7 +61,8 @@ export default { isDarkMode: 'isDarkMode', chartOption(state) { var dark_Col = [ - '#01AE6A', + '#79B100', + // '#01AE6A', '#FFB046', '#F6637B', '#944FE9', @@ -194,7 +195,8 @@ export default { var lightCol_dashReadplcStatus = ['#3cc380', '#ffb13b', '#f98694']; var light_Col = [ - '#3CC380', + '#3BAD43', + // '#3CC380', '#FFB13B', '#F98694', '#CF74E5', diff --git a/components/common/Grid.vue b/components/common/Grid.vue index cdaad76..8eb4417 100644 --- a/components/common/Grid.vue +++ b/components/common/Grid.vue @@ -299,7 +299,6 @@ export default { startEditing(e) { // console.log('startEditing1...') if (this.preventFocusChangeEvent(e)) { - // console.log('prevent startEditing') return; } @@ -311,7 +310,6 @@ export default { // console.log('startEditing2...') if (this.editorGrid && e.rowKey >= 0) { this.editorStartKey = e.rowKey; - // console.log("E::", this.gridInstance.invoke("getRow", e.rowKey)); this.gridInstance.invoke('startEditing', e.rowKey, e.columnName); this.$emit( 'getRowsData', diff --git a/components/common/button/ActionButtons.vue b/components/common/button/ActionButtons.vue index 4d6a7f3..ecf39ce 100644 --- a/components/common/button/ActionButtons.vue +++ b/components/common/button/ActionButtons.vue @@ -2,9 +2,9 @@
- + - +
diff --git a/components/common/button/BtnSearch.vue b/components/common/button/BtnSearch.vue index a1d3f67..1346b92 100644 --- a/components/common/button/BtnSearch.vue +++ b/components/common/button/BtnSearch.vue @@ -10,7 +10,7 @@ export default { size: { type: String, require: false, - default: "middle", // small, middle, large + default: "default", // small, default, large } }, methods: { diff --git a/components/common/modal/EnrgUsePlanModiPop.vue b/components/common/modal/EnrgUsePlanModiPop.vue index 4fa2137..01a704c 100644 --- a/components/common/modal/EnrgUsePlanModiPop.vue +++ b/components/common/modal/EnrgUsePlanModiPop.vue @@ -65,13 +65,10 @@
-
- 사용량 계획 -
-
+
--> - 취소 확정 @@ -493,6 +489,7 @@ export default { }, // valueFormatter: (value) => '$' +parseFloat(value).toFixed() formatter: function(params){ + console.log(params) var toolTipTitle = params[0].name[0]; let res = "
"+toolTipTitle+"
"; for (var i = 0; i < params.length; i++) { @@ -533,9 +530,13 @@ export default { seriesData = data.map(item => ({ name: item.gubun == '2PLAN' ? '계획' : '전년실적', type: item.gubun == '2PLAN' ? 'line' : 'bar', - data: targetMonthList.map(obj => item[obj] || null) + data: targetMonthList.map(obj => item[obj] || null), // data: targetMonthList.map(obj => item[obj] || 0) - })); + } + )); + + + this.nowSeriesData = seriesData; // xAxisData = myKey.map(obj => obj.header); @@ -643,4 +644,4 @@ let modifyEnrgUsePlanModalDataKey = modifyEnrgUsePlanChart: Utility.defaultChartOption(true) }; // 전력량 요금(원/kWh) - + \ No newline at end of file diff --git a/components/pages/ems/EccInfo/EccIaoTab.vue b/components/pages/ems/EccInfo/EccIaoTab.vue index 9153f96..a96c9e8 100644 --- a/components/pages/ems/EccInfo/EccIaoTab.vue +++ b/components/pages/ems/EccInfo/EccIaoTab.vue @@ -11,7 +11,7 @@ :btnActionsFnc="btnActions" />
-
+
- 검침 대상 추가 정보 + 검침 대상 추가 정보