From a50ee0835585574c05f6164890e98d1d0bbd106c Mon Sep 17 00:00:00 2001 From: bangae1 Date: Wed, 28 May 2025 19:41:40 +0900 Subject: [PATCH] =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EA=B8=88?= =?UTF-8?q?=EC=95=A1=20,=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - src/components/layouts/navbar/Navbar.vue | 8 +++ src/components/pages/contract/Contract.vue | 7 +++ .../pages/contract/ContractSave.vue | 27 ++++---- .../pages/contract/ContractView.vue | 63 +++++-------------- src/components/pages/estimate/Estimate.vue | 7 +++ .../pages/estimate/EstimateList.vue | 6 -- .../pages/estimate/EstimateUpdate.vue | 61 +++++------------- .../pages/estimate/EstimateView.vue | 56 ++++------------- .../layout/toolbar/ToolbarUserProfile.vue | 8 +-- src/pages/auth/login.vue | 14 +---- src/pages/auth/signup.vue | 12 +--- src/scss/components/_custom-contract.scss | 3 +- src/utils/rules.ts | 22 +++++++ types/imports.d.ts | 1 + vite.config.ts | 2 - 16 files changed, 108 insertions(+), 190 deletions(-) create mode 100644 src/utils/rules.ts diff --git a/package.json b/package.json index a56c787..3f69738 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,6 @@ "unplugin-vue-router": "0.8.6", "uuid": "^11.1.0", "v-calendar": "3.0.3", - "vee-validate": "4.12.6", "vivus": "0.4.6", "vue": "3.4.26", "vue-accessible-color-picker": "5.0.1", diff --git a/src/components/layouts/navbar/Navbar.vue b/src/components/layouts/navbar/Navbar.vue index cdf352a..1a75321 100644 --- a/src/components/layouts/navbar/Navbar.vue +++ b/src/components/layouts/navbar/Navbar.vue @@ -644,4 +644,12 @@ a { background-color:white !important; } } + +.toolbar { + a { + &:hover { + background-color:transparent !important; + } + } +} diff --git a/src/components/pages/contract/Contract.vue b/src/components/pages/contract/Contract.vue index f0774ba..c04e952 100644 --- a/src/components/pages/contract/Contract.vue +++ b/src/components/pages/contract/Contract.vue @@ -73,6 +73,7 @@ const onEstimateSave = () => { } const setData = (data: iEstimate[]) => { + console.log(data) estimates.value = data } const setAttData = (data: iPbAtt[]) => { @@ -154,5 +155,11 @@ watch(params, (newValue) => { diff --git a/src/components/pages/contract/ContractSave.vue b/src/components/pages/contract/ContractSave.vue index 006b454..151a44d 100644 --- a/src/components/pages/contract/ContractSave.vue +++ b/src/components/pages/contract/ContractSave.vue @@ -1,5 +1,6 @@