Stormen123 2023-08-02
230802 김성훈 달력 금일기준 한달 전으로 기본값 설정
@76b78fe190e711ae590ffd24f686aae5e2d16bb5
client/resources/js/commonUtil.ts
--- client/resources/js/commonUtil.ts
+++ client/resources/js/commonUtil.ts
@@ -11,6 +11,24 @@
 	var _utils = {
 
 		/**
+		 * 오늘 년-월-일 구하기
+		 */
+		today: function() {
+			let date = new Date();
+			let today = new Date(date.getTime() - (date.getTimezoneOffset() * 60000)).toISOString().substring(0, 10);
+			return today;
+		},
+
+		/**
+		 * 한달전 년-월-일 구하기
+		 */
+		oneMonthAgo: function() {
+			let date = new Date();
+			let oneMonthAgo = new Date(date.setMonth(date.getMonth() - 1) - (date.getTimezoneOffset() * 60000)).toISOString().substring(0, 10);
+			return oneMonthAgo;
+		},
+
+		/**
 		 * null값 '-' 으로 치환
 		 */
 		nullHyphen: function(data : any) {
@@ -26,7 +44,7 @@
 		 */
 		dateHyphen: function(data : any) {
 			if(data === null || data === "") return "-";
-			var formatDate = '';
+			let formatDate = '';
 			// 공백제거
 			data = data.replace(/\s/gi, "");
 			if(data.length == 8) {
@@ -45,7 +63,7 @@
 			if(data === null || data === "") {
 				return "-";
 			} else {
-				var date = data.substr(0,10);
+				let date = data.substr(0,10);
 				return date;
 			}
 		},
@@ -123,7 +141,7 @@
 			if(!phoneNumber) return phoneNumber
 				phoneNumber = phoneNumber.replace(/[^0-9]/g, '')
 		
-			var res = ''
+			let res = ''
 			if(phoneNumber.length < 3) {
 				res = phoneNumber
 			}
@@ -173,7 +191,7 @@
 		 * 휴대폰 번호 정규식
 		 */
 		checkPhone: function(data : any) {
-			var regExp = /^01([0|1|6|7|8|9]?)-?([0-9]{3,4})-?([0-9]{4})$/;
+			let regExp = /^01([0|1|6|7|8|9]?)-?([0-9]{3,4})-?([0-9]{4})$/;
 			if (regExp.test(data) === true) return true;
 			return false;
 		},
@@ -183,7 +201,7 @@
 		 */
 		checkEmail: function (data : any) {
 		  	// 이메일 형식 검사
-			var validateEmail = /^[A-Za-z0-9_\\.\\-]+@[A-Za-z0-9\\-]+\.[A-Za-z0-9\\-\\.]+$/;
+			let validateEmail = /^[A-Za-z0-9_\\.\\-]+@[A-Za-z0-9\\-]+\.[A-Za-z0-9\\-\\.]+$/;
 			if (validateEmail.test(data) === true) return true;
 			return false;
 		},
client/views/layout/Header.vue
--- client/views/layout/Header.vue
+++ client/views/layout/Header.vue
@@ -71,7 +71,6 @@
               <li
                 v-for="option in dropdownOptions"
                 :key="option.value"
-                @click="navigateToPage(option)"
               >
                 <router-link :to="option.route">{{ option.label }}</router-link>
               </li>
@@ -80,7 +79,6 @@
               <li
                 v-for="option in dropdownOptions2"
                 :key="option.value"
-                @click="navigateToPage(option)"
               >
                 <router-link :to="option.route">{{ option.label }}</router-link>
               </li>
@@ -89,7 +87,6 @@
               <li
                 v-for="option in dropdownOptions5"
                 :key="option.value"
-                @click="navigateToPage(option)"
               >
                 <router-link :to="option.route">{{ option.label }}</router-link>
               </li>
@@ -98,7 +95,6 @@
               <li
                 v-for="option in dropdownOptions3"
                 :key="option.value"
-                @click="navigateToPage(option)"
               >
                 <router-link :to="option.route">{{ option.label }}</router-link>
               </li>
client/views/pages/CrosswalkManagement/CrosswalkSearch.vue
--- client/views/pages/CrosswalkManagement/CrosswalkSearch.vue
+++ client/views/pages/CrosswalkManagement/CrosswalkSearch.vue
@@ -1362,11 +1362,9 @@
     console.log("Main2 mounted");
     this.$refs.open_layers.setBaseMap(vworldBaseLayer);
     if(this.$route.query.route === 'Y') {
-      console.log("라우트ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ")
       this.$refs.open_layers.addVectorLayerAutoSizeByUrl('/common/getCrslksGeoJson.json', 'crslkLayer', 'EPSG:5181', baseStyles['labelStyle'], 'label', this.$route.query.dong_cd, this.$route.query.node_id);
       // this.$refs.open_layers.addVectorLayerRemoveAutoSizAddChildNodeCnteByUrl("/common/getDongsCenterAndChildNodeCntJson.json","nodeLayer", "EPSG:5181", baseStyles["labelStyle"], "label", this.$route.query.dong_cd, this.$route.query.node_id);
     } else {
-      console.log("노______________라우트ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ")
       this.$refs.open_layers.addVectorLayerByUrl( "/common/getDongsGeoJson.json","multiPolygonLayer", "EPSG:5181", baseStyles["MultiPolygon"], "MultiPolygon", this.address.dong_cd);
       this.$refs.open_layers.addVectorLayerRemoveAutoSizAddChildNodeCnteByUrl("/common/getDongsCenterAndChildNodeCntJson.json","nodeLayer", "EPSG:5181", baseStyles["labelStyle"], "label", this.address.dong_cd);
     }
client/views/pages/SystemManagement/AccessRecord.vue
--- client/views/pages/SystemManagement/AccessRecord.vue
+++ client/views/pages/SystemManagement/AccessRecord.vue
@@ -184,6 +184,10 @@
   components: {
     PaginationButton: PaginationButton,
   },
+  created() {
+    this.userAccessListSearch.endDate = COMMON_UTIL.today();
+    this.userAccessListSearch.startDate = COMMON_UTIL.oneMonthAgo();
+  },
   mounted() {
     console.log("AccessRecord mounted");
     this.userAccessSelectList();
client/views/pages/SystemManagement/ChargeManagement.vue
--- client/views/pages/SystemManagement/ChargeManagement.vue
+++ client/views/pages/SystemManagement/ChargeManagement.vue
@@ -544,6 +544,10 @@
   components: {
     PaginationButton: PaginationButton,
   },
+  created() {
+    this.managerListSearch.endDate = COMMON_UTIL.today();
+    this.managerListSearch.startDate = COMMON_UTIL.oneMonthAgo();
+  },
   mounted() {
     console.log("Main4 mounted");
     this.managerSelectList();
client/views/pages/SystemManagement/DataRecord.vue
--- client/views/pages/SystemManagement/DataRecord.vue
+++ client/views/pages/SystemManagement/DataRecord.vue
@@ -40,22 +40,14 @@
             <tr>
                 <th>검색 일자</th>
                 <td colspan="3"> 
-                  <input type="date" value-format="yyyyMMdd" />
+                  <input type="date" value-format="yyyyMMdd" v-model="dataLogListSearch.startDate"/>
                   <span style="margin: 0px 2%;"> ~ </span>
-                  <input type="date" value-format="yyyyMMdd" />                  
+                  <input type="date" value-format="yyyyMMdd" v-model="dataLogListSearch.endDate"/>                  
                 </td>  
                 <th>행정동</th>
                 <td colspan="3">       
-                   <select name="" id="" style="width: 20%;">
-                    <option value="">대구광역시</option>
-                  </select>              
-                  <select name="" id="" style="width: 20%;">
-                    <option value="">서구</option>
-                  </select>              
-                  <select name="" id="" style="width: 20%;">
-                    <option value="">전체</option>
-                  </select>     
-                  <button type="button" class="green-btn" style="margin-left: 5px;padding: 5px;width: 10rem; float: right;">검색</button>
+                  <dongSelectList @setDongCd="setDongCd"></dongSelectList>
+                  <button type="button" class="green-btn" style="margin-left: 5px;padding: 5px;width: 10rem; float: right;" @click="dataLogSelectList">검색</button>
                 </td>         
             </tr>          
         </tbody>
@@ -159,7 +151,7 @@
 <script>
 import axios from "axios";
 import PaginationButton from "../../component/pagination/PaginationButton.vue";
-import dongSelectList from '../../component/dongSelectList.vue';
+import dongSelectList from '../../component/dongSelectListSimple.vue';
 import COMMON_UTIL from "../../../resources/js/commonUtil.ts";
 
 export default {
@@ -168,9 +160,10 @@
       dataLogListSearch: {
         currentPage: 1,
         perPage: 10,
-        // startDate: null,
-        // endDate: null,
-        // searchDongCode: null,
+        startDate: null,
+        endDate: null,
+        dong_cd: null,
+        crslk_az: null
       },
 
       dataLogListCount: 0,
@@ -183,30 +176,32 @@
   methods: {
     dataLogSelectList: function() {
       const vm = this;
+      vm.dataLogListSearch.dong_cd = vm.address.dong_cd;
+      vm.dataLogListSearch.crslk_az = vm.address.crslk_az;
 
-        axios({
-        url: "/dataLog/dataLogSelectList.json",
-        method: "post",
-        headers: {
-          "Content-Type": "application/json; charset=UTF-8",
-        },
-        data: vm.dataLogListSearch,
+      axios({
+      url: "/dataLog/dataLogSelectList.json",
+      method: "post",
+      headers: {
+        "Content-Type": "application/json; charset=UTF-8",
+      },
+      data: vm.dataLogListSearch,
+    })
+      .then(function(response) {
+        console.log("dataLogSelectList - response : ", response.data);
+        vm.dataLogListCount = response.data.dataLogListCount;
+        vm.dataLogList = response.data.dataLogList;
+        vm.dataLogIdx = response.data.dataLogListCount - (vm.dataLogListSearch.currentPage - 1) * response.data.dataLogList.length;
       })
-        .then(function(response) {
-          console.log("dataLogSelectList - response : ", response.data);
-          vm.dataLogListCount = response.data.dataLogListCount;
-          vm.dataLogList = response.data.dataLogList;
-          vm.dataLogIdx = response.data.dataLogListCount - (vm.dataLogListSearch.currentPage - 1) * response.data.dataLogList.length;
-        })
-        .catch(function(error) {
-          console.log("errorSelectList - error : ", error);
-          alert("장애발생 목록 조회 오류, 관리자에게 문의해주세요.");
-        });
+      .catch(function(error) {
+        console.log("errorSelectList - error : ", error);
+        alert("장애발생 목록 조회 오류, 관리자에게 문의해주세요.");
+      });
     },
 
-    //날짜에 '-' 넣기
-    yyyymmdd(date) {
-      return COMMON_UTIL.yyyymmdd(date);
+    setDongCd(value) {
+      console.log("value : ", value);
+      this.address = value;
     },
   },
   watch: {},
@@ -215,6 +210,10 @@
     PaginationButton: PaginationButton,
     dongSelectList: dongSelectList
   },
+  created() {
+    this.dataLogListSearch.endDate = COMMON_UTIL.today();
+    this.dataLogListSearch.startDate = COMMON_UTIL.oneMonthAgo();
+  },
   mounted() {
     console.log("Main4 mounted");
     this.dataLogSelectList();
client/views/pages/SystemManagement/NodeManagement.vue
--- client/views/pages/SystemManagement/NodeManagement.vue
+++ client/views/pages/SystemManagement/NodeManagement.vue
@@ -441,12 +441,12 @@
       await vm.$nextTick();
       //수정 전 좌표 modal에서 보여주기
       if (!vm.createMode) {
+        console.log("위도경도 넣기!!!!!!!")
         vm.map_lat = vm.node.lat;
         vm.map_lon = vm.node.lon;
       }
       //기본맵 세팅
       vm.$refs.open_layers.setBaseMap(vworldBaseLayer);
-      console.log("맵열기!!!!!!!!!!")
       //노드위치로 이동     
        if(!vm.createMode){
         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
+++ client/views/pages/SystemManagement/UserManagement.vue
@@ -26,7 +26,7 @@
               <td colspan="3"> 
                  <input type="date" value-format="yyyyMMdd" v-model="userListSearch.startDate" />
                  <span style="margin: 0px 5px;"> ~ </span>
-                 <input type="date" value-format="yyyyMMdd" v-model="userListSearch.endDate" />                  
+                 <input type="date" value-format="yyyyMMdd" v-model="userListSearch.endDate" />        
               </td>  
               <th>사용자 권한</th>
               <td colspan="3">       
@@ -421,6 +421,9 @@
         user_telno: null,
         user_eml: null,
         user_author: null,
+        user_sido_cd: null,
+        user_sigungu_cd: null,
+        user_dong_cd: null,
         dong_cd: null,
         rm: null
       },
@@ -501,6 +504,7 @@
 
     //사용자 상세조회 페이지 이동
     userSelectOnePage: function(user) {
+      
       console.log(user);
       this.selectUser = Object.assign({}, user);
       let data =  Object.assign({}, user);     
@@ -511,6 +515,21 @@
       var email = data.user_eml.split('@');
       this.email_id = email[0];
       this.email_domain = email[1];
+
+      if(data.dong_cd.length === 2) {
+        this.selectUser.siDo_dong_cd = data.dong_cd
+      }
+
+      else if(data.dong_cd.length === 5) {
+        this.selectUser.user_sido_cd = data.dong_cd.substring(0,2);
+        this.selectUser.user_sigungu_cd = data.dong_cd.substring(0,5);
+      }
+
+      else {
+        this.selectUser.user_sido_cd = data.dong_cd.substring(0,2);
+        this.selectUser.user_sigungu_cd = data.dong_cd.substring(0,5);
+        this.selectUser.user_dong_cd = data.dong_cd;
+      }
       this.modal_update = true;
      // this.$router.push({ path: '/UserModifyForm.page', query: {'user_id':user.user_id}});
     },
@@ -802,6 +821,8 @@
       this.address = value;
     },
 
+
+
   },
 
   watch: {},
@@ -810,6 +831,10 @@
     'PaginationButton':PaginationButton,
     dongSelectList: dongSelectList
   },
+  created() {
+    this.userListSearch.endDate = COMMON_UTIL.today();
+    this.userListSearch.startDate = COMMON_UTIL.oneMonthAgo();
+  },
   mounted() {
     console.log("UserManageMent Join");
     this.userSelectList();
Add a comment
List