yjryu / KERIS star
kimgkdud898 2023-11-13
231113김하영
@3982334d185b09b1688fad161e03bc325d6d9a50
client/resources/css/Main.css
--- client/resources/css/Main.css
+++ client/resources/css/Main.css
@@ -517,14 +517,6 @@
   font-family: "Pretendard-Regular";
 }
 
-.matchingbox img {
-  /* padding: 2rem; */
-  height: 119px;
-  width: 80%;
-  margin: 0 auto;
-  object-fit: contain;
-}
-
 .matchingbox p:nth-child(3) {
   text-align: left;
   color: #333;
@@ -546,6 +538,18 @@
   box-shadow: 2px 2px 2px #33333332;
   position: relative;
 }
+.matchingbox-img {
+  box-shadow: 2px 2px 2px rgba(51, 51, 51, 0) !important;
+  /* border: 1px solid red; */
+  margin: 0 auto;
+  padding: 0 !important;
+}
+.matchingbox-img img {
+  width: 100% !important;
+  height: 100%;
+  width: 80%;
+  margin: 0 auto;
+}
 
 /* .matchingbox div:nth-child(1):before {
   position: absolute;
client/resources/css/admin.css
--- client/resources/css/admin.css
+++ client/resources/css/admin.css
@@ -19,32 +19,6 @@
   font-family: "Pretendard-Regular";
 }
 
-/* datalnsert */
-
-.insert-table {
-  border-top: 3px solid #ddd;
-  border-bottom: 3px solid #ddd;
-}
-
-textarea {
-  width: 100%;
-  height: 450px;
-}
-
-label {
-  border: 1px solid #535353;
-  color: #535353;
-  background-color: #fff;
-  padding: 10px;
-  border-radius: 3px;
-  margin-right: 10px;
-}
-
-input:checked + label {
-  background: #535353;
-  color: #fff;
-}
-
 /* dataselectone */
 .insert-table {
   border-top: 2px solid #007aff;
@@ -61,20 +35,23 @@
   margin-right: 5px;
 }
 /* dataUpdate */
-.insert-table {
+.dataUpdate .insert-table,
+.dataInsert .insert-table {
   border-top: 3px solid #ddd;
   border-bottom: 3px solid #ddd;
 }
 
-textarea {
+.dataUpdate textarea,
+.dataInsert textarea {
   width: 100%;
   height: 450px;
 }
-.file-list {
+.dataUpdate .file-list {
   padding: 5px 0;
 }
 
-label {
+.dataUpdate label,
+.dataInsert label {
   border: 1px solid #535353;
   color: #535353;
   background-color: #fff;
@@ -83,7 +60,8 @@
   margin-right: 10px;
 }
 
-input:checked + label {
+.dataUpdate input:checked + label,
+.dataInsert input:checked + label {
   background: #535353;
   color: #fff;
 }
@@ -96,18 +74,18 @@
   border-radius: 30px;
 }
 
-.logo {
+.login-box .logo {
   text-align: center;
   margin-bottom: 50px;
 }
 
-.logo h1 {
+.login-box .logo h1 {
   font-family: "Pretendard-Regular";
   font-weight: bold;
   font-size: 3rem;
 }
 
-.logo p {
+.login-box .logo p {
   font-size: 2rem;
 }
 
client/views/pages/admin/databook/DataInsert.vue
--- client/views/pages/admin/databook/DataInsert.vue
+++ client/views/pages/admin/databook/DataInsert.vue
@@ -7,7 +7,7 @@
                     <h2 class="main-title">자료집</h2>
                 </div>
             </div>
-            <div class="content-wrap">
+            <div class="content-wrap dataInsert">
                 <table class="insert-table">
                     <tbody>
                         <tr>
client/views/pages/admin/databook/DataUpdate.vue
--- client/views/pages/admin/databook/DataUpdate.vue
+++ client/views/pages/admin/databook/DataUpdate.vue
@@ -7,7 +7,7 @@
                     <h2 class="main-title">자료집</h2>
                 </div>
             </div>
-            <div class="content-wrap">
+            <div class="content-wrap dataUpdate">
                 <table class="insert-table">
                     <tbody>
                         <tr>
client/views/pages/user/networking/Matching.vue
--- client/views/pages/user/networking/Matching.vue
+++ client/views/pages/user/networking/Matching.vue
@@ -34,14 +34,22 @@
                         <!-- best 기업 -->
                         <h3>BEST 기업</h3>
                         <div class="matching-box-bos">
-                            <div v-for="(item, idx) in companyTop6List" :key="idx" class="matching-box  matchingbox" @click="companySelectOnePage(item)">
+                            <div v-for="(item, idx) in companyTop6List" :key="idx" class="matching-box  matchingbox"
+                                @click="companySelectOnePage(item)">
                                 <div>
                                     <h3>{{ item.company_nm }}</h3>
-                                    <img :src="'http://localhost:8080'+item.file_path +'\\' + item.file_nm + '.' + item.file_extn_nm" width="20px" alt="">
+                                    <div style="width: 260px ; height: 120px; text-align: center;" class="matchingbox-img">
+
+                                        <img :src="'http://localhost:8080' + item.file_path + '\\' + item.file_nm + '.' + item.file_extn_nm"
+                                            width="100%" alt="">
+                                    </div>
                                     <p>{{ company_info }}</p>
                                     <div class="matchingbox-1">
-                                        <p v-if="!item.pick_yn" @click.stop="pickModal(item)"><i class="fa-regular fa-heart fa-lg" style="color: #3f87f7;"></i> {{ item.company_pick_cnt }} </p>
-                                        <p v-else @click.stop="pickCancelModal(item)"><i class="fa fa-heart fa-lg" style="color: #d41515;"></i> {{ item.company_pick_cnt }} </p>
+                                        <p v-if="!item.pick_yn" @click.stop="pickModal(item)"><i
+                                                class="fa-regular fa-heart fa-lg" style="color: #3f87f7;"></i> {{
+                                                    item.company_pick_cnt }} </p>
+                                        <p v-else @click.stop="pickCancelModal(item)"><i class="fa fa-heart fa-lg"
+                                                style="color: #d41515;"></i> {{ item.company_pick_cnt }} </p>
                                         <p class="matchingbox-text">조회수 <span>{{ item.view_cnt }}</span></p>
                                     </div>
                                     <div class="matching-span">
@@ -60,15 +68,19 @@
             <div class="matching-box-main-two">
                 <div class="w1400">
                     <div class="matching-box-grid-two">
-                        <div class="matching-box-2" v-for="(item, idx) in companyList" :key="idx" @click="companySelectOnePage(item)">
+                        <div class="matching-box-2" v-for="(item, idx) in companyList" :key="idx"
+                            @click="companySelectOnePage(item)">
                             <div>
                                 <h5>{{ item.company_nm }}</h5>
                                 <div class="matching-span">
-                                        <span v-for="(item, idx1) in keywordList[idx]" :key="idx1"> #{{ item }}</span>
+                                    <span v-for="(item, idx1) in keywordList[idx]" :key="idx1"> #{{ item }}</span>
                                 </div>
                                 <div class="matchingbox-2">
-                                    <p v-if="!item.pick_yn" @click.stop="pickModal(item)"><i class="fa-regular fa-heart fa-lg" style="color: #3f87f7;"></i> {{ item.company_pick_cnt }} </p>
-                                    <p v-else @click.stop="pickCancelModal(item)"><i class="fa fa-heart fa-lg" style="color: #d41515;"></i> {{ item.company_pick_cnt }} </p>
+                                    <p v-if="!item.pick_yn" @click.stop="pickModal(item)"><i
+                                            class="fa-regular fa-heart fa-lg" style="color: #3f87f7;"></i> {{
+                                                item.company_pick_cnt }} </p>
+                                    <p v-else @click.stop="pickCancelModal(item)"><i class="fa fa-heart fa-lg"
+                                            style="color: #d41515;"></i> {{ item.company_pick_cnt }} </p>
                                     <p>조회수 <span>{{ item.view_cnt }}</span> </p>
                                 </div>
 
@@ -95,11 +107,11 @@
                 searchText: null,
             },
             userCompanyId: null,
-            bestList:[],
-            companyList:[],
-            keyword:[],
-            keywordList:[],
-            companyTop6List:[],
+            bestList: [],
+            companyList: [],
+            keyword: [],
+            keywordList: [],
+            companyTop6List: [],
             companyListCount: 0,
             companyIdx: 0,
 
@@ -107,9 +119,9 @@
         }
     },
     methods: {
-        companySelectList: function() {
+        companySelectList: function () {
             const vm = this;
-            
+
             axios({
                 url: '/matching/companySelectList.json',
                 method: 'post',
@@ -117,47 +129,47 @@
                     'Content-Type': "application/json; charset=UTF-8",
                 },
                 data: vm.companyListSearch
-            }).then(function(response) {
+            }).then(function (response) {
                 vm.companyList = response.data.companySelectList;
                 vm.companyListCount = response.data.companySelectListCount;
                 vm.companyIdx = vm.companyListCount - (vm.companyListSearch.currentPage - 1) * vm.companyListSearch.perPage;
                 vm.companyTop6List = response.data.companyTop6;
                 vm.userCompanyId = response.data.userCompanyId;
 
-                 for( let i = 0; i < vm.companyList.length; i++) {
-                    vm.keyword = vm.companyList[i].keyword.split('#',4);
+                for (let i = 0; i < vm.companyList.length; i++) {
+                    vm.keyword = vm.companyList[i].keyword.split('#', 4);
                     vm.keyword.splice(0, 1)
                     vm.keywordList[i] = vm.keyword
                     console.log("keyword", vm.keywordList);
                 }
-                
-            }).catch(function(error) {
+
+            }).catch(function (error) {
                 console.log('error - ', error)
                 alert('기업 목록 조회 오류, 관리자에게 문의하세요.');
             })
         },
 
-        pickModal: function(item) {
-        
-            if(this.userCompanyId != item.company_id) {
-                if(confirm(item.company_nm + "에게 PICK 신청을 하시겠습니까?")) {
-                this.pick(item)
+        pickModal: function (item) {
+
+            if (this.userCompanyId != item.company_id) {
+                if (confirm(item.company_nm + "에게 PICK 신청을 하시겠습니까?")) {
+                    this.pick(item)
                 }
             } else {
                 alert("자신의 기업에는 PICK을 할 수 없습니다.")
             }
-            
+
         },
 
-        pickCancelModal: function(item) {
-            if(confirm(item.company_nm + "에게 신청한 PICK을 취소 하시겠습니까?")) {
+        pickCancelModal: function (item) {
+            if (confirm(item.company_nm + "에게 신청한 PICK을 취소 하시겠습니까?")) {
                 this.pickCancel(item)
             }
         },
 
-        pick: function(item) {
+        pick: function (item) {
             const vm = this;
-            
+
             axios({
                 url: '/matching/pick.json',
                 method: 'post',
@@ -165,16 +177,16 @@
                     'Content-Type': "application/json; charset=UTF-8",
                 },
                 data: item
-            }).then(function(response) {
+            }).then(function (response) {
                 alert(response.data);
                 vm.companySelectList();
-            }).catch(function(error) {
+            }).catch(function (error) {
                 console.log('error - ', error)
                 alert(' PICK 오류, 관리자에게 문의하세요.');
             })
         },
 
-        pickCancel: function(item) {
+        pickCancel: function (item) {
             const vm = this;
 
             axios({
@@ -184,18 +196,18 @@
                     'Content-Type': "application/json; charset=UTF-8",
                 },
                 data: item
-            }).then(function(response) {
-               alert(response.data);
-               vm.companySelectList();
-            }).catch(function(error) {
+            }).then(function (response) {
+                alert(response.data);
+                vm.companySelectList();
+            }).catch(function (error) {
                 console.log('error - ', error)
                 alert('PICK 취소 오류, 관리자에게 문의하세요.');
             })
         },
 
-        companySelectOnePage: function(item) {
+        companySelectOnePage: function (item) {
             const vm = this;
-            
+
             axios({
                 url: '/matching/companyViewCountAdd.json',
                 method: 'post',
@@ -204,7 +216,7 @@
                 },
                 data: { 'company_id': item.company_id }
             }).then(function (response) {
-                vm.$router.push({ path: '/MatchingOne.page', query: {'company_id': item.company_id}});
+                vm.$router.push({ path: '/MatchingOne.page', query: { 'company_id': item.company_id } });
             }).catch(function (error) {
                 console.log("기업 상세조회 오류, 관리자에게 문의하세요.");
             })
Add a comment
List