
--- client/views/pages/admin/login/Login.vue
+++ client/views/pages/admin/login/Login.vue
... | ... | @@ -41,6 +41,7 @@ |
41 | 41 |
methods: { |
42 | 42 |
//로그인 |
43 | 43 |
login: function () { |
44 |
+ let vm = this; |
|
44 | 45 |
var iv = this.store.state.key.iv; |
45 | 46 |
var salt = this.store.state.key.salt; |
46 | 47 |
var passPhrase = this.store.state.key.ENC_KEY; |
... | ... | @@ -49,9 +50,15 @@ |
49 | 50 |
var key128Bits100Iterations = crypto.PBKDF2(passPhrase, crypto.enc.Hex.parse(salt), { keySize: keySize / 32, iterations: iterationCount }); |
50 | 51 |
|
51 | 52 |
// var encrypted = CryptoJS.AES.encrypt( |
52 |
- this.mngrLogin.mngr_id = crypto.AES.encrypt(this.mngrLogin.mngr_id, key128Bits100Iterations, { iv: crypto.enc.Hex.parse(iv) }).toString(); |
|
53 |
- this.mngrLogin.mngr_pw = crypto.AES.encrypt(this.mngrLogin.mngr_pw, key128Bits100Iterations, { iv: crypto.enc.Hex.parse(iv) }).toString(); |
|
54 |
- let vm = this; |
|
53 |
+ // this.mngrLogin.mngr_id = crypto.AES.encrypt(this.mngrLogin.mngr_id, key128Bits100Iterations, { iv: crypto.enc.Hex.parse(iv) }).toString(); |
|
54 |
+ // this.mngrLogin.mngr_pw = crypto.AES.encrypt(this.mngrLogin.mngr_pw, key128Bits100Iterations, { iv: crypto.enc.Hex.parse(iv) }).toString(); |
|
55 |
+ let encryptedMngrId = crypto.AES.encrypt(this.mngrLogin.mngr_id, key128Bits100Iterations, { iv: crypto.enc.Hex.parse(iv) }).toString(); |
|
56 |
+ let encryptedMngrPw = crypto.AES.encrypt(this.mngrLogin.mngr_pw, key128Bits100Iterations, { iv: crypto.enc.Hex.parse(iv) }).toString(); |
|
57 |
+ |
|
58 |
+ var loginData = { |
|
59 |
+ mngr_id: encryptedMngrId, |
|
60 |
+ mngr_pw: encryptedMngrPw |
|
61 |
+ }; |
|
55 | 62 |
|
56 | 63 |
axios({ |
57 | 64 |
url: '/managerLogin.json', |
... | ... | @@ -63,7 +70,7 @@ |
63 | 70 |
'Content-Type': 'application/json; charset=UTF-8' |
64 | 71 |
}, |
65 | 72 |
|
66 |
- data: vm.mngrLogin |
|
73 |
+ data: loginData |
|
67 | 74 |
}).then(function (response) { |
68 | 75 |
if (response.data == true) { |
69 | 76 |
vm.$emit("updateIsLogin", true); |
--- client/views/pages/admin/notice/NoticeSelectList.vue
+++ client/views/pages/admin/notice/NoticeSelectList.vue
... | ... | @@ -49,12 +49,18 @@ |
49 | 49 |
<button class="blue-btn" @click="postInsertPage()">글쓰기</button> |
50 | 50 |
</div> |
51 | 51 |
</div> |
52 |
+ <div class="bottom-wrap"> |
|
53 |
+ <PaginationButton v-model:currentPage="postListSearch.currentPage" |
|
54 |
+ :perpage="postListSearch.perPage" :total-count="postListCount" :max-range="5" |
|
55 |
+ :click="postSelectList" /> |
|
56 |
+ </div> |
|
52 | 57 |
</div> |
53 | 58 |
</div> |
54 | 59 |
</template> |
55 | 60 |
<script> |
56 | 61 |
import axios from 'axios'; |
57 | 62 |
import COMMON_UTIL from '../../../../resources/js/commonUtil.js'; |
63 |
+import PaginationButton from '../../../component/pagination/PaginationButton.vue'; |
|
58 | 64 |
|
59 | 65 |
export default { |
60 | 66 |
|
... | ... | @@ -106,7 +112,9 @@ |
106 | 112 |
}, |
107 | 113 |
watch: {}, |
108 | 114 |
computed: {}, |
109 |
- components: {}, |
|
115 |
+ components: { |
|
116 |
+ PaginationButton: PaginationButton, |
|
117 |
+ }, |
|
110 | 118 |
mounted() { |
111 | 119 |
console.log('Notice mounted') |
112 | 120 |
this.postSelectList(); |
--- client/views/pages/user/community/Notice.vue
+++ client/views/pages/user/community/Notice.vue
... | ... | @@ -10,8 +10,8 @@ |
10 | 10 |
<select v-model="postListSearch.searchType" name="data-table-sild" id="data-table-sild"> |
11 | 11 |
<option :value=null selected>전체</option> |
12 | 12 |
<option value="title">제목</option> |
13 |
- <option value="user">작성자</option> |
|
14 |
- <option value="조회순">조회순</option> |
|
13 |
+ <option value="content">내용</option> |
|
14 |
+ <option value="writer">작성자</option> |
|
15 | 15 |
</select> |
16 | 16 |
<div class="input-group"> |
17 | 17 |
<input type="text" class="input" placeholder="검색어를 입력해주세요." v-model="postListSearch.searchText" |
... | ... | @@ -41,6 +41,11 @@ |
41 | 41 |
</table> |
42 | 42 |
</div> |
43 | 43 |
</div> |
44 |
+ <div class="bottom-wrap"> |
|
45 |
+ <PaginationButton v-model:currentPage="postListSearch.currentPage" |
|
46 |
+ :perpage="postListSearch.perPage" :total-count="postListCount" :max-range="5" |
|
47 |
+ :click="postSelectList" /> |
|
48 |
+ </div> |
|
44 | 49 |
</div> |
45 | 50 |
</div> |
46 | 51 |
</div> |
... | ... | @@ -49,7 +54,7 @@ |
49 | 54 |
<script> |
50 | 55 |
import axios from 'axios'; |
51 | 56 |
import COMMON_UTIL from '../../../../resources/js/commonUtil.js'; |
52 |
- |
|
57 |
+import PaginationButton from '../../../component/pagination/PaginationButton.vue'; |
|
53 | 58 |
export default { |
54 | 59 |
data() { |
55 | 60 |
return { |
... | ... | @@ -101,6 +106,9 @@ |
101 | 106 |
computed: { |
102 | 107 |
|
103 | 108 |
}, |
109 |
+ components: { |
|
110 |
+ PaginationButton: PaginationButton, |
|
111 |
+ }, |
|
104 | 112 |
mounted() { |
105 | 113 |
console.log('User Notice mounted') |
106 | 114 |
this.postSelectList(); |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?