Commit @b20febf93a6a932b14ea571419b4c76cd3c94a34

박민혁 2024-02-15

240215 박민혁 진단 결과 검색 수정

@b20febf93a6a932b14ea571419b4c76cd3c94a34

6b33927

b20febf

client/views/pages/result/ExecRuleResult.vue

--- client/views/pages/result/ExecRuleResult.vue

+++ client/views/pages/result/ExecRuleResult.vue


     <div class="content">
       <div class="row">
         <div class="content-titleZone">
-          <p class="box-title">
-            > 검색 조건 ||MEMO_임재현 임시로 검색 버튼에다가 모달창
-            만들었습니다. tableSelect()||
-          </p>
+          <p class="box-title">> 검색 조건</p>
         </div>
         <div class="table-zone">
           <table class="list-table">

               <tr>
                 <th>진단대상DBMS명</th>
                 <td style="display: flex">
-                  <select v-model="searchData.dbms_name">
-                    <option value="all">DBMS명</option>
+                  <select v-model="previousData.dbms_name">
+                    <option value="none" disabled selected>--DBMS명--</option>
                     <option v-for="item in dbmsOption" :key="item">
                       {{ item }}
                     </option>
                   </select>
 
-                  <select v-model="searchData.schema_name">
-                    <option value="all">스키마명</option>
+                  <select v-model="previousData.schema_name">
+                    <option value="none" disabled selected>--스키마명--</option>
                     <option v-for="item in schemaOption" :key="item">
                       {{ item }}
                     </option>

                 </td>
                 <th>검증분류</th>
                 <td>
-                  <select v-model="IdontKnow">
-                    <option value="all">전체</option>
+                  <select v-model="previousData.rule_type">
+                    <option value="none">전체</option>
+                    <option value="domain_val">검증룰</option>
+                    <option value="domain_code">코드</option>
+                    <option value="ref_rule">참조무결성</option>
+                    <option value="code_rule">업무규칙</option>
+                    <option value="dupl_rule">중복분석</option>
                   </select>
                 </td>
                 <th>품질지표명</th>
-                <td><input type="text" v-model="searchData.dqi_nm" /></td>
+                <td>
+                  <select v-model="previousData.dqi_nm">
+                    <option value="">전체</option>
+                    <option value="시간순서 일관성">시간순서 일관성</option>
+                    <option value="선후관계 정확성">선후관계 정확성</option>
+                    <option value="논리관계 일관성">논리관계 일관성</option>
+                    <option value="계산식">계산식</option>
+                    <option value="참조관계">참조관계</option>
+                    <option value="글자깨짐">글자깨짐</option>
+                    <option value="공백">공백</option>
+                    <option value="필수값">필수값</option>
+                    <option value="중복데이터">중복데이터</option>
+                    <option value="날짜 도메인">날짜 도메인</option>
+                    <option value="번호 도메인">번호 도메인</option>
+                    <option value="여부 도메인">여부 도메인</option>
+                    <option value="코드 도메인">코드 도메인</option>
+                    <option value="금액 도메인">금액 도메인</option>
+                    <option value="수량 도메인">수량 도메인</option>
+                    <option value="율 도메인">율 도메인</option>
+                  </select>
+                </td>
                 <th :rowspan="2">
-                  <!-- 임시로 tableSelect로 해둠 selectExecResult 변경 필요-->
-                  <button class="blue-btn large-btn" @click="tableSelect()">
+                  <button class="blue-btn large-btn" @click="setPage()">
                     검색
                   </button>
                 </th>
               </tr>
               <tr>
                 <th>테이블명</th>
-                <td><input type="text" v-model="searchData.table_nm" /></td>
+                <td><input type="text" v-model="previousData.table_nm" /></td>
                 <th>컬럼명</th>
-                <td><input type="text" v-model="searchData.column_nm" /></td>
+                <td><input type="text" v-model="previousData.column_nm" /></td>
                 <th>컬럼한글명</th>
-                <td><input type="text" v-model="searchData.column_nm_k" /></td>
+                <td>
+                  <input type="text" v-model="previousData.column_nm_k" />
+                </td>
               </tr>
             </thead>
           </table>

       //검색 조건 데이터
       searchData: {
         user_id: $cookies.get("USER_ID"),
-        dbms_name: "all",
+        dbms_name: "none",
         dbms_id: "",
-        schema_name: "all",
+        schema_name: "none",
         schema_id: "",
-        val_rule_detail: "all", //검증분류
-        dqi_nm: "", //품질지표명
+        rule_type: "none",
+        dqi_nm: "",
         table_nm: "",
+        table_nm_k: "",
+        table_id: "",
+        column_nm: "",
+        column_nm_k: "",
+        column_id: "",
+        currentPage: 1,
+        perPage: 10,
+      },
+
+      previousData: {
+        user_id: $cookies.get("USER_ID"),
+        dbms_name: "none",
+        dbms_id: "",
+        schema_name: "none",
+        schema_id: "",
+        rule_type: "none",
+        dqi_nm: "",
+        table_nm: "",
+        table_nm_k: "",
         table_id: "",
         column_nm: "",
         column_nm_k: "",

         });
     },
 
-    /**
-     * 내용 : DBMS option을 user_id와 매칭시켜 가져옴
-     * 작성자 : 임재현
-     * 시간 : 2024.01.30
-     */
     selectDbms: function () {
       const vm = this;
       if (vm.$checkLogin() == true) {
-          return;
+        return;
       }
       axios({
         url: "selectDbms.json",

         headers: {
           "Content-Type": "application/json; charset=UTF-8",
         },
-        data: vm.searchData,
+        data: vm.previousData,
       })
         .then(function (response) {
           vm.dbmsOption = response.data;

           vm.$showAlert("error", "selectDbms 오류");
         });
     },
-    /**
-     * 내용 : 선택한 DBMS_ID에 해당하는 스키마 SELECT함수 실행
-     * 작성자 : 임재현
-     * 시간 : 2024.01.30
-     */
+
     selectSchema: function () {
       const vm = this;
       axios({

         headers: {
           "Content-Type": "application/json; charset=UTF-8",
         },
-        data: vm.searchData,
+        data: vm.previousData,
       })
         .then(function (response) {
           vm.schemaOption = response.data;
         })
         .catch(function (error) {
           vm.$showAlert("error", "selectSchema 오류");
+        });
+    },
+    selectManageRule: function () {
+      const vm = this;
+      axios({
+        url: "selectManageRule.json",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json; charset=UTF-8",
+        },
+        data: vm.searchData,
+      })
+        .then(function (response) {
+          vm.manageRuleList = response.data.manageList;
+          vm.rowTotalCount = response.data.count;
+        })
+        .catch(function (error) {
+          vm.$showAlert("error", "selectManageRule 오류");
         });
     },
 

     },
 
     //페이지네이션 클릭 이벤트
-    handlePageClick(){},
+    handlePageClick() {},
+
+    //검색버튼을 눌렀을 시
+    setPage: function () {
+      const vm = this;
+      vm.searchData = { ...vm.previousData };
+      vm.selectManageRule();
+    },
   },
 
   watch: {
     //dbmsOption이 선택되는지 감시
-    "searchData.dbms_name"() {
+    "previousData.dbms_name"() {
+      this.previousData.schema_name = "none";
       this.selectSchema();
     },
+    "searchResultData.schema_name"() {
+      this.tableColumnList = ""; //컬럼 초기화
+      this.tableColumnData.table_id = 0; //선택된 테이블 초기화
+      this.tableColumnData.currentPage = 1; //컬럼 목록 페이지네이션
+      this.selectedCol = 0; //선택된 컬럼 초기화
+      this.selectTableColumn();
+    },
+
+
     "searchData.currentPage"() {
       this.selectExecResult();
     },

 </script>
 
 <style scoped>
-.execRuleResultTable tr td select,
-input {
+.execRuleResultTable tr td select, input {
     width: 100%;
 }
 </style>

6b33927

b20febf

client/views/pages/schedule/ExecRuleManagement.vue

--- client/views/pages/schedule/ExecRuleManagement.vue

+++ client/views/pages/schedule/ExecRuleManagement.vue


         column_nm_k: "",
         column_id: "",
         currentPage: 1,
-        perPage: 5,
+        perPage: 10,
       },
 
       // 진단 실행할 리스트

 </script>
 
 <style scoped>
-.execRuleManageTable tr td select {
-  width: 100%;
-}
-
-.execRuleManageTable tr td input {
+.execRuleManageTable tr td select, input {
   width: 100%;
 }
 </style>

Add a comment

Open 0
Closed 0

List

...	...	@@ -221,7 +221,7 @@
221	221	column_nm_k: "",
222	222	column_id: "",
223	223	currentPage: 1,
224		- perPage: 5,
	224	+ perPage: 10,
225	225	},
226	226
227	227	// 진단 실행할 리스트
...	...	@@ -362,11 +362,7 @@
362	362	</script>
363	363
364	364	<style scoped>
365		-.execRuleManageTable tr td select {
366		- width: 100%;
367		-}
368		-
369		-.execRuleManageTable tr td input {
	365	+.execRuleManageTable tr td select, input {
370	366	width: 100%;
371	367	}
372	368	</style>

...	...	@@ -6,10 +6,7 @@
6	6	<div class="content">
7	7	<div class="row">
8	8	<div class="content-titleZone">
9		- <p class="box-title">
10		- > 검색 조건 \|\|MEMO_임재현 임시로 검색 버튼에다가 모달창
11		- 만들었습니다. tableSelect()\|\|
12		- </p>
	9	+ <p class="box-title">> 검색 조건</p>
13	10	</div>
14	11	<div class="table-zone">
15	12	<table class="list-table">
...	...	@@ -26,15 +23,15 @@
26	23	<tr>
27	24	<th>진단대상DBMS명</th>
28	25	<td style="display: flex">
29		- <select v-model="searchData.dbms_name">
30		- <option value="all">DBMS명</option>
	26	+ <select v-model="previousData.dbms_name">
	27	+ <option value="none" disabled selected>--DBMS명--</option>
31	28	<option v-for="item in dbmsOption" :key="item">
32	29	{{ item }}
33	30	</option>
34	31	</select>
35	32
36		- <select v-model="searchData.schema_name">
37		- <option value="all">스키마명</option>
	33	+ <select v-model="previousData.schema_name">
	34	+ <option value="none" disabled selected>--스키마명--</option>
38	35	<option v-for="item in schemaOption" :key="item">
39	36	{{ item }}
40	37	</option>
...	...	@@ -42,26 +39,52 @@
42	39	</td>
43	40	<th>검증분류</th>
44	41	<td>
45		- <select v-model="IdontKnow">
46		- <option value="all">전체</option>
	42	+ <select v-model="previousData.rule_type">
	43	+ <option value="none">전체</option>
	44	+ <option value="domain_val">검증룰</option>
	45	+ <option value="domain_code">코드</option>
	46	+ <option value="ref_rule">참조무결성</option>
	47	+ <option value="code_rule">업무규칙</option>
	48	+ <option value="dupl_rule">중복분석</option>
47	49	</select>
48	50	</td>
49	51	<th>품질지표명</th>
50		- <td><input type="text" v-model="searchData.dqi_nm" /></td>
	52	+ <td>
	53	+ <select v-model="previousData.dqi_nm">
	54	+ <option value="">전체</option>
	55	+ <option value="시간순서 일관성">시간순서 일관성</option>
	56	+ <option value="선후관계 정확성">선후관계 정확성</option>
	57	+ <option value="논리관계 일관성">논리관계 일관성</option>
	58	+ <option value="계산식">계산식</option>
	59	+ <option value="참조관계">참조관계</option>
	60	+ <option value="글자깨짐">글자깨짐</option>
	61	+ <option value="공백">공백</option>
	62	+ <option value="필수값">필수값</option>
	63	+ <option value="중복데이터">중복데이터</option>
	64	+ <option value="날짜 도메인">날짜 도메인</option>
	65	+ <option value="번호 도메인">번호 도메인</option>
	66	+ <option value="여부 도메인">여부 도메인</option>
	67	+ <option value="코드 도메인">코드 도메인</option>
	68	+ <option value="금액 도메인">금액 도메인</option>
	69	+ <option value="수량 도메인">수량 도메인</option>
	70	+ <option value="율 도메인">율 도메인</option>
	71	+ </select>
	72	+ </td>
51	73	<th :rowspan="2">
52		- <!-- 임시로 tableSelect로 해둠 selectExecResult 변경 필요-->
53		- <button class="blue-btn large-btn" @click="tableSelect()">
	74	+ <button class="blue-btn large-btn" @click="setPage()">
54	75	검색
55	76	</button>
56	77	</th>
57	78	</tr>
58	79	<tr>
59	80	<th>테이블명</th>
60		- <td><input type="text" v-model="searchData.table_nm" /></td>
	81	+ <td><input type="text" v-model="previousData.table_nm" /></td>
61	82	<th>컬럼명</th>
62		- <td><input type="text" v-model="searchData.column_nm" /></td>
	83	+ <td><input type="text" v-model="previousData.column_nm" /></td>
63	84	<th>컬럼한글명</th>
64		- <td><input type="text" v-model="searchData.column_nm_k" /></td>
	85	+ <td>
	86	+ <input type="text" v-model="previousData.column_nm_k" />
	87	+ </td>
65	88	</tr>
66	89	</thead>
67	90	</table>
...	...	@@ -229,13 +252,32 @@
229	252	//검색 조건 데이터
230	253	searchData: {
231	254	user_id: $cookies.get("USER_ID"),
232		- dbms_name: "all",
	255	+ dbms_name: "none",
233	256	dbms_id: "",
234		- schema_name: "all",
	257	+ schema_name: "none",
235	258	schema_id: "",
236		- val_rule_detail: "all", //검증분류
237		- dqi_nm: "", //품질지표명
	259	+ rule_type: "none",
	260	+ dqi_nm: "",
238	261	table_nm: "",
	262	+ table_nm_k: "",
	263	+ table_id: "",
	264	+ column_nm: "",
	265	+ column_nm_k: "",
	266	+ column_id: "",
	267	+ currentPage: 1,
	268	+ perPage: 10,
	269	+ },
	270	+
	271	+ previousData: {
	272	+ user_id: $cookies.get("USER_ID"),
	273	+ dbms_name: "none",
	274	+ dbms_id: "",
	275	+ schema_name: "none",
	276	+ schema_id: "",
	277	+ rule_type: "none",
	278	+ dqi_nm: "",
	279	+ table_nm: "",
	280	+ table_nm_k: "",
239	281	table_id: "",
240	282	column_nm: "",
241	283	column_nm_k: "",
...	...	@@ -275,15 +317,10 @@
275	317	});
276	318	},
277	319
278		- /**
279		- * 내용 : DBMS option을 user_id와 매칭시켜 가져옴
280		- * 작성자 : 임재현
281		- * 시간 : 2024.01.30
282		- */
283	320	selectDbms: function () {
284	321	const vm = this;
285	322	if (vm.$checkLogin() == true) {
286		- return;
	323	+ return;
287	324	}
288	325	axios({
289	326	url: "selectDbms.json",
...	...	@@ -291,7 +328,7 @@
291	328	headers: {
292	329	"Content-Type": "application/json; charset=UTF-8",
293	330	},
294		- data: vm.searchData,
	331	+ data: vm.previousData,
295	332	})
296	333	.then(function (response) {
297	334	vm.dbmsOption = response.data;
...	...	@@ -300,11 +337,7 @@
300	337	vm.$showAlert("error", "selectDbms 오류");
301	338	});
302	339	},
303		- /**
304		- * 내용 : 선택한 DBMS_ID에 해당하는 스키마 SELECT함수 실행
305		- * 작성자 : 임재현
306		- * 시간 : 2024.01.30
307		- */
	340	+
308	341	selectSchema: function () {
309	342	const vm = this;
310	343	axios({
...	...	@@ -313,13 +346,31 @@
313	346	headers: {
314	347	"Content-Type": "application/json; charset=UTF-8",
315	348	},
316		- data: vm.searchData,
	349	+ data: vm.previousData,
317	350	})
318	351	.then(function (response) {
319	352	vm.schemaOption = response.data;
320	353	})
321	354	.catch(function (error) {
322	355	vm.$showAlert("error", "selectSchema 오류");
	356	+ });
	357	+ },
	358	+ selectManageRule: function () {
	359	+ const vm = this;
	360	+ axios({
	361	+ url: "selectManageRule.json",
	362	+ method: "post",
	363	+ headers: {
	364	+ "Content-Type": "application/json; charset=UTF-8",
	365	+ },
	366	+ data: vm.searchData,
	367	+ })
	368	+ .then(function (response) {
	369	+ vm.manageRuleList = response.data.manageList;
	370	+ vm.rowTotalCount = response.data.count;
	371	+ })
	372	+ .catch(function (error) {
	373	+ vm.$showAlert("error", "selectManageRule 오류");
323	374	});
324	375	},
325	376
...	...	@@ -336,14 +387,31 @@
336	387	},
337	388
338	389	//페이지네이션 클릭 이벤트
339		- handlePageClick(){},
	390	+ handlePageClick() {},
	391	+
	392	+ //검색버튼을 눌렀을 시
	393	+ setPage: function () {
	394	+ const vm = this;
	395	+ vm.searchData = { ...vm.previousData };
	396	+ vm.selectManageRule();
	397	+ },
340	398	},
341	399
342	400	watch: {
343	401	//dbmsOption이 선택되는지 감시
344		- "searchData.dbms_name"() {
	402	+ "previousData.dbms_name"() {
	403	+ this.previousData.schema_name = "none";
345	404	this.selectSchema();
346	405	},
	406	+ "searchResultData.schema_name"() {
	407	+ this.tableColumnList = ""; //컬럼 초기화
	408	+ this.tableColumnData.table_id = 0; //선택된 테이블 초기화
	409	+ this.tableColumnData.currentPage = 1; //컬럼 목록 페이지네이션
	410	+ this.selectedCol = 0; //선택된 컬럼 초기화
	411	+ this.selectTableColumn();
	412	+ },
	413	+
	414	+
347	415	"searchData.currentPage"() {
348	416	this.selectExecResult();
349	417	},
...	...	@@ -361,8 +429,7 @@
361	429	</script>
362	430
363	431	<style scoped>
364		-.execRuleResultTable tr td select,
365		-input {
	432	+.execRuleResultTable tr td select, input {
366	433	width: 100%;
367	434	}
368	435	</style>

Delete comment