

230802 김성훈 횡단보도상세조회 -> 상황,에러정보조회로 이동 시 행정동,노드명 출력
@db0d3c5164e19fa9e73ade5628b0e78510c4f971
--- client/views/component/dongSelectListSimple.vue
+++ client/views/component/dongSelectListSimple.vue
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 |
<div class="grid3_7 gap" id="siDoHiddenCk" style="float: left;display: block;block;width: 10rem;"> |
3 | 3 |
<select name="siDoSelectList" id="siDoSelectList" v-model="address['siDo_dong_cd']" |
4 | 4 |
@change="siDoGunGuSelectF($event)"> |
5 |
- <option :value=null disabled> 시/도</option> |
|
5 |
+ <option :value=null > 시/도</option> |
|
6 | 6 |
<option v-for="(item, key) in siDoList" :key="key" :value="item['dong_cd']"> |
7 | 7 |
{{ item['dong_nm'] }} |
8 | 8 |
</option> |
... | ... | @@ -11,7 +11,7 @@ |
11 | 11 |
<div class="grid3_7 gap" id="gunGuHiddenCk" style="float: left;display: block;block;width: 10rem;"> |
12 | 12 |
<select class="bg-white" name="gunGuSelectList" id="gunGuSelectList" v-model="address['guGun_dong_cd']" |
13 | 13 |
@change="siDoGunGuSelectF($event)"> |
14 |
- <option :value=null disabled> 시/군/구 </option> |
|
14 |
+ <option :value=null > 시/군/구 </option> |
|
15 | 15 |
<option v-for="(item, key) in gunGuList" :key="key" :value="item['dong_cd']"> |
16 | 16 |
{{ item['dong_nm'] }} |
17 | 17 |
</option> |
... | ... | @@ -19,8 +19,7 @@ |
19 | 19 |
</div> |
20 | 20 |
<div class="grid3_7 gap" id="dongHiddenCk" style="float: left;display: block;width: 10rem;"> |
21 | 21 |
<select name="dongSelectList" id="dongSelectList" v-model="address['dong_dong_cd']" @change="dongSelectF($event)"> |
22 |
- <option :value=null disabled> 행정동 </option> |
|
23 |
- <option :value=null > 선택안함 </option> |
|
22 |
+ <option :value=null > 행정동 </option> |
|
24 | 23 |
<option v-for="(item, key) in dongList" :key="key" :value="item['dong_cd']"> |
25 | 24 |
{{ item['dong_nm'] }} |
26 | 25 |
</option> |
... | ... | @@ -28,14 +27,14 @@ |
28 | 27 |
</div> |
29 | 28 |
<div class="grid3_7 gap" id="nodeHiddenCk" style="float: left;display: block;width: 10rem;"> |
30 | 29 |
<select name="nodeSelectList" id="nodeSelectList" v-model="address['node_id']" @change="nodeSelectF($event)"> |
31 |
- <option :value=null disabled> 교차로 </option> |
|
30 |
+ <option :value=null > 교차로 </option> |
|
32 | 31 |
<option v-for="(item, key) in nodeList" :key="key" :value="item['node_id']"> |
33 | 32 |
{{ item['node_name'] }} |
34 | 33 |
</option> |
35 | 34 |
</select> |
36 | 35 |
</div> |
37 |
- <!-- |
|
38 |
- <div class="grid3_7 " id="crslk_azHiddenCk" style="float: left;display: block;"> |
|
36 |
+ |
|
37 |
+ <div class="grid3_7 gap " id="crslk_azHiddenCk" style="float: left;display: block;width: 10rem;"> |
|
39 | 38 |
<select name="crslk_azSelectList" id="crslk_azSelectList" v-model="address['crslk_az']"> |
40 | 39 |
<option :value="0"> 방위각 </option> |
41 | 40 |
<option :value="10">북</option> |
... | ... | @@ -48,7 +47,7 @@ |
48 | 47 |
<option :value="80">북서</option> |
49 | 48 |
</select> |
50 | 49 |
</div> |
51 |
- --> |
|
50 |
+ |
|
52 | 51 |
</template> |
53 | 52 |
|
54 | 53 |
<script> |
... | ... | @@ -63,19 +62,21 @@ |
63 | 62 |
crslk_azHiddenCk: Boolean, |
64 | 63 |
user_sido_cd: null, |
65 | 64 |
user_sigungu_cd: null, |
66 |
- user_dong_cd: null |
|
65 |
+ user_dong_cd: null, |
|
66 |
+ user_node_id: null, |
|
67 |
+ user_crslk_az: null |
|
67 | 68 |
}, |
68 | 69 |
data() { |
69 | 70 |
return { |
70 | 71 |
address: { |
71 | 72 |
//지역 설정 |
72 |
- dong_cd: "22030", |
|
73 |
+ dong_cd: "22", |
|
73 | 74 |
siDo_dong_cd: "22", |
74 | 75 |
guGun_dong_cd: null, |
75 | 76 |
dong_dong_cd: null, |
76 | 77 |
node_id: null, |
77 | 78 |
zoomLevel: null, |
78 |
- crslk_az: null, |
|
79 |
+ crslk_az: 0, |
|
79 | 80 |
}, |
80 | 81 |
siDoList: [], |
81 | 82 |
gunGuList: [], |
... | ... | @@ -110,34 +111,43 @@ |
110 | 111 |
console.log("guGun_dong_cd oldValue : ", oldValue); |
111 | 112 |
this.address.dong_cd = newValue; |
112 | 113 |
//아래에 있는 값은 초기화 |
113 |
- this.address.dong_dong_cd = null; |
|
114 |
- this.address.node_id = null; |
|
114 |
+ |
|
115 | 115 |
this.dongList = null; |
116 | 116 |
|
117 | 117 |
//zoom 재설정 |
118 | 118 |
this.address.zoomLevel = 14; |
119 | 119 |
|
120 |
+ if(newValue != null && oldValue != null) { |
|
121 |
+ this.address.dong_dong_cd = null; |
|
122 |
+ this.address.node_id = null; |
|
123 |
+ } |
|
120 | 124 |
|
121 | 125 |
if (newValue != null) { |
122 | 126 |
this.dongSelectList(newValue); |
123 | 127 |
} else { |
124 | 128 |
this.address.dong_cd = this.address.siDo_dong_cd; |
125 | 129 |
} |
130 |
+ |
|
126 | 131 |
}, |
127 | 132 |
'address.dong_dong_cd': function (newValue, oldValue) { |
128 | 133 |
console.log("dong_dong_cd newValue : ", newValue); |
129 | 134 |
console.log("dong_dong_cd oldValue : ", oldValue); |
130 | 135 |
this.address.dong_cd = newValue; |
131 | 136 |
//아래에 있는 값은 초기화 |
132 |
- this.address.node_id = null; |
|
137 |
+ |
|
138 |
+ if(newValue != null && oldValue != null) { |
|
139 |
+ this.address.node_id = null; |
|
140 |
+ this.address.crslk_az = 0; |
|
141 |
+ } |
|
133 | 142 |
|
134 | 143 |
this.address.zoomLevel = 15; |
135 | 144 |
|
136 |
- if (newValue === null) { |
|
145 |
+ if (newValue != null) { |
|
146 |
+ this.findNodeUsingDongSelectList(newValue); |
|
147 |
+ } else { |
|
137 | 148 |
this.address.dong_cd = this.address.guGun_dong_cd; |
138 | 149 |
} |
139 | 150 |
|
140 |
- this.findNodeUsingDongSelectList(newValue); |
|
141 | 151 |
}, |
142 | 152 |
'address.node_id': function (newValue, oldValue) { |
143 | 153 |
console.log("node_id newValue : ", newValue); |
... | ... | @@ -148,28 +158,16 @@ |
148 | 158 |
this.address.node_name = node.node_name; |
149 | 159 |
} |
150 | 160 |
}) |
161 |
+ |
|
162 |
+ if(newValue != null && oldValue != null) { |
|
163 |
+ this.address.crslk_az = 0; |
|
164 |
+ } |
|
151 | 165 |
this.address.zoomLevel = 19; |
152 | 166 |
}, |
153 |
- 'user_sido_cd': function (newValue, oldValue) { |
|
154 |
- console.log("user_sido_cd newValue : ", newValue); |
|
155 |
- console.log("user_sido_cd oldValue : ", oldValue); |
|
156 |
- this.address.siDo_dong_cd = newValue; |
|
157 |
- }, |
|
158 |
- 'user_sigungu_cd': function (newValue, oldValue) { |
|
159 |
- console.log("user_sigungu_cd newValue : ", newValue); |
|
160 |
- console.log("user_sigungu_cd oldValue : ", oldValue); |
|
161 |
- if (newValue != undefined) { |
|
162 |
- this.address.guGun_dong_cd = newValue; |
|
163 |
- } else { |
|
164 |
- this.address.guGun_dong_cd = null; |
|
165 |
- } |
|
166 |
- }, |
|
167 |
- 'user_dong_cd': function (newValue, oldValue) { |
|
168 |
- console.log("user_dong_cd newValue : ", newValue); |
|
169 |
- console.log("user_dong_cd oldValue : ", oldValue); |
|
170 |
- if (newValue != undefined) { |
|
171 |
- this.address.dong_dong_cd = newValue; |
|
172 |
- } |
|
167 |
+ 'address.crslk_az': function (newValue, oldValue) { |
|
168 |
+ console.log("crslk_az newValue : ", newValue); |
|
169 |
+ console.log("crslk_az oldValue : ", oldValue); |
|
170 |
+ this.address.crslk_az = newValue; |
|
173 | 171 |
}, |
174 | 172 |
}, |
175 | 173 |
methods: { |
... | ... | @@ -262,7 +260,6 @@ |
262 | 260 |
console.log("dongSelectList mounted : "); |
263 | 261 |
this.siDoSelectList(); |
264 | 262 |
this.gunGuSelect(this.address.siDo_dong_cd); |
265 |
- this.dongSelectList(this.address.guGun_dong_cd); |
|
266 | 263 |
this.onEmit(); |
267 | 264 |
if (this.siDoHiddenCk) { |
268 | 265 |
document.getElementById("siDoHiddenCk").style.display = 'none'; |
... | ... | @@ -279,6 +276,22 @@ |
279 | 276 |
if (this.crslk_azHiddenCk) { |
280 | 277 |
document.getElementById("crslk_azHiddenCk").style.display = 'none'; |
281 | 278 |
} |
279 |
+ |
|
280 |
+ if(this.user_sigungu_cd != undefined) { |
|
281 |
+ this.address.guGun_dong_cd = this.user_sigungu_cd; |
|
282 |
+ } |
|
283 |
+ |
|
284 |
+ if(this.user_dong_cd != undefined) { |
|
285 |
+ this.address.dong_dong_cd = this.user_dong_cd; |
|
286 |
+ } |
|
287 |
+ |
|
288 |
+ if(this.user_node_id != undefined) { |
|
289 |
+ this.address.node_id = this.user_node_id; |
|
290 |
+ } |
|
291 |
+ |
|
292 |
+ if(this.user_crslk_az != undefined) { |
|
293 |
+ this.address.crslk_az = this.user_crslk_az; |
|
294 |
+ } |
|
282 | 295 |
}, |
283 | 296 |
}; |
284 | 297 |
|
--- client/views/pages/RealtimeStatus/CrosswalkListSearch.vue
+++ client/views/pages/RealtimeStatus/CrosswalkListSearch.vue
... | ... | @@ -314,8 +314,8 @@ |
314 | 314 |
|
315 | 315 |
<h3 class="modal_base_title">이벤트 발생정보</h3> |
316 | 316 |
<button class="btn-2 green-btn s-btn " style=" float: right; margin-left: 10px; margin-bottom:5px;" @click="crosswalkSearchPage(crosswalk.node_id, crosswalk.dong_cd)">위치확인</button> |
317 |
- <button class="btn-2 green-btn s-btn " style=" float: right; margin-left: 10px; margin-bottom:5px;" @click="situationSearchPage(crosswalk.node_id, crosswalk.crslk_az, crosswalk.dong_cd)">상황발생 상세보기</button> |
|
318 |
- <button class="btn-2 green-btn s-btn " style=" float: right; margin-left: 10px; margin-bottom:5px;" @click="errorSearchPage(crosswalk.node_id, crosswalk.crslk_az, crosswalk.dong_cd)">장애발생 상세보기</button> |
|
317 |
+ <button class="btn-2 green-btn s-btn " style=" float: right; margin-left: 10px; margin-bottom:5px;" @click="situationSearchPage(crosswalk.node_id, crosswalk.crslk_az, crosswalk.sigungu_cd, crosswalk.dong_cd)">상황발생 상세보기</button> |
|
318 |
+ <button class="btn-2 green-btn s-btn " style=" float: right; margin-left: 10px; margin-bottom:5px;" @click="errorSearchPage(crosswalk.node_id, crosswalk.crslk_az, crosswalk.sigungu_cd, crosswalk.dong_cd)">장애발생 상세보기</button> |
|
319 | 319 |
<div class="de_Search"> |
320 | 320 |
<table class="troubleTable mrg_b_0" > |
321 | 321 |
<tbody> |
... | ... | @@ -387,6 +387,7 @@ |
387 | 387 |
crosswalk: { |
388 | 388 |
crslk_az: null, |
389 | 389 |
node_id: null, |
390 |
+ sigungu_cd: null, |
|
390 | 391 |
dong_cd: null, |
391 | 392 |
crslk_nm: null, |
392 | 393 |
instl_ymd: null, |
... | ... | @@ -488,12 +489,12 @@ |
488 | 489 |
this.address = value; |
489 | 490 |
}, |
490 | 491 |
|
491 |
- situationSearchPage: function(node_id, crslk_az, dong_cd) { |
|
492 |
- this.$router.push({ path: '/SituationSearch.page', query: { 'node_id': node_id, 'crslk_az': crslk_az, 'dong_cd': dong_cd}}) |
|
492 |
+ situationSearchPage: function(node_id, crslk_az, sigungu_cd, dong_cd) { |
|
493 |
+ this.$router.push({ path: '/SituationSearch.page', query: { 'node_id': node_id, 'crslk_az': crslk_az, 'sigungu_cd': sigungu_cd,'dong_cd': dong_cd}}) |
|
493 | 494 |
}, |
494 | 495 |
|
495 |
- errorSearchPage: function(node_id, crslk_az, dong_cd) { |
|
496 |
- this.$router.push({ path: '/ErrorSearch.page', query: { 'node_id': node_id, 'crslk_az': crslk_az, 'dong_cd': dong_cd}}) |
|
496 |
+ errorSearchPage: function(node_id, crslk_az, sigungu_cd, dong_cd) { |
|
497 |
+ this.$router.push({ path: '/ErrorSearch.page', query: { 'node_id': node_id, 'crslk_az': crslk_az, 'sigungu_cd': sigungu_cd, 'dong_cd': dong_cd}}) |
|
497 | 498 |
}, |
498 | 499 |
|
499 | 500 |
crosswalkSearchPage: function(node_id, dong_cd) { |
... | ... | @@ -506,6 +507,10 @@ |
506 | 507 |
PaginationButton: PaginationButton, |
507 | 508 |
dongSelectList: dongSelectList, |
508 | 509 |
}, |
510 |
+ created() { |
|
511 |
+ this.crosswalkListSearch.endDate = COMMON_UTIL.today(); |
|
512 |
+ this.crosswalkListSearch.startDate = COMMON_UTIL.oneMonthAgo(); |
|
513 |
+ }, |
|
509 | 514 |
mounted() { |
510 | 515 |
console.log("CrosswalkListSearch mounted"); |
511 | 516 |
this.crosswalkSelectList(); |
--- client/views/pages/RealtimeStatus/ErrorSearch.vue
+++ client/views/pages/RealtimeStatus/ErrorSearch.vue
... | ... | @@ -17,8 +17,9 @@ |
17 | 17 |
</td> |
18 | 18 |
<th>행정구역</th> |
19 | 19 |
<td colspan="3"> |
20 |
- <dongSelectList @setDongCd="setDongCd" |
|
21 |
- :user_dong_cd="errorListSearch.dong_cd" |
|
20 |
+ <dongSelectList @setDongCd="setDongCd" |
|
21 |
+ :user_sigungu_cd="errorListSearch.sigungu_cd" |
|
22 |
+ :user_dong_cd="errorListSearch.dong_dong_cd" |
|
22 | 23 |
:user_node_id="errorListSearch.node_id" |
23 | 24 |
:user_crslk_az="errorListSearch.crslk_az"></dongSelectList> |
24 | 25 |
</td> |
... | ... | @@ -269,7 +270,9 @@ |
269 | 270 |
errorType: null, |
270 | 271 |
equipmentType: null, |
271 | 272 |
recoveryType: null, |
273 |
+ sigungu_cd:null, |
|
272 | 274 |
dong_cd: null, |
275 |
+ dong_dong_cd: null, |
|
273 | 276 |
node_id: null, |
274 | 277 |
crslk_az: null |
275 | 278 |
}, |
... | ... | @@ -358,7 +361,8 @@ |
358 | 361 |
}, |
359 | 362 |
}, |
360 | 363 |
watch: { |
361 |
- 'address.dong_dong_cd': function (newValue) { |
|
364 |
+ |
|
365 |
+ 'address.dong_cd': function (newValue) { |
|
362 | 366 |
this.errorListSearch.dong_cd = newValue; |
363 | 367 |
}, |
364 | 368 |
|
... | ... | @@ -376,13 +380,23 @@ |
376 | 380 |
dongSelectList: dongSelectList, |
377 | 381 |
}, |
378 | 382 |
created(){ |
379 |
- this.errorListSearch.dong_cd = this.$route.query.dong_cd; |
|
380 |
- this.errorListSearch.node_id = this.$route.query.node_id; |
|
381 |
- this.errorListSearch.crslk_az = this.$route.query.crslk_az; |
|
383 |
+ if(this.$route.query.sigungu_cd != null) { |
|
384 |
+ console.log("ErrorSearch created") |
|
385 |
+ this.errorListSearch.sigungu_cd = this.$route.query.sigungu_cd; |
|
386 |
+ this.errorListSearch.dong_dong_cd = this.$route.query.dong_cd; |
|
387 |
+ this.errorListSearch.node_id = this.$route.query.node_id; |
|
388 |
+ this.errorListSearch.crslk_az = this.$route.query.crslk_az; |
|
389 |
+ this.errorListSearch.startDate = COMMON_UTIL.today(); |
|
390 |
+ this.errorListSearch.endDate = COMMON_UTIL.today(); |
|
391 |
+ } else { |
|
392 |
+ this.errorListSearch.endDate = COMMON_UTIL.today(); |
|
393 |
+ this.errorListSearch.startDate = COMMON_UTIL.oneMonthAgo(); |
|
394 |
+ } |
|
382 | 395 |
}, |
383 | 396 |
mounted() { |
384 | 397 |
console.log("ErrorSearch mounted"); |
385 | 398 |
this.errorSelectList(); |
399 |
+ |
|
386 | 400 |
}, |
387 | 401 |
}; |
388 | 402 |
</script> |
--- client/views/pages/RealtimeStatus/SituationSearch.vue
+++ client/views/pages/RealtimeStatus/SituationSearch.vue
... | ... | @@ -20,8 +20,9 @@ |
20 | 20 |
</td> |
21 | 21 |
<th>행정구역</th> |
22 | 22 |
<td colspan="3" class="flex gap"> |
23 |
- <dongSelectList @setDongCd="setDongCd" |
|
24 |
- :user_dong_cd="eventListSearch.dong_cd" |
|
23 |
+ <dongSelectList @setDongCd="setDongCd" |
|
24 |
+ :user_sigungu_cd="eventListSearch.sigungu_cd" |
|
25 |
+ :user_dong_cd="eventListSearch.dong_dong_cd" |
|
25 | 26 |
:user_node_id="eventListSearch.node_id" |
26 | 27 |
:user_crslk_az="eventListSearch.crslk_az"></dongSelectList> |
27 | 28 |
</td> |
... | ... | @@ -298,7 +299,9 @@ |
298 | 299 |
startDate: null, |
299 | 300 |
endDate: null, |
300 | 301 |
eventType: null, |
302 |
+ sigungu_cd:null, |
|
301 | 303 |
dong_cd: null, |
304 |
+ dong_dong_cd: null, |
|
302 | 305 |
node_id: null, |
303 | 306 |
crslk_az: null |
304 | 307 |
}, |
... | ... | @@ -352,7 +355,7 @@ |
352 | 355 |
methods: { |
353 | 356 |
eventSelectList: function() { |
354 | 357 |
const vm = this; |
355 |
- |
|
358 |
+ |
|
356 | 359 |
axios({ |
357 | 360 |
url: "/statusControl/eventSelectList.json", |
358 | 361 |
method: "post", |
... | ... | @@ -410,7 +413,8 @@ |
410 | 413 |
}, |
411 | 414 |
}, |
412 | 415 |
watch: { |
413 |
- 'address.dong_dong_cd': function (newValue) { |
|
416 |
+ |
|
417 |
+ 'address.dong_cd': function (newValue) { |
|
414 | 418 |
this.eventListSearch.dong_cd = newValue; |
415 | 419 |
}, |
416 | 420 |
|
... | ... | @@ -428,12 +432,21 @@ |
428 | 432 |
dongSelectList: dongSelectList |
429 | 433 |
}, |
430 | 434 |
created(){ |
431 |
- this.eventListSearch.dong_cd = this.$route.query.dong_cd; |
|
432 |
- this.eventListSearch.node_id = this.$route.query.node_id; |
|
433 |
- this.eventListSearch.crslk_az = this.$route.query.crslk_az; |
|
435 |
+ if(this.$route.query.sigungu_cd != null) { |
|
436 |
+ console.log("SituationSearch created"); |
|
437 |
+ this.eventListSearch.sigungu_cd = this.$route.query.sigungu_cd; |
|
438 |
+ this.eventListSearch.dong_dong_cd = this.$route.query.dong_cd; |
|
439 |
+ this.eventListSearch.node_id = this.$route.query.node_id; |
|
440 |
+ this.eventListSearch.crslk_az = this.$route.query.crslk_az; |
|
441 |
+ this.eventListSearch.startDate = COMMON_UTIL.today(); |
|
442 |
+ this.eventListSearch.endDate = COMMON_UTIL.today(); |
|
443 |
+ } else { |
|
444 |
+ this.eventListSearch.endDate = COMMON_UTIL.today(); |
|
445 |
+ this.eventListSearch.startDate = COMMON_UTIL.oneMonthAgo(); |
|
446 |
+ } |
|
434 | 447 |
}, |
435 | 448 |
mounted() { |
436 |
- console.log("Main4 mounted"); |
|
449 |
+ console.log("SituationSearch mounted"); |
|
437 | 450 |
this.eventSelectList(); |
438 | 451 |
}, |
439 | 452 |
}; |
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?