From d8c9711568d39abf1858bd30dbc342f0bf163026 Mon Sep 17 00:00:00 2001 From: bangae1 Date: Wed, 28 May 2025 08:58:34 +0000 Subject: [PATCH] =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/avatars/svg/person-1.svg | 4 +- public/images/avatars/svg/person-2.svg | 2 +- src/components/base/VAvatar.vue | 8 +- src/components/layouts/navbar/Navbar.vue | 8 +- src/components/layouts/navbar/NavbarItem.vue | 2 +- .../pages/contract/ContractSave.vue | 129 +++++++++--------- .../pages/contract/ContractView.vue | 84 +++++------- src/components/pages/dashboards/Dashboard.vue | 2 +- .../pages/estimate/EstimateUpdate.vue | 124 ++++++++--------- .../pages/estimate/EstimateView.vue | 108 +++++++-------- .../layout/toolbar/ToolbarUserProfile.vue | 8 +- src/scss/components/_custom-contract.scss | 25 +++- src/scss/css-variables/_colors.scss | 2 + src/scss/css-variables/_fonts.scss | 2 +- src/scss/layout/_layout.scss | 7 +- 15 files changed, 243 insertions(+), 272 deletions(-) diff --git a/public/images/avatars/svg/person-1.svg b/public/images/avatars/svg/person-1.svg index 91dc2d0..efc83fc 100644 --- a/public/images/avatars/svg/person-1.svg +++ b/public/images/avatars/svg/person-1.svg @@ -1,2 +1,2 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/public/images/avatars/svg/person-2.svg b/public/images/avatars/svg/person-2.svg index 5bac2de..64cd6be 100644 --- a/public/images/avatars/svg/person-2.svg +++ b/public/images/avatars/svg/person-2.svg @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/base/VAvatar.vue b/src/components/base/VAvatar.vue index 59099ae..aa091cc 100644 --- a/src/components/base/VAvatar.vue +++ b/src/components/base/VAvatar.vue @@ -147,11 +147,11 @@ const { onceError } = useImageError() } .avatar { - width: 40px; - min-width: 40px; - height: 40px; + width: 35px; + min-width: 30px; + height: 35px; object-fit: cover; - border: 2px solid var(--white); + //border: 2px solid var(--white); &.is-squared { border-radius: 10px !important; diff --git a/src/components/layouts/navbar/Navbar.vue b/src/components/layouts/navbar/Navbar.vue index b0f99b2..cdf352a 100644 --- a/src/components/layouts/navbar/Navbar.vue +++ b/src/components/layouts/navbar/Navbar.vue @@ -18,8 +18,8 @@ const isScrolling = computed(() => { theme === 'colored' && 'is-colored', ]" > -
-
+
+
@@ -365,7 +365,9 @@ const isScrolling = computed(() => { display: flex; align-items: center; justify-content: flex-end; - width: 25%; + width: 15%; + padding-right: 33px; + background-color: var(--primary); .icon-link { display: flex; diff --git a/src/components/layouts/navbar/NavbarItem.vue b/src/components/layouts/navbar/NavbarItem.vue index 33a8bb2..5e5ba46 100644 --- a/src/components/layouts/navbar/NavbarItem.vue +++ b/src/components/layouts/navbar/NavbarItem.vue @@ -70,7 +70,7 @@ const { activeSubnavId, toggleSubnav } = useNavbarLayoutContext() .router-link-active { //border-color: var(--primary) !important; //background-color: var(--primary) !important; - border-bottom: 3px solid var(--primary) !important; + border-bottom: 3px solid var(--primary-active) !important; //.iconify { // color: white !important; //} diff --git a/src/components/pages/contract/ContractSave.vue b/src/components/pages/contract/ContractSave.vue index e697a0f..006b454 100644 --- a/src/components/pages/contract/ContractSave.vue +++ b/src/components/pages/contract/ContractSave.vue @@ -156,31 +156,24 @@ watch(pbAtts.value, (newValue) => {
첨부파일 - -
- - - -
- {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb) -
-
- -
+ > + + + +
+ {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
- +
+ +
+
-
-
- -
-

상세 규격

@@ -200,65 +193,65 @@ watch(pbAtts.value, (newValue) => { 파일업로드 - -
+
- - - -
- {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb) -
-
- -
+ > +
+ {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
- +
+ +
+
- - 규격 - - -
-
- - - - - - - - - - - - - - - - - - - - - -
순번품명규격수량단위단가금액
{{ index + 1 }}{{ dtl.itemNm }}{{ dtl.spec }}{{ dtl.qty }}{{ dtl.unit }} - - {{ totPrc[index] || 0 }}
-
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
순번품명규격수량단위단가금액
{{ index + 1 }}{{ dtl.itemNm }}{{ dtl.spec }}{{ dtl.qty }}{{ dtl.unit }} + + {{ totPrc[index] || 0 }}
- +
diff --git a/src/components/pages/contract/ContractView.vue b/src/components/pages/contract/ContractView.vue index 80a8970..167e72d 100644 --- a/src/components/pages/contract/ContractView.vue +++ b/src/components/pages/contract/ContractView.vue @@ -197,68 +197,56 @@ watch(pbAtts.value, (newValue) => {
첨부파일 - -
+
-
- {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb) -
-
- -
+
+ {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
- +
+ +
+
-
-
- -
-

상세 규격

- - 규격 - - -
-
- - - - - - - - - - - - - - - - - - - - - -
순번품명규격수량단위단가금액
{{ index + 1 }}{{ dtl.itemNm }}{{ dtl.spec }}{{ dtl.qty }}{{ dtl.unit }}0{{ totPrc[index] || 0 }}
-
+
+
+ + + + + + + + + + + + + + + + + + + + + +
순번품명규격수량단위단가금액
{{ index + 1 }}{{ dtl.itemNm }}{{ dtl.spec }}{{ dtl.qty }}{{ dtl.unit }}0{{ totPrc[index] || 0 }}
- +
diff --git a/src/components/pages/dashboards/Dashboard.vue b/src/components/pages/dashboards/Dashboard.vue index 5d8371e..111793a 100644 --- a/src/components/pages/dashboards/Dashboard.vue +++ b/src/components/pages/dashboards/Dashboard.vue @@ -21,7 +21,7 @@ onMounted(() => {
diff --git a/src/components/pages/estimate/EstimateUpdate.vue b/src/components/pages/estimate/EstimateUpdate.vue index 055c568..5666b29 100644 --- a/src/components/pages/estimate/EstimateUpdate.vue +++ b/src/components/pages/estimate/EstimateUpdate.vue @@ -224,28 +224,21 @@ watch(pbAtts.value, (newValue) => {
첨부파일 - -
-
- {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb) -
-
- -
+
+
+ {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
- +
+ +
+
-
-
- -
-

상세 규격

@@ -264,63 +257,56 @@ watch(pbAtts.value, (newValue) => { 파일업로드 - -
-
- {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb) -
-
- - -
+
+
+ {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
- +
+ + +
+
- - 규격 - - -
-
- - - - - - - - - - - - - - - - - - - - - -
순번품명규격수량단위단가금액
{{ index + 1 }}{{ dtl.itemNm }}{{ dtl.spec }}{{ dtl.qty }}{{ dtl.unit }} - - {{ totPrc[index] || 0 }}
-
+
+
+ + + + + + + + + + + + + + + + + + + + + +
순번품명규격수량단위단가금액
{{ index + 1 }}{{ dtl.itemNm }}{{ dtl.spec }}{{ dtl.qty }}{{ dtl.unit }} + + {{ totPrc[index] || 0 }}
- +
diff --git a/src/components/pages/estimate/EstimateView.vue b/src/components/pages/estimate/EstimateView.vue index 285c6d6..bf2f286 100644 --- a/src/components/pages/estimate/EstimateView.vue +++ b/src/components/pages/estimate/EstimateView.vue @@ -179,28 +179,21 @@ const totPrc = computed(() => {
첨부파일 - -
-
- {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb) -
-
- -
+
+
+ {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
- +
+ +
+
-
-
- -
-

상세 규격

@@ -210,55 +203,48 @@ const totPrc = computed(() => { 견적서 - -
-
- {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb) -
-
- -
+
+
+ {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
- +
+ +
+
- - 규격 - - -
-
- - - - - - - - - - - - - - - - - - - - - -
순번품명규격수량단위단가금액
{{ index + 1 }}{{ dtl.itemNm }}{{ dtl.spec }}{{ dtl.qty }}{{ dtl.unit }}{{ String(estimates[index].unitPrc).replace(regex.currency, ',') }}{{ String(totPrc[index]).replace(regex.currency, ',') || 0 }}
-
+
+
+ + + + + + + + + + + + + + + + + + + + + +
순번품명규격수량단위단가금액
{{ index + 1 }}{{ dtl.itemNm }}{{ dtl.spec }}{{ dtl.qty }}{{ dtl.unit }}{{ String(estimates[index].unitPrc).replace(regex.currency, ',') }}{{ String(totPrc[index]).replace(regex.currency, ',') || 0 }}
- +
diff --git a/src/components/partials/layout/toolbar/ToolbarUserProfile.vue b/src/components/partials/layout/toolbar/ToolbarUserProfile.vue index ca203b3..3073d4d 100644 --- a/src/components/partials/layout/toolbar/ToolbarUserProfile.vue +++ b/src/components/partials/layout/toolbar/ToolbarUserProfile.vue @@ -109,7 +109,7 @@ function onRePassword() {
-
{{ biz.compNm }}
+
{{ biz.compNm }}
@@ -117,7 +117,7 @@ function onRePassword() {
@@ -917,8 +917,8 @@ function onRePassword() { } .company-nm { - padding-left: 20px; - line-height:42px; + padding-left: 30px; + line-height: 35px; font-weight: 600; color: var(--modal-text) } diff --git a/src/scss/components/_custom-contract.scss b/src/scss/components/_custom-contract.scss index 30745cf..9040c10 100644 --- a/src/scss/components/_custom-contract.scss +++ b/src/scss/components/_custom-contract.scss @@ -45,8 +45,10 @@ input { .datatable-wrapper { margin-top: 10px !important; + padding: 0 10px 10px 10px; } + .datatable-table { th { padding: 10px !important; @@ -66,6 +68,17 @@ input { } } +.dtl-spec-table { + thead{ + background-color: var(--light-grey) !important; + th { + color: #000; + border: 1px solid #ccc; + } + } + +} + ul { list-style-type: none; } @@ -127,16 +140,15 @@ a.mouse-pointer { } } + .estimate-file-wrapper { display:flex; justify-content: space-between; - border:1px solid #ccc; + //border:1px solid #ccc; + background-color: #ededed; border-radius:5px; - padding:0px 20px; - margin-bottom:10px; - &:first-child { - margin-top: 5px; - } + padding:0 20px; + margin: 10px; .estimate-file-download, .estimate-file-delete { font-size: 17px; line-height: 40px; @@ -150,6 +162,7 @@ a.mouse-pointer { .estimate-file-name { width: 400px; line-height: 40px; + color: var(--modal-text-reverse) } .estimate-file-size { width: 150px; diff --git a/src/scss/css-variables/_colors.scss b/src/scss/css-variables/_colors.scss index 665ce4a..03e77bd 100644 --- a/src/scss/css-variables/_colors.scss +++ b/src/scss/css-variables/_colors.scss @@ -15,6 +15,8 @@ --primary--dark-color: color-mix(in oklab, var(--primary), black 5%); --primary--light-color: color-mix(in oklab, var(--primary), white 90%); + --primary-active: #dc5638; + --link: #485fc7; --link--color-invert: color-mix(in oklab, var(--link), white 85%); --link--dark-color: color-mix(in oklab, var(--link), black 5%); diff --git a/src/scss/css-variables/_fonts.scss b/src/scss/css-variables/_fonts.scss index e762d09..7ee6a97 100644 --- a/src/scss/css-variables/_fonts.scss +++ b/src/scss/css-variables/_fonts.scss @@ -3,6 +3,6 @@ :root { --font: 'Noto Sans KR', sans-serif; --font-alt: 'Noto Sans KR', sans-serif; - --font-monospace: 'Fira Code Variable', monospace; + --font-monospace: 'Noto Sans KR', monospace; --font-size: 14px; } diff --git a/src/scss/layout/_layout.scss b/src/scss/layout/_layout.scss index 9b34218..78ead07 100644 --- a/src/scss/layout/_layout.scss +++ b/src/scss/layout/_layout.scss @@ -15,6 +15,7 @@ body { background: var(--background-grey); + font-family: var(--font); &.opened { background: var(--white); @@ -231,10 +232,10 @@ body { display: flex; justify-content: center; align-items: center; - height: 34px; - width: 34px; + height: 37px; + width: 37px; border-radius: var(--radius-rounded); - margin: 0 4px; + margin: 0 27px; transition: all 0.3s; // transition-all test &:hover {