yjryu / KERIS star
kimgkdud898 2023-11-20
231120김하영 상단고정 디자인 조회순등록순 추가
@ec1a8887926e365d014abe474f8c3cd72933b33b
client/resources/css/Main.css
--- client/resources/css/Main.css
+++ client/resources/css/Main.css
@@ -897,7 +897,7 @@
 }
 
 .data-btn-wrap {
-  padding: 4rem 0 2rem !important;
+  padding: 4rem 0 0 !important;
 }
 
 .data-b {
@@ -2936,3 +2936,9 @@
   overflow: hidden;
   text-align: left;
 }
+
+/* 게시글 상단고정 css */
+.pen-nib-icon .fa-thumbtack {
+  transform: rotate(-20deg);
+  color: #007aff;
+}
client/views/layout/Header.vue
--- client/views/layout/Header.vue
+++ client/views/layout/Header.vue
@@ -1,10 +1,11 @@
 <template>
     <div class="header">
         <div class="w1400">
-            <!-- <ul class="flex-end ">
+            <ul class="flex-end ">
                 <li class="name" v-if="store.state.loginUser != null">
-                    <p v-if="store.state.loginUser.user_auth === 'company'">{{ store.state.loginUser.company_nm}} <span>님</span></p>
-                    <p v-else>{{ store.state.loginUser.user_id}} <span>님</span></p>
+                    <p v-if="store.state.loginUser.user_auth === 'company'">{{ store.state.loginUser.company_nm }}
+                        <span>님</span></p>
+                    <p v-else>{{ store.state.loginUser.user_id }} <span>님</span></p>
                 </li>
                 <li class="login" v-if="store.state.loginUser === null">
                     <router-link to="/Login.page"><i class="fa-solid fa-user fa-lg" style="color: #ffffff;"></i>
@@ -14,10 +15,10 @@
                     로그아웃
                 </li>
                 <li class="join" v-if="store.state.loginUser === null">
-                    <router-link to="/Join.page"> <i class="fa-solid fa-user-plus fa-lg"
-                            style="color: #ffffff;"></i> 회원가입</router-link>
+                    <router-link to="/Join.page"> <i class="fa-solid fa-user-plus fa-lg" style="color: #ffffff;"></i>
+                        회원가입</router-link>
                 </li>
-            </ul> -->
+            </ul>
             <!-- <Menu class="menu" :isActive="isActive"></Menu> -->
         </div>
     </div>
client/views/layout/Menu.vue
--- client/views/layout/Menu.vue
+++ client/views/layout/Menu.vue
@@ -92,15 +92,15 @@
                         // { text: "협력 기업", link: "" }
                     ]
                 },
-                // {
-                //     text: "마이페이지",
-                //     link: "/Info.page",
-                //     isHovered: false,
-                //     subMenu: [
-                //         { text: "내 정보 수정", link: "/Info.page" },
-                //         { text: "매칭 관리", link: "/MatchingManager.page" }
-                //     ]
-                // }
+                {
+                    text: "마이페이지",
+                    link: "/Info.page",
+                    isHovered: false,
+                    subMenu: [
+                        { text: "내 정보 수정", link: "/Info.page" },
+                        { text: "매칭 관리", link: "/MatchingManager.page" }
+                    ]
+                }
             ]
         };
     },
client/views/pages/user/Data/Data.vue
--- client/views/pages/user/Data/Data.vue
+++ client/views/pages/user/Data/Data.vue
@@ -59,6 +59,12 @@
                                         @click="postSelectList()">
                                 </div>
                             </div>
+                            <div class="sort-wrap" style="grid-column: 1 / span 2;">
+                                <ul class="flex-end">
+                                    <li>최신순</li>
+                                    <li>조회수순</li>
+                                </ul>
+                            </div>
                         </div>
                     </div>
                     <div class="data-table-tr">
@@ -75,7 +81,8 @@
                                 <td v-else-if="item.ctgry_nm === 'research'"><span class="category-zone">연구자료</span></td>
                                 <td v-else><span class="category-zone">가이드라인</span></td>
                                 <td>
-                                    <p class="board-title">{{ item.post_title }}</p>
+                                    <p class="board-title pen-nib-icon"> <i class="fas fa-thumbtack" v-if="idx === 0"></i>{{
+                                        item.post_title }}</p>
                                 </td>
                                 <td>{{ item.rgtr_id }}</td>
                                 <td>{{ yyyymmdd(item.reg_dt) }}</td>
client/views/pages/user/Data/Technology.vue
--- client/views/pages/user/Data/Technology.vue
+++ client/views/pages/user/Data/Technology.vue
@@ -6,6 +6,12 @@
                     <img src="../../../../resources/jpg/tech-logo.png" alt="">
                     <h1>기술문서</h1>
                 </div>
+                <div class="sort-wrap" style="grid-column: 1 / span 2;">
+                    <ul class="flex-end">
+                        <li>최신순</li>
+                        <li>조회수순</li>
+                    </ul>
+                </div>
                 <ul class="tech-bos">
                     <li class="tech-box-sec" v-for="(item, idx) in postList" :key="idx">
                         <div class="tech-box-sec-h3">
@@ -22,9 +28,10 @@
                         </div>
                         <div>
                             <p class="keyword-zone">
-                                <span v-for="(keyword, keywordIndex) in item.tech_doc_keyword.split(',')" :key="keywordIndex">
-                                {{ keyword }}
-                                </span>    
+                                <span v-for="(keyword, keywordIndex) in item.tech_doc_keyword.split(',')"
+                                    :key="keywordIndex">
+                                    {{ keyword }}
+                                </span>
                             </p>
                             <div class="flex">
                                 <p class="date">{{ yyyymmdd(item.reg_dt) }}</p>
@@ -268,16 +275,16 @@
                 },
                 data: { 'post_id': item.post_id, 'bbs_id': item.bbs_id }
             }).then(function (response) {
-                if(response.data > 0 ) {
+                if (response.data > 0) {
                     vm.$router.push({ path: '/TechnologyOne.page', query: { 'post_id': item.post_id, 'file_id': item.file_id, 'bbs_id': item.bbs_id } });
                 } else {
                     alert("기술문서 상세보기 오류")
                 }
-                
+
             }).catch(function (error) {
                 alert("기술문서 상세보기 오류, 관리자에게 문의바랍니다.");
             })
-            
+
         },
 
         postSelectList: function () {
@@ -304,7 +311,7 @@
             return COMMON_UTIL.yyyymmdd(date);
         },
 
-        showAlert: function() {
+        showAlert: function () {
             alert('준비중입니다.')
         },
     },
client/views/pages/user/community/News.vue
--- client/views/pages/user/community/News.vue
+++ client/views/pages/user/community/News.vue
@@ -6,6 +6,12 @@
                     <img src="../../../../resources/jpg/info-logo.png" alt="홍보뉴스 아이콘">
                     <h1>홍보/뉴스</h1>
                 </div>
+                <div class="sort-wrap" style="grid-column: 1 / span 2;">
+                    <ul class="flex-end">
+                        <li>최신순</li>
+                        <li>조회수순</li>
+                    </ul>
+                </div>
                 <ul class="news-bos">
                     <li class="news-bos-box" v-for="(item, idx) in postList" :key="idx" @click="openModal(item)">
                         <div class="modal-img">
client/views/pages/user/community/Notice.vue
--- client/views/pages/user/community/Notice.vue
+++ client/views/pages/user/community/Notice.vue
@@ -20,6 +20,12 @@
                         <input class="button--submit" value="검색" type="submit" @click="postSelectList()">
                     </div>
                 </div>
+                <div class="sort-wrap" style="grid-column: 1 / span 2;">
+                    <ul class="flex-end">
+                        <li>최신순</li>
+                        <li>조회수순</li>
+                    </ul>
+                </div>
                 <div class="noti-sec">
                     <div class="noti-sec-table">
                         <table class="list-table">
@@ -31,7 +37,9 @@
                             <tr v-for="(item, idx) in postList" :key="idx" @click="postSelectOnePage(item)">
                                 <td>{{ postIdx - idx }}</td>
                                 <td>
-                                    <p class="board-title">{{ item.post_title }}</p>
+                                    <p class="board-title pen-nib-icon"> <i class="fas fa-thumbtack" v-if="idx === 0"></i>
+                                        {{ item.post_title
+                                        }}</p>
                                 </td>
                                 <td>{{ item.rgtr_id }}</td>
                                 <td>{{ yyyymmdd(item.reg_dt) }}</td>
Add a comment
List