

230802 김성훈 달력 금일기준 한달 전으로 기본값 설정
@76b78fe190e711ae590ffd24f686aae5e2d16bb5
--- client/resources/js/commonUtil.ts
+++ client/resources/js/commonUtil.ts
... | ... | @@ -11,6 +11,24 @@ |
11 | 11 |
var _utils = { |
12 | 12 |
|
13 | 13 |
/** |
14 |
+ * 오늘 년-월-일 구하기 |
|
15 |
+ */ |
|
16 |
+ today: function() { |
|
17 |
+ let date = new Date(); |
|
18 |
+ let today = new Date(date.getTime() - (date.getTimezoneOffset() * 60000)).toISOString().substring(0, 10); |
|
19 |
+ return today; |
|
20 |
+ }, |
|
21 |
+ |
|
22 |
+ /** |
|
23 |
+ * 한달전 년-월-일 구하기 |
|
24 |
+ */ |
|
25 |
+ oneMonthAgo: function() { |
|
26 |
+ let date = new Date(); |
|
27 |
+ let oneMonthAgo = new Date(date.setMonth(date.getMonth() - 1) - (date.getTimezoneOffset() * 60000)).toISOString().substring(0, 10); |
|
28 |
+ return oneMonthAgo; |
|
29 |
+ }, |
|
30 |
+ |
|
31 |
+ /** |
|
14 | 32 |
* null값 '-' 으로 치환 |
15 | 33 |
*/ |
16 | 34 |
nullHyphen: function(data : any) { |
... | ... | @@ -26,7 +44,7 @@ |
26 | 44 |
*/ |
27 | 45 |
dateHyphen: function(data : any) { |
28 | 46 |
if(data === null || data === "") return "-"; |
29 |
- var formatDate = ''; |
|
47 |
+ let formatDate = ''; |
|
30 | 48 |
// 공백제거 |
31 | 49 |
data = data.replace(/\s/gi, ""); |
32 | 50 |
if(data.length == 8) { |
... | ... | @@ -45,7 +63,7 @@ |
45 | 63 |
if(data === null || data === "") { |
46 | 64 |
return "-"; |
47 | 65 |
} else { |
48 |
- var date = data.substr(0,10); |
|
66 |
+ let date = data.substr(0,10); |
|
49 | 67 |
return date; |
50 | 68 |
} |
51 | 69 |
}, |
... | ... | @@ -123,7 +141,7 @@ |
123 | 141 |
if(!phoneNumber) return phoneNumber |
124 | 142 |
phoneNumber = phoneNumber.replace(/[^0-9]/g, '') |
125 | 143 |
|
126 |
- var res = '' |
|
144 |
+ let res = '' |
|
127 | 145 |
if(phoneNumber.length < 3) { |
128 | 146 |
res = phoneNumber |
129 | 147 |
} |
... | ... | @@ -173,7 +191,7 @@ |
173 | 191 |
* 휴대폰 번호 정규식 |
174 | 192 |
*/ |
175 | 193 |
checkPhone: function(data : any) { |
176 |
- var regExp = /^01([0|1|6|7|8|9]?)-?([0-9]{3,4})-?([0-9]{4})$/; |
|
194 |
+ let regExp = /^01([0|1|6|7|8|9]?)-?([0-9]{3,4})-?([0-9]{4})$/; |
|
177 | 195 |
if (regExp.test(data) === true) return true; |
178 | 196 |
return false; |
179 | 197 |
}, |
... | ... | @@ -183,7 +201,7 @@ |
183 | 201 |
*/ |
184 | 202 |
checkEmail: function (data : any) { |
185 | 203 |
// 이메일 형식 검사 |
186 |
- var validateEmail = /^[A-Za-z0-9_\\.\\-]+@[A-Za-z0-9\\-]+\.[A-Za-z0-9\\-\\.]+$/; |
|
204 |
+ let validateEmail = /^[A-Za-z0-9_\\.\\-]+@[A-Za-z0-9\\-]+\.[A-Za-z0-9\\-\\.]+$/; |
|
187 | 205 |
if (validateEmail.test(data) === true) return true; |
188 | 206 |
return false; |
189 | 207 |
}, |
--- client/views/layout/Header.vue
+++ client/views/layout/Header.vue
... | ... | @@ -71,7 +71,6 @@ |
71 | 71 |
<li |
72 | 72 |
v-for="option in dropdownOptions" |
73 | 73 |
:key="option.value" |
74 |
- @click="navigateToPage(option)" |
|
75 | 74 |
> |
76 | 75 |
<router-link :to="option.route">{{ option.label }}</router-link> |
77 | 76 |
</li> |
... | ... | @@ -80,7 +79,6 @@ |
80 | 79 |
<li |
81 | 80 |
v-for="option in dropdownOptions2" |
82 | 81 |
:key="option.value" |
83 |
- @click="navigateToPage(option)" |
|
84 | 82 |
> |
85 | 83 |
<router-link :to="option.route">{{ option.label }}</router-link> |
86 | 84 |
</li> |
... | ... | @@ -89,7 +87,6 @@ |
89 | 87 |
<li |
90 | 88 |
v-for="option in dropdownOptions5" |
91 | 89 |
:key="option.value" |
92 |
- @click="navigateToPage(option)" |
|
93 | 90 |
> |
94 | 91 |
<router-link :to="option.route">{{ option.label }}</router-link> |
95 | 92 |
</li> |
... | ... | @@ -98,7 +95,6 @@ |
98 | 95 |
<li |
99 | 96 |
v-for="option in dropdownOptions3" |
100 | 97 |
:key="option.value" |
101 |
- @click="navigateToPage(option)" |
|
102 | 98 |
> |
103 | 99 |
<router-link :to="option.route">{{ option.label }}</router-link> |
104 | 100 |
</li> |
--- client/views/pages/CrosswalkManagement/CrosswalkSearch.vue
+++ client/views/pages/CrosswalkManagement/CrosswalkSearch.vue
... | ... | @@ -1362,11 +1362,9 @@ |
1362 | 1362 |
console.log("Main2 mounted"); |
1363 | 1363 |
this.$refs.open_layers.setBaseMap(vworldBaseLayer); |
1364 | 1364 |
if(this.$route.query.route === 'Y') { |
1365 |
- console.log("라우트ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ") |
|
1366 | 1365 |
this.$refs.open_layers.addVectorLayerAutoSizeByUrl('/common/getCrslksGeoJson.json', 'crslkLayer', 'EPSG:5181', baseStyles['labelStyle'], 'label', this.$route.query.dong_cd, this.$route.query.node_id); |
1367 | 1366 |
// this.$refs.open_layers.addVectorLayerRemoveAutoSizAddChildNodeCnteByUrl("/common/getDongsCenterAndChildNodeCntJson.json","nodeLayer", "EPSG:5181", baseStyles["labelStyle"], "label", this.$route.query.dong_cd, this.$route.query.node_id); |
1368 | 1367 |
} else { |
1369 |
- console.log("노______________라우트ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ") |
|
1370 | 1368 |
this.$refs.open_layers.addVectorLayerByUrl( "/common/getDongsGeoJson.json","multiPolygonLayer", "EPSG:5181", baseStyles["MultiPolygon"], "MultiPolygon", this.address.dong_cd); |
1371 | 1369 |
this.$refs.open_layers.addVectorLayerRemoveAutoSizAddChildNodeCnteByUrl("/common/getDongsCenterAndChildNodeCntJson.json","nodeLayer", "EPSG:5181", baseStyles["labelStyle"], "label", this.address.dong_cd); |
1372 | 1370 |
} |
--- client/views/pages/SystemManagement/AccessRecord.vue
+++ client/views/pages/SystemManagement/AccessRecord.vue
... | ... | @@ -184,6 +184,10 @@ |
184 | 184 |
components: { |
185 | 185 |
PaginationButton: PaginationButton, |
186 | 186 |
}, |
187 |
+ created() { |
|
188 |
+ this.userAccessListSearch.endDate = COMMON_UTIL.today(); |
|
189 |
+ this.userAccessListSearch.startDate = COMMON_UTIL.oneMonthAgo(); |
|
190 |
+ }, |
|
187 | 191 |
mounted() { |
188 | 192 |
console.log("AccessRecord mounted"); |
189 | 193 |
this.userAccessSelectList(); |
--- client/views/pages/SystemManagement/ChargeManagement.vue
+++ client/views/pages/SystemManagement/ChargeManagement.vue
... | ... | @@ -544,6 +544,10 @@ |
544 | 544 |
components: { |
545 | 545 |
PaginationButton: PaginationButton, |
546 | 546 |
}, |
547 |
+ created() { |
|
548 |
+ this.managerListSearch.endDate = COMMON_UTIL.today(); |
|
549 |
+ this.managerListSearch.startDate = COMMON_UTIL.oneMonthAgo(); |
|
550 |
+ }, |
|
547 | 551 |
mounted() { |
548 | 552 |
console.log("Main4 mounted"); |
549 | 553 |
this.managerSelectList(); |
--- client/views/pages/SystemManagement/DataRecord.vue
+++ client/views/pages/SystemManagement/DataRecord.vue
... | ... | @@ -40,22 +40,14 @@ |
40 | 40 |
<tr> |
41 | 41 |
<th>검색 일자</th> |
42 | 42 |
<td colspan="3"> |
43 |
- <input type="date" value-format="yyyyMMdd" /> |
|
43 |
+ <input type="date" value-format="yyyyMMdd" v-model="dataLogListSearch.startDate"/> |
|
44 | 44 |
<span style="margin: 0px 2%;"> ~ </span> |
45 |
- <input type="date" value-format="yyyyMMdd" /> |
|
45 |
+ <input type="date" value-format="yyyyMMdd" v-model="dataLogListSearch.endDate"/> |
|
46 | 46 |
</td> |
47 | 47 |
<th>행정동</th> |
48 | 48 |
<td colspan="3"> |
49 |
- <select name="" id="" style="width: 20%;"> |
|
50 |
- <option value="">대구광역시</option> |
|
51 |
- </select> |
|
52 |
- <select name="" id="" style="width: 20%;"> |
|
53 |
- <option value="">서구</option> |
|
54 |
- </select> |
|
55 |
- <select name="" id="" style="width: 20%;"> |
|
56 |
- <option value="">전체</option> |
|
57 |
- </select> |
|
58 |
- <button type="button" class="green-btn" style="margin-left: 5px;padding: 5px;width: 10rem; float: right;">검색</button> |
|
49 |
+ <dongSelectList @setDongCd="setDongCd"></dongSelectList> |
|
50 |
+ <button type="button" class="green-btn" style="margin-left: 5px;padding: 5px;width: 10rem; float: right;" @click="dataLogSelectList">검색</button> |
|
59 | 51 |
</td> |
60 | 52 |
</tr> |
61 | 53 |
</tbody> |
... | ... | @@ -159,7 +151,7 @@ |
159 | 151 |
<script> |
160 | 152 |
import axios from "axios"; |
161 | 153 |
import PaginationButton from "../../component/pagination/PaginationButton.vue"; |
162 |
-import dongSelectList from '../../component/dongSelectList.vue'; |
|
154 |
+import dongSelectList from '../../component/dongSelectListSimple.vue'; |
|
163 | 155 |
import COMMON_UTIL from "../../../resources/js/commonUtil.ts"; |
164 | 156 |
|
165 | 157 |
export default { |
... | ... | @@ -168,9 +160,10 @@ |
168 | 160 |
dataLogListSearch: { |
169 | 161 |
currentPage: 1, |
170 | 162 |
perPage: 10, |
171 |
- // startDate: null, |
|
172 |
- // endDate: null, |
|
173 |
- // searchDongCode: null, |
|
163 |
+ startDate: null, |
|
164 |
+ endDate: null, |
|
165 |
+ dong_cd: null, |
|
166 |
+ crslk_az: null |
|
174 | 167 |
}, |
175 | 168 |
|
176 | 169 |
dataLogListCount: 0, |
... | ... | @@ -183,30 +176,32 @@ |
183 | 176 |
methods: { |
184 | 177 |
dataLogSelectList: function() { |
185 | 178 |
const vm = this; |
179 |
+ vm.dataLogListSearch.dong_cd = vm.address.dong_cd; |
|
180 |
+ vm.dataLogListSearch.crslk_az = vm.address.crslk_az; |
|
186 | 181 |
|
187 |
- axios({ |
|
188 |
- url: "/dataLog/dataLogSelectList.json", |
|
189 |
- method: "post", |
|
190 |
- headers: { |
|
191 |
- "Content-Type": "application/json; charset=UTF-8", |
|
192 |
- }, |
|
193 |
- data: vm.dataLogListSearch, |
|
182 |
+ axios({ |
|
183 |
+ url: "/dataLog/dataLogSelectList.json", |
|
184 |
+ method: "post", |
|
185 |
+ headers: { |
|
186 |
+ "Content-Type": "application/json; charset=UTF-8", |
|
187 |
+ }, |
|
188 |
+ data: vm.dataLogListSearch, |
|
189 |
+ }) |
|
190 |
+ .then(function(response) { |
|
191 |
+ console.log("dataLogSelectList - response : ", response.data); |
|
192 |
+ vm.dataLogListCount = response.data.dataLogListCount; |
|
193 |
+ vm.dataLogList = response.data.dataLogList; |
|
194 |
+ vm.dataLogIdx = response.data.dataLogListCount - (vm.dataLogListSearch.currentPage - 1) * response.data.dataLogList.length; |
|
194 | 195 |
}) |
195 |
- .then(function(response) { |
|
196 |
- console.log("dataLogSelectList - response : ", response.data); |
|
197 |
- vm.dataLogListCount = response.data.dataLogListCount; |
|
198 |
- vm.dataLogList = response.data.dataLogList; |
|
199 |
- vm.dataLogIdx = response.data.dataLogListCount - (vm.dataLogListSearch.currentPage - 1) * response.data.dataLogList.length; |
|
200 |
- }) |
|
201 |
- .catch(function(error) { |
|
202 |
- console.log("errorSelectList - error : ", error); |
|
203 |
- alert("장애발생 목록 조회 오류, 관리자에게 문의해주세요."); |
|
204 |
- }); |
|
196 |
+ .catch(function(error) { |
|
197 |
+ console.log("errorSelectList - error : ", error); |
|
198 |
+ alert("장애발생 목록 조회 오류, 관리자에게 문의해주세요."); |
|
199 |
+ }); |
|
205 | 200 |
}, |
206 | 201 |
|
207 |
- //날짜에 '-' 넣기 |
|
208 |
- yyyymmdd(date) { |
|
209 |
- return COMMON_UTIL.yyyymmdd(date); |
|
202 |
+ setDongCd(value) { |
|
203 |
+ console.log("value : ", value); |
|
204 |
+ this.address = value; |
|
210 | 205 |
}, |
211 | 206 |
}, |
212 | 207 |
watch: {}, |
... | ... | @@ -215,6 +210,10 @@ |
215 | 210 |
PaginationButton: PaginationButton, |
216 | 211 |
dongSelectList: dongSelectList |
217 | 212 |
}, |
213 |
+ created() { |
|
214 |
+ this.dataLogListSearch.endDate = COMMON_UTIL.today(); |
|
215 |
+ this.dataLogListSearch.startDate = COMMON_UTIL.oneMonthAgo(); |
|
216 |
+ }, |
|
218 | 217 |
mounted() { |
219 | 218 |
console.log("Main4 mounted"); |
220 | 219 |
this.dataLogSelectList(); |
--- client/views/pages/SystemManagement/NodeManagement.vue
+++ client/views/pages/SystemManagement/NodeManagement.vue
... | ... | @@ -441,12 +441,12 @@ |
441 | 441 |
await vm.$nextTick(); |
442 | 442 |
//수정 전 좌표 modal에서 보여주기 |
443 | 443 |
if (!vm.createMode) { |
444 |
+ console.log("위도경도 넣기!!!!!!!") |
|
444 | 445 |
vm.map_lat = vm.node.lat; |
445 | 446 |
vm.map_lon = vm.node.lon; |
446 | 447 |
} |
447 | 448 |
//기본맵 세팅 |
448 | 449 |
vm.$refs.open_layers.setBaseMap(vworldBaseLayer); |
449 |
- console.log("맵열기!!!!!!!!!!") |
|
450 | 450 |
//노드위치로 이동 |
451 | 451 |
if(!vm.createMode){ |
452 | 452 |
vm.$refs.open_layers.addVectorLayerByUrl('/common/getDongsGeoJson.json','nodeMap','EPSG:5181', baseStyles['MultiPolygon'],'MultiPolygon',vm.node.dong_cd); |
--- client/views/pages/SystemManagement/UserManagement.vue
+++ client/views/pages/SystemManagement/UserManagement.vue
... | ... | @@ -26,7 +26,7 @@ |
26 | 26 |
<td colspan="3"> |
27 | 27 |
<input type="date" value-format="yyyyMMdd" v-model="userListSearch.startDate" /> |
28 | 28 |
<span style="margin: 0px 5px;"> ~ </span> |
29 |
- <input type="date" value-format="yyyyMMdd" v-model="userListSearch.endDate" /> |
|
29 |
+ <input type="date" value-format="yyyyMMdd" v-model="userListSearch.endDate" /> |
|
30 | 30 |
</td> |
31 | 31 |
<th>사용자 권한</th> |
32 | 32 |
<td colspan="3"> |
... | ... | @@ -421,6 +421,9 @@ |
421 | 421 |
user_telno: null, |
422 | 422 |
user_eml: null, |
423 | 423 |
user_author: null, |
424 |
+ user_sido_cd: null, |
|
425 |
+ user_sigungu_cd: null, |
|
426 |
+ user_dong_cd: null, |
|
424 | 427 |
dong_cd: null, |
425 | 428 |
rm: null |
426 | 429 |
}, |
... | ... | @@ -501,6 +504,7 @@ |
501 | 504 |
|
502 | 505 |
//사용자 상세조회 페이지 이동 |
503 | 506 |
userSelectOnePage: function(user) { |
507 |
+ |
|
504 | 508 |
console.log(user); |
505 | 509 |
this.selectUser = Object.assign({}, user); |
506 | 510 |
let data = Object.assign({}, user); |
... | ... | @@ -511,6 +515,21 @@ |
511 | 515 |
var email = data.user_eml.split('@'); |
512 | 516 |
this.email_id = email[0]; |
513 | 517 |
this.email_domain = email[1]; |
518 |
+ |
|
519 |
+ if(data.dong_cd.length === 2) { |
|
520 |
+ this.selectUser.siDo_dong_cd = data.dong_cd |
|
521 |
+ } |
|
522 |
+ |
|
523 |
+ else if(data.dong_cd.length === 5) { |
|
524 |
+ this.selectUser.user_sido_cd = data.dong_cd.substring(0,2); |
|
525 |
+ this.selectUser.user_sigungu_cd = data.dong_cd.substring(0,5); |
|
526 |
+ } |
|
527 |
+ |
|
528 |
+ else { |
|
529 |
+ this.selectUser.user_sido_cd = data.dong_cd.substring(0,2); |
|
530 |
+ this.selectUser.user_sigungu_cd = data.dong_cd.substring(0,5); |
|
531 |
+ this.selectUser.user_dong_cd = data.dong_cd; |
|
532 |
+ } |
|
514 | 533 |
this.modal_update = true; |
515 | 534 |
// this.$router.push({ path: '/UserModifyForm.page', query: {'user_id':user.user_id}}); |
516 | 535 |
}, |
... | ... | @@ -802,6 +821,8 @@ |
802 | 821 |
this.address = value; |
803 | 822 |
}, |
804 | 823 |
|
824 |
+ |
|
825 |
+ |
|
805 | 826 |
}, |
806 | 827 |
|
807 | 828 |
watch: {}, |
... | ... | @@ -810,6 +831,10 @@ |
810 | 831 |
'PaginationButton':PaginationButton, |
811 | 832 |
dongSelectList: dongSelectList |
812 | 833 |
}, |
834 |
+ created() { |
|
835 |
+ this.userListSearch.endDate = COMMON_UTIL.today(); |
|
836 |
+ this.userListSearch.startDate = COMMON_UTIL.oneMonthAgo(); |
|
837 |
+ }, |
|
813 | 838 |
mounted() { |
814 | 839 |
console.log("UserManageMent Join"); |
815 | 840 |
this.userSelectList(); |
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?