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 01/14] 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" />
-
+
- 검침 대상 추가 정보 + 검침 대상 추가 정보
-
+
+ :btnActionsFnc="dualGridBtnActions"/>
- + - [배정]메뉴별권한 리스트 + + [배정]메뉴별권한 리스트 + + @@ -344,8 +350,8 @@ export default { const _this = this; const myColumns = [ - { header: '역할ID', name: 'roleId', align: 'left', minWidth: 70,width:120 }, - { header: '역할명', name: 'roleNm', minWidth: 70, align: 'left',width:120 }, + { header: '역할ID', name: 'roleId', align: 'left', minWidth: 70, width: 120 }, + { header: '역할명', name: 'roleNm', minWidth: 70, align: 'left', width: 120 }, { header: '사용여부', name: 'useFg', @@ -805,4 +811,23 @@ function numberFormatter({ value }) { return value; } } + + + + \ No newline at end of file diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue index cc71731..8e2b837 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -46,19 +46,21 @@ icon="delete">삭제
- + {{ viewActionData.title }} - - + + + + 파일목록 -
+
mdi-paperclip @@ -187,13 +189,26 @@
- mdi-paperclip + mdi-paperclip {{ fileData.name }}
+
+
+
+ mdi-paperclip + {{ fileData.apndFileNm + '.' + + fileData.apndFileExt }} +
+ +
+
업로드 @@ -1044,7 +1059,7 @@ const defaultData = { .custom-view { border: 1px solid; border-radius: 6px; - height: 100%; + height: 0; @each $theme in dark, light { @include theme($theme); @@ -1065,5 +1080,10 @@ const defaultData = { .toastui-editor-mode-switch .tab-item { color: #000000E0 } + + .v-icon.anticon-delete svg { + width: 14px; + height: 14px; + } } diff --git a/pages/comm/base/PrgmMngPage.vue b/pages/comm/base/PrgmMngPage.vue index d8a180b..e465f2a 100644 --- a/pages/comm/base/PrgmMngPage.vue +++ b/pages/comm/base/PrgmMngPage.vue @@ -103,21 +103,6 @@ export default { gridName: 'rowGrid', // rowGridOrigin: [], detailList: myDetail, - - dataPathMock: { - 'rowGrid': { - column: [ - { header: '프로그램ID', name: 'field1', align: 'left' }, - { header: '프로그램덤', name: 'field2', align: 'left' }, - { header: '타임', name: 'field3', align: 'left' }, - { header: '사용여부', name: 'field4', align: 'left' } - ], - option: { - scrollY: false, - scrollX: false, - } - } - }, }; }, computed: { @@ -189,17 +174,17 @@ export default { const gridHeight = this.$refs.gridParent.offsetHeight - 36; const myOptions = { - scrollX: false, + scrollY: true, }; // console.log("this.pageData", this.pageData) const _this = this; const myColumns = [ - { header: '프로그램ID', name: 'prgmId', align: 'center' }, - { header: '프로그램명', name: 'prgmNm' }, + { header: '프로그램ID', name: 'prgmId', align: 'left' }, + { header: '프로그램명', name: 'prgmNm', align: 'left' }, { header: '타입', name: 'prgmTpCd', - align: 'center', + align: 'left', formatter({ value }) { return value ? (value === '1' ? '프로그램' : '팝업') : null; }, @@ -207,7 +192,7 @@ export default { { header: '사용여부', name: 'useFg', - align: 'center', + align: 'left', formatter({ value }) { value = value === true ? '1' : '0'; const newValue = _this.pageData.selectUseFgList.filter( From 537a16fbc7cf3808eb7dd01c789ab8ff5d06e5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com> Date: Thu, 7 Aug 2025 10:40:23 +0700 Subject: [PATCH 08/14] fixbugs screen 10 --- .../ems/DataSetInfo/DataSetTagRelTab.vue | 29 ++++++++++--------- pages/ems/effc/DataSetMngPage.vue | 5 ++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue index e5c4fa6..73d6f34 100644 --- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue +++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue @@ -1,7 +1,10 @@ @@ -141,7 +152,7 @@ export default { modifyValue(e) { const dt = { columnName: this.item.valueNm, - value: e, + value: e.target.checked, }; this.$emit('gridEditingFinish', dt); }, diff --git a/pages/ems/base/DashboardPage.vue b/pages/ems/base/DashboardPage.vue index 54d04df..977086c 100644 --- a/pages/ems/base/DashboardPage.vue +++ b/pages/ems/base/DashboardPage.vue @@ -840,7 +840,7 @@ export default { { header: "주의", name: "careStndVal", align: "right", width: 40 }, { header: "경고", name: "warnStndVal", align: "right", width: 40 }, { header: "가이드", name: "totVal", align: "right", width: 40 }, - { header: "알람 내용", name: "alrmMsg", align: "left" }, + { header: "알람 내용", name: "alrmMsg", align: "left", resizable: false }, { header: "설비종류", name: "eqpmKindId", align: "left", hidden: true }, { header: "설비종류", name: "eqpmKindNm", align: "left", hidden: true }, ]; From fa68aa31e6d61e051ff75b94e449c8d7007f9f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hoang=20Xuan=20Mai/=28Hoang=20Xuan=20Mai=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074474@skcc.com> Date: Thu, 7 Aug 2025 13:33:35 +0700 Subject: [PATCH 10/14] add dark mode for editor --- assets/scss/common.scss | 18 +- assets/scss/common/editor.scss | 474 ++++++++++++++++++++++++++++++ pages/comm/base/NoticeMngPage.vue | 11 +- 3 files changed, 491 insertions(+), 12 deletions(-) create mode 100644 assets/scss/common/editor.scss diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 30bbcb5..cf8a928 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -9,6 +9,8 @@ @import "./common/card.scss"; @import "./common/tabs.scss"; @import "./common/numericInput.scss"; +@import "./common/editor.scss"; + html, body { @@ -1166,14 +1168,14 @@ a { } } - .toastui-editor-contents { - * { - color: map-deep-get($config, - #{$theme}, - "tui-editor-contents-color" - ) !important; - } - } + // .toastui-editor-contents { + // * { + // color: map-deep-get($config, + // #{$theme}, + // "tui-editor-contents-color" + // ) !important; + // } + // } .lnb-logo { color: map-deep-get($config, #{$theme}, "v-dialog-card-text-color"); diff --git a/assets/scss/common/editor.scss b/assets/scss/common/editor.scss new file mode 100644 index 0000000..a12aba6 --- /dev/null +++ b/assets/scss/common/editor.scss @@ -0,0 +1,474 @@ +@charset "utf-8"; +.toastui-editor-dark .toastui-editor-defaultUI { + border-color: #424242; + color: #eee; +} + +.toastui-editor-dark .toastui-editor-md-container, +.toastui-editor-dark .toastui-editor-ww-container { + background-color: #212224; +} + +.toastui-editor-dark .toastui-editor-defaultUI-toolbar { + background-color: #212224; + border-bottom-color: #303238; +} + +.toastui-editor-dark .toastui-editor-toolbar-icons { + background-position-y: -49px; + border-color: #232428; +} + +.toastui-editor-dark .toastui-editor-toolbar-icons:not(:disabled):hover { + background-color: #36383f; + border-color: #36383f; +} + +.toastui-editor-dark .toastui-editor-toolbar-divider { + background-color: #303238; +} + +.toastui-editor-dark .toastui-editor-tooltip { + background-color: #535662; +} + +.toastui-editor-dark .toastui-editor-tooltip .arrow { + background-color: #535662; +} + +.toastui-editor-dark .toastui-editor-defaultUI-toolbar .scroll-sync::before { + color: #8f939f; +} + +.toastui-editor-dark .toastui-editor-defaultUI-toolbar .scroll-sync.active::before { + color: #67ccff; +} + +.toastui-editor-dark .toastui-editor-defaultUI-toolbar .switch { + background-color: #2b4455; +} + +.toastui-editor-dark .toastui-editor-defaultUI-toolbar input:checked + .switch { + background-color: #2b4455; +} + +.toastui-editor-dark .toastui-editor-defaultUI-toolbar .switch::before { + background-color: #8f939f; +} + +.toastui-editor-dark .toastui-editor-defaultUI-toolbar input:checked + .switch::before { + background-color: #67ccff; +} + +.toastui-editor-dark .toastui-editor-main .toastui-editor-md-splitter { + background-color: #303238; +} + +.toastui-editor-dark .toastui-editor-mode-switch { + border-top-color: #424242; + background-color: #212224; +} + +.toastui-editor-dark .toastui-editor-mode-switch .tab-item { + border-color: #424242; + background-color: #212224; + color: #eee; +} + +.toastui-editor-dark .toastui-editor-mode-switch .tab-item.active { + border-top-color: #424242; + background-color: #212224; + color: #1677FF; +} + +.toastui-editor-dark .toastui-editor-popup, +.toastui-editor-dark .toastui-editor-context-menu { + background-color: #121212; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); + border-color: #494c56; +} + +.toastui-editor-dark .toastui-editor-popup-add-heading ul li:hover { + background-color: #36383f; +} + +.toastui-editor-dark .toastui-editor-popup-body label { + color: #9a9da3; +} + +.toastui-editor-dark .toastui-editor-popup-body input[type='text'] { + background-color: transparent; + color: #eee; + border-color: #303238; +} + +.toastui-editor-dark .toastui-editor-popup-body input[type='text']:focus { + outline-color: #67ccff; +} + +.toastui-editor-dark .toastui-editor-popup-body input[type='text'].disabled { + color: #969aa5; + border-color: #303238; + background-color: rgba(48, 50, 56, 0.4); +} + +.toastui-editor-dark .toastui-editor-popup-add-image .toastui-editor-tabs .tab-item { + border-bottom-color: #292e37; + color: #eee; +} + +.toastui-editor-dark .toastui-editor-popup-add-image .toastui-editor-tabs .tab-item:hover { + border-bottom-color: #3c424d; +} + +.toastui-editor-dark .toastui-editor-popup-add-image .toastui-editor-tabs .tab-item.active { + color: #67ccff; + border-bottom-color: #67ccff; +} + +.toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-name { + border-color: #303238; + color: #eee; +} + +.toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-select-button { + border-color: #303238; + background-color: #232428; + color: #eee; +} + +.toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-select-button:hover { + border-color: #494c56; +} + +.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button { + color: #eee; + border-color: #303238; + background-color: #232428; +} + +.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button:hover { + border-color: #494c56; +} + +.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button { + color: #121212; + background-color: #67ccff; +} + +.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button:hover { + color: #121212; + background-color: #32baff; +} + +.toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-cell { + border-color: #303238; + background-color: #121212; +} + +.toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-cell.header { + border-color: #303238; + background-color: #232428; +} + +.toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-selection-layer { + border-color: rgba(103, 204, 255, 0.4); + background-color: rgba(103, 204, 255, 0.1); +} + +.toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-description { + color: #eee +} + +.toastui-editor-dark .toastui-editor-md-tab-container { + background-color: #232428; + border-bottom-color: #303238; +} + +.toastui-editor-dark .toastui-editor-md-tab-container .tab-item { + border-color: #393b42; + background-color: #2d2f34; + color: #757a86; +} + +.toastui-editor-dark .toastui-editor-md-tab-container .tab-item.active { + border-bottom-color: #121212; + background-color: #121212; + color: #eee; +} + + +.toastui-editor-dark .toastui-editor-context-menu .menu-group { + border-bottom-color: #303238; + color: #eee; +} + +.toastui-editor-dark .toastui-editor-context-menu .menu-item span::before { + background-position-y: -126px; +} + +.toastui-editor-dark .toastui-editor-context-menu li:not(.disabled):hover { + background-color: #36383f; +} + +.toastui-editor-dark .toastui-editor-context-menu li.disabled { + color: #969aa5; +} + +.toastui-editor-dark .toastui-editor-dropdown-toolbar { + border-color: #494c56; + background-color: #232428; +} + +.toastui-editor-dark .ProseMirror, +.toastui-editor-dark .toastui-editor-contents p, +.toastui-editor-dark .toastui-editor-contents h1, +.toastui-editor-dark .toastui-editor-contents h2, +.toastui-editor-dark .toastui-editor-contents h3, +.toastui-editor-dark .toastui-editor-contents h4, +.toastui-editor-dark .toastui-editor-contents h5, +.toastui-editor-dark .toastui-editor-contents h6 { + color: #fff; +} + +.toastui-editor-dark .toastui-editor-contents h1, +.toastui-editor-dark .toastui-editor-contents h2 { + border-color: #fff; +} + +.toastui-editor-dark .toastui-editor-contents del { + color: #777980; +} + +.toastui-editor-dark .toastui-editor-contents blockquote { + border-color: #303135; +} + +.toastui-editor-dark .toastui-editor-contents blockquote p, +.toastui-editor-dark .toastui-editor-contents blockquote ul, +.toastui-editor-dark .toastui-editor-contents blockquote ol { + color: #777980; +} + +.toastui-editor-dark .toastui-editor-contents pre { + background-color: #232428; +} + +.toastui-editor-dark .toastui-editor-contents pre code { + background-color: transparent; + color: #fff; +} + +.toastui-editor-dark .toastui-editor-contents code { + color: #c1798b; + background-color: #35262a; +} + +.toastui-editor-dark .toastui-editor-contents div { + color: #fff; +} + +.toastui-editor-dark .toastui-editor-ww-code-block-language { + border-color: #303238; + background-color: #121212; +} + +.toastui-editor-dark .toastui-editor-ww-code-block-language input { + color: #fff; +} + +.toastui-editor-dark .toastui-editor-contents .toastui-editor-ww-code-block:after { + background-color: #232428; + border: 1px solid #393b42; + color: #eee; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI1LjIuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IuugiOydtOyWtF8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiCgkgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMzAgMzAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMwIDMwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGwtcnVsZTpldmVub2RkO2NsaXAtcnVsZTpldmVub2RkO2ZpbGw6I2ZmZjt9Cjwvc3R5bGU+CjxnPgoJPGc+CgkJPGc+CgkJCTxnPgoJCQkJPGc+CgkJCQkJPHBhdGggY2xhc3M9InN0MCIgZD0iTTE1LjUsMTIuNWwyLDJMMTIsMjBoLTJ2LTJMMTUuNSwxMi41eiBNMTgsMTBsMiwybC0xLjUsMS41bC0yLTJMMTgsMTB6Ii8+CgkJCQk8L2c+CgkJCTwvZz4KCQk8L2c+Cgk8L2c+CjwvZz4KPC9zdmc+Cg=='); +} + +.toastui-editor-dark .toastui-editor-contents .toastui-editor-custom-block-editor { + background: #392d31; + color: #fff; + border-color: #327491; +} + +.toastui-editor-dark .toastui-editor-custom-block.ProseMirror-selectednode .toastui-editor-custom-block-view { + color: #fff; + border-color: #327491; +} + +.toastui-editor-dark .toastui-editor-custom-block-view button { + background-color: #232428; + border-color: #393b42; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI1LjIuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IuugiOydtOyWtF8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiCgkgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMzAgMzAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMwIDMwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGwtcnVsZTpldmVub2RkO2NsaXAtcnVsZTpldmVub2RkO2ZpbGw6I2ZmZjt9Cjwvc3R5bGU+CjxnPgoJPGc+CgkJPGc+CgkJCTxnPgoJCQkJPGc+CgkJCQkJPHBhdGggY2xhc3M9InN0MCIgZD0iTTE1LjUsMTIuNWwyLDJMMTIsMjBoLTJ2LTJMMTUuNSwxMi41eiBNMTgsMTBsMiwybC0xLjUsMS41bC0yLTJMMTgsMTB6Ii8+CgkJCQk8L2c+CgkJCTwvZz4KCQk8L2c+Cgk8L2c+CjwvZz4KPC9zdmc+Cg=='); +} + +.toastui-editor-dark .toastui-editor-custom-block-view button:hover { + background-color: #232428; + border-color: #595c68; +} + +.toastui-editor-dark .toastui-editor-custom-block-view .info { + color: #65acca; +} + +.toastui-editor-dark .toastui-editor-contents table { + border-color: #303238; +} + +.toastui-editor-dark .toastui-editor-contents table th, +.toastui-editor-dark .toastui-editor-contents table td { + border-color: #303238; +} + +.toastui-editor-dark .toastui-editor-contents table th { + background-color: #3a3c42; +} + +.toastui-editor-dark .toastui-editor-contents table td, +.toastui-editor-dark .toastui-editor-contents table td p { + color: #fff; +} + +.toastui-editor-dark .toastui-editor-contents td.toastui-editor-cell-selected { + background-color: rgba(103, 204, 255, 0.5); +} + +.toastui-editor-dark .toastui-editor-contents th.toastui-editor-cell-selected { + background-color: rgba(103, 204, 255, 0.3); +} + +.toastui-editor-dark table.ProseMirror-selectednode { + outline-color: #67ccff; +} + +.toastui-editor-dark .html-block.ProseMirror-selectednode { + outline-color: #67ccff; +} + +.toastui-editor-dark .toastui-editor-contents ul, +.toastui-editor-dark .toastui-editor-contents menu, +.toastui-editor-dark .toastui-editor-contents ol, +.toastui-editor-dark .toastui-editor-contents dir { + color: #55575f; +} + +.toastui-editor-dark .toastui-editor-contents ul > li::before { + background-color: #55575f; +} + +.toastui-editor-dark .toastui-editor-contents hr { + border-color: #55575f; +} + +.toastui-editor-dark .toastui-editor-contents a { + color: #4b96e6; +} + +.toastui-editor-dark .toastui-editor-contents a:hover { + color: #1f70de; +} + +.toastui-editor-dark .toastui-editor-contents .image-link:hover::before { + border-color: #393b42; + background-color: #232428; + background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCIgdmlld0JveD0iMCAwIDIwIDIwIj4KICAgIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIj4KICAgICAgICA8ZyBzdHJva2U9IiNFRUUiIHN0cm9rZS13aWR0aD0iMS41Ij4KICAgICAgICAgICAgPGc+CiAgICAgICAgICAgICAgICA8Zz4KICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNNy42NjUgMTUuMDdsLTEuODE5LS4wMDJjLTEuNDg2IDAtMi42OTItMS4yMjgtMi42OTItMi43NDR2LS4xOTJjMC0xLjUxNSAxLjIwNi0yLjc0NCAyLjY5Mi0yLjc0NGgzLjg0NmMxLjQ4NyAwIDIuNjkyIDEuMjI5IDIuNjkyIDIuNzQ0di4xOTIiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDQ1IC0xNzQzKSB0cmFuc2xhdGUoMTA0MCAxNzM4KSB0cmFuc2xhdGUoNSA1KSBzY2FsZSgxIC0xKSByb3RhdGUoNDUgMzcuMjkzIDApIi8+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTEyLjMyNiA0LjkzNGwxLjgyMi4wMDJjMS40ODcgMCAyLjY5MyAxLjIyOCAyLjY5MyAyLjc0NHYuMTkyYzAgMS41MTUtMS4yMDYgMi43NDQtMi42OTMgMi43NDRoLTMuODQ1Yy0xLjQ4NyAwLTIuNjkyLTEuMjI5LTIuNjkyLTIuNzQ0VjcuNjgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDQ1IC0xNzQzKSB0cmFuc2xhdGUoMTA0MCAxNzM4KSB0cmFuc2xhdGUoNSA1KSBzY2FsZSgxIC0xKSByb3RhdGUoNDUgMzAuOTk2IDApIi8+CiAgICAgICAgICAgICAgICA8L2c+CiAgICAgICAgICAgIDwvZz4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPgo='); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); +} + +.toastui-editor-dark .toastui-editor-contents .task-list-item::before { + background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij4KICAgIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgc3Ryb2tlPSIjNTU1NzVGIj4KICAgICAgICAgICAgPGc+CiAgICAgICAgICAgICAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTAzMCAtMzE2KSB0cmFuc2xhdGUoNzg4IDE5MikgdHJhbnNsYXRlKDI0MiAxMjQpIj4KICAgICAgICAgICAgICAgICAgICA8cmVjdCB3aWR0aD0iMTciIGhlaWdodD0iMTciIHg9Ii41IiB5PSIuNSIgcng9IjIiLz4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+Cg=='); + background-color: transparent; +} + +.toastui-editor-dark .toastui-editor-contents .task-list-item.checked::before { + background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij4KICAgIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgZmlsbD0iIzRCOTZFNiI+CiAgICAgICAgICAgIDxnPgogICAgICAgICAgICAgICAgPGc+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTE2IDBjMS4xMDUgMCAyIC44OTUgMiAydjE0YzAgMS4xMDUtLjg5NSAyLTIgMkgyYy0xLjEwNSAwLTItLjg5NS0yLTJWMkMwIC44OTUuODk1IDAgMiAwaDE0em0tMS43OTMgNS4yOTNjLS4zOS0uMzktMS4wMjQtLjM5LTEuNDE0IDBMNy41IDEwLjU4NSA1LjIwNyA4LjI5M2wtLjA5NC0uMDgzYy0uMzkyLS4zMDUtLjk2LS4yNzgtMS4zMi4wODMtLjM5LjM5LS4zOSAxLjAyNCAwIDEuNDE0bDMgMyAuMDk0LjA4M2MuMzkyLjMwNS45Ni4yNzggMS4zMi0uMDgzbDYtNiAuMDgzLS4wOTRjLjMwNS0uMzkyLjI3OC0uOTYtLjA4My0xLjMyeiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEwNTAgLTI5NikgdHJhbnNsYXRlKDc4OCAxOTIpIHRyYW5zbGF0ZSgyNjIgMTA0KSIvPgogICAgICAgICAgICAgICAgPC9nPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4K'); +} + +.toastui-editor-dark .toastui-editor-md-delimiter, +.toastui-editor-dark .toastui-editor-md-code.toastui-editor-md-delimiter, +.toastui-editor-dark .toastui-editor-md-thematic-break, +.toastui-editor-dark .toastui-editor-md-link, +.toastui-editor-dark .toastui-editor-md-table, +.toastui-editor-dark .toastui-editor-md-block-quote { + color: #55575f; +} + +.toastui-editor-dark .toastui-editor-md-meta, +.toastui-editor-dark .toastui-editor-md-html { + color: #55575f; +} + +.toastui-editor-dark .toastui-editor-md-link.toastui-editor-md-link-url.toastui-editor-md-marked-text { + color: #777980; +} + +.toastui-editor-dark .toastui-editor-md-block-quote .toastui-editor-md-marked-text, +.toastui-editor-dark .toastui-editor-md-list-item .toastui-editor-md-meta { + color: #b3b5bc; +} + +.toastui-editor-dark .toastui-editor-md-link.toastui-editor-md-link-desc.toastui-editor-md-marked-text, +.toastui-editor-dark .toastui-editor-md-list-item-style.toastui-editor-md-list-item-odd { + color: #4b96e6; +} + +.toastui-editor-dark .toastui-editor-md-list-item-style.toastui-editor-md-list-item-even { + color: #ef6767; +} + +.toastui-editor-dark .toastui-editor-md-table .toastui-editor-md-table-cell { + color: #fff; +} + +.toastui-editor-dark .toastui-editor-md-code.toastui-editor-md-marked-text { + color: #c1798b; +} + +.toastui-editor-dark .toastui-editor-md-code { + background-color: #35262a; +} + +.toastui-editor-dark .toastui-editor-md-code-block-line-background { + background-color: #232428; +} + +.toastui-editor-dark .toastui-editor-md-code-block .toastui-editor-md-meta { + color: #aaa; +} + +.toastui-editor-dark .toastui-editor-md-custom-block { + color: #fff; +} + +.toastui-editor-dark .toastui-editor-md-custom-block-line-background { + background-color: #392d31; +} + +.toastui-editor-dark .toastui-editor-md-custom-block .toastui-editor-md-delimiter { + color: #327491; +} + +.toastui-editor-dark .toastui-editor-md-custom-block .toastui-editor-md-meta { + color: #65acca; +} + +.toastui-editor-dark .toastui-editor-contents .toastui-editor-md-preview-highlight::after { + background-color: rgba(255, 250, 193, 0.5); +} + +.toastui-editor-dark .toastui-editor-contents th.toastui-editor-md-preview-highlight, +.toastui-editor-dark .toastui-editor-contents td.toastui-editor-md-preview-highlight { + background-color: rgba(255, 250, 193, 0.5); +} + +.toastui-editor-dark .toastui-editor-contents th.toastui-editor-md-preview-highlight { + color: #fff; +} + +.toastui-editor-dark .toastui-editor-contents th.toastui-editor-md-preview-highlight, +.toastui-editor-dark .toastui-editor-contents td.toastui-editor-md-preview-highlight { + background-color: rgba(255, 250, 193, 0.25); +} + +.toastui-editor-dark .toastui-editor-contents .toastui-editor-md-preview-highlight::after { + background-color: rgba(255, 250, 193, 0.25); +} \ No newline at end of file diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue index 8e2b837..4fe2942 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -88,7 +88,8 @@ - + @@ -134,7 +135,8 @@ - + 파일첨부 @@ -181,7 +183,8 @@ + :initialValue="updateActionData.content" + :class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/> 파일첨부 @@ -1077,7 +1080,7 @@ const defaultData = { color: #1677FF } - .toastui-editor-mode-switch .tab-item { + .toastui-editor-light .toastui-editor-mode-switch .tab-item { color: #000000E0 } From 6871d6034db7f93492c142dcc824d83ed0950ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com> Date: Thu, 7 Aug 2025 13:50:37 +0700 Subject: [PATCH 11/14] fix bugs screen 20.1~20.4 --- components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue | 6 ++++-- components/pages/ems/EqpmInfo/EqpmConstTab.vue | 11 +++++++---- components/pages/ems/EqpmInfo/EqpmIaoTab.vue | 12 +++++++++--- pages/ems/base/EquipmentMasterMngPage.vue | 2 +- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue index 3318184..efb9319 100644 --- a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue +++ b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue @@ -1,7 +1,9 @@