+
-
@@ -61,7 +61,7 @@ import BtnExcelDownload from '~/components/common/button/BtnExcelDownload';
import DateUtility from '~/plugins/dateUtility';
// import Search from "~/components/common/search";
import EvtObjPop from '~/components/common/modal/EvtObjPop';
-import pagination from '~/components/Pagination';
+import pagination from '~/components/common/Pagination';
let myTitle;
// const myPrgmId = "PRG0052";
@@ -212,7 +212,7 @@ export default {
},
layoutInit() {
const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
- this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight}px)`;
+ this.$refs.contents.style.height = `calc(100% - 90px - ${searchFilterHeight}px) `;
},
async setFromDt() {
this.pageData.fromDt = Utility.setBeforetDate(
@@ -220,7 +220,6 @@ export default {
this.pageData.toDt,
'YYYYMMDD',
);
- // this.pageData.toDt = Utility.setAftertDate(this.pageData, this.pageData.fromDt, "YYYYMMDD");
},
gridInit() {
this.loadGrid = false;
From 71e90064a27cd84ef6522e4dbc18dfba94e0bd11 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: Tue, 12 Aug 2025 18:37:21 +0900
Subject: [PATCH 09/14] update code s32 s17
---
components/pages/ems/EccInfo/EccIaoTab.vue | 5 ++---
pages/comm/auth/UserRoleMngPage.vue | 11 -----------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/components/pages/ems/EccInfo/EccIaoTab.vue b/components/pages/ems/EccInfo/EccIaoTab.vue
index 66693ae..e8786f9 100644
--- a/components/pages/ems/EccInfo/EccIaoTab.vue
+++ b/components/pages/ems/EccInfo/EccIaoTab.vue
@@ -380,7 +380,7 @@ const myDetail = [
label: '대상 유형',
disabled: false,
cols: 6,
- class: 'pr-4',
+ class: 'pr-4 py-2',
list: 'emMapDivList',
valueNm: 'objKind',
itemText: 'commCdNm',
@@ -395,7 +395,7 @@ const myDetail = [
type: 'ReadPlcPop',
label: '대상 항목',
valueNm: 'objId',
- disabled: false,
+ disabled: true,
cols: 6,
class: 'pl-4 py-2',
required: true,
@@ -482,7 +482,6 @@ const myDetail = [
disabledFg: 'objKind',
labelCols: 12,
textCols: 12,
- iconShow: true,
},
{
type: 'InputText',
diff --git a/pages/comm/auth/UserRoleMngPage.vue b/pages/comm/auth/UserRoleMngPage.vue
index b3fbb40..2760f8a 100644
--- a/pages/comm/auth/UserRoleMngPage.vue
+++ b/pages/comm/auth/UserRoleMngPage.vue
@@ -947,17 +947,6 @@ const asgnRoleByUserColumns = [
];
const asgnMenuByUserColumns = [
- {
- header: '',
- name: '',
- align: 'center',
- width: 50,
- formatter: (props) => {
- return `
`;
- }
- },
{ header: '메뉴명', name: 'menuNm' }];
const myDetail = blocCdList => {
From 68f3f0f3810e1e1b17f804fb0ae830628d95af6a 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: Wed, 13 Aug 2025 08:18:27 +0700
Subject: [PATCH 10/14] fix bugs
---
assets/scss/common.scss | 23 ++-
components/icons/anticonAppStore.vue | 7 +
components/icons/anticonBulb.vue | 6 +
components/icons/anticonDesktop.vue | 6 +
components/icons/anticonDrag.vue | 6 +
components/icons/anticonFileText.vue | 6 +
components/icons/anticonLineChart.vue | 6 +
components/icons/anticonMessage.vue | 6 +
components/icons/anticonNoteExpand.vue | 6 +
components/icons/anticonPieChart.vue | 6 +
components/icons/anticonSearch.vue | 6 +
components/icons/anticonSetting.vue | 6 +
layouts/default.vue | 197 ++++++++++++++++++++++---
plugins/vuetify.js | 32 ++++
14 files changed, 295 insertions(+), 24 deletions(-)
create mode 100644 components/icons/anticonAppStore.vue
create mode 100644 components/icons/anticonBulb.vue
create mode 100644 components/icons/anticonDesktop.vue
create mode 100644 components/icons/anticonDrag.vue
create mode 100644 components/icons/anticonFileText.vue
create mode 100644 components/icons/anticonLineChart.vue
create mode 100644 components/icons/anticonMessage.vue
create mode 100644 components/icons/anticonNoteExpand.vue
create mode 100644 components/icons/anticonPieChart.vue
create mode 100644 components/icons/anticonSearch.vue
create mode 100644 components/icons/anticonSetting.vue
diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index ae9b134..7c26c91 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -309,6 +309,7 @@ a {
& .v-icon.mdi-chevron-down {
margin-left: auto;
animation-duration: 0.5s;
+ font-size: 12px;
}
}
}
@@ -680,15 +681,18 @@ a {
background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color" );
}
.v-treeview-node__content {
+ .v-icon,
.v-treeview-node__label {
color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
}
+
+ .anticon.anticon-down {
+ color: map-deep-get($config, #{$theme}, "icon-datepicker-color");
+ }
}
-
}
&[aria-expanded="true"]{
-
// Level 1
&>.v-treeview-node__root {
background-color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-bg" );
@@ -705,9 +709,11 @@ a {
}
.v-icon:first-child,
- .v-icon:first-child::before {
+ .v-icon:first-child::before,
+ .anticon.anticon-down {
color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
}
+
}
}
@@ -715,10 +721,19 @@ a {
// Level 2
.v-treeview-node__root {
color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color");
+
&:hover {
background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-backgroundColor");
}
+
+ .v-treeview-node__content {
+ .v-icon,
+ .v-icon::before {
+ color: map-deep-get($config, #{$theme}, "icon-datepicker-color");
+ }
+ }
}
+
&>[aria-expanded="true"] >.v-treeview-node__root,
.v-treeview-node__root.v-treeview-node--active {
background-color: map-deep-get($config, #{$theme}, "v-calendar-day-in-not-month-color" );
@@ -729,7 +744,7 @@ a {
.v-icon,
.v-icon::before,
- .anticon {
+ .anticon.anticon-down {
color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
}
}
diff --git a/components/icons/anticonAppStore.vue b/components/icons/anticonAppStore.vue
new file mode 100644
index 0000000..a60300f
--- /dev/null
+++ b/components/icons/anticonAppStore.vue
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonBulb.vue b/components/icons/anticonBulb.vue
new file mode 100644
index 0000000..be7c129
--- /dev/null
+++ b/components/icons/anticonBulb.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonDesktop.vue b/components/icons/anticonDesktop.vue
new file mode 100644
index 0000000..8434eae
--- /dev/null
+++ b/components/icons/anticonDesktop.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonDrag.vue b/components/icons/anticonDrag.vue
new file mode 100644
index 0000000..bcc46cc
--- /dev/null
+++ b/components/icons/anticonDrag.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonFileText.vue b/components/icons/anticonFileText.vue
new file mode 100644
index 0000000..3de4609
--- /dev/null
+++ b/components/icons/anticonFileText.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonLineChart.vue b/components/icons/anticonLineChart.vue
new file mode 100644
index 0000000..f74ac70
--- /dev/null
+++ b/components/icons/anticonLineChart.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonMessage.vue b/components/icons/anticonMessage.vue
new file mode 100644
index 0000000..a2bd9fa
--- /dev/null
+++ b/components/icons/anticonMessage.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonNoteExpand.vue b/components/icons/anticonNoteExpand.vue
new file mode 100644
index 0000000..e5ba547
--- /dev/null
+++ b/components/icons/anticonNoteExpand.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonPieChart.vue b/components/icons/anticonPieChart.vue
new file mode 100644
index 0000000..168c95e
--- /dev/null
+++ b/components/icons/anticonPieChart.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonSearch.vue b/components/icons/anticonSearch.vue
new file mode 100644
index 0000000..6f24fc9
--- /dev/null
+++ b/components/icons/anticonSearch.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/icons/anticonSetting.vue b/components/icons/anticonSetting.vue
new file mode 100644
index 0000000..13cd331
--- /dev/null
+++ b/components/icons/anticonSetting.vue
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/layouts/default.vue b/layouts/default.vue
index f803b26..644c9b9 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -98,15 +98,26 @@
:items="treevieItems" activatable hoverable color="#3896ff" open-on-click @update:open="openNode">
+