From dfea91edc8ac88cb45d08bc5b3b0ef162d411096 Mon Sep 17 00:00:00 2001 From: jangwonseokicom Date: Mon, 12 Jun 2023 11:15:10 +0900 Subject: [PATCH] =?UTF-8?q?spa=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/login/service/LoginService.class | Bin 28855 -> 28839 bytes .../common/login/service/LoginService.java | 4 +- .../layout/adm/common/dashboard.html | 5 - .../layout/adm/common/system/commoncode.html | 33 +- .../layout/adm/common/system/cust.html | 457 +++--- .../layout/adm/common/system/custInsert.html | 1144 +++++++-------- .../layout/adm/common/system/custUpdate.html | 1304 ++++++++--------- .../layout/adm/common/system/groupAuth.html | 948 ++++++------ .../adm/common/system/groupAuthUpdate.html | 752 +++++----- .../common/system/groupAuthUpdatelegacy.html | 569 ++++--- .../layout/adm/common/system/policyMenu.html | 530 ++++--- .../adm/common/system/serviceGroupInsert.html | 832 ++++++----- .../adm/common/system/serviceGroupList.html | 550 ++++--- .../adm/common/system/serviceGroupView.html | 1250 ++++++++-------- .../layout/adm/common/system/user.html | 678 +++++---- .../layout/adm/common/system/userAdmin.html | 664 +++++---- .../adm/common/system/userAdminInsert.html | 39 +- .../adm/common/system/userAdminView.html | 1120 +++++++------- .../layout/adm/common/system/userInsert.html | 1298 ++++++++-------- .../layout/adm/common/system/userView.html | 1160 ++++++++------- .../templates/layout/fragments/sidebar.html | 47 +- .../main/resources/templates/layout/main.html | 9 + .../resources/templates/layout/signin.html | 3 +- 23 files changed, 6644 insertions(+), 6752 deletions(-) create mode 100644 main_vm/src/main/resources/templates/layout/main.html diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/service/LoginService.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/service/LoginService.class index a0f7e0051a3a296c6e6adc92f0cdbc72e5a8798d..bb44c68fb16968febad14aef0f7858704b9a8cb5 100644 GIT binary patch delta 27 jcmdn~ka77##tmF5Jlr{nmHDM5`nidjd7IT#Ci(yXnFb1E delta 43 zcmZ4fka7D%#tmF5GSWGTmHDM5`iUvI`pNmZx%qkeDT&1yN%@IIDVxPqCi(yXb%_v= diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java index c162812..906a8aa 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java @@ -107,8 +107,8 @@ public class LoginService { LoginVO userResult = user.toLoginVO(); // return "forward:/adm/main/actionMain.do"; - - return "layout/adm/common/dashboard"; +// return "layout/adm/common/dashboard"; + return "layout/main"; } else { log.info("Fail!"); } diff --git a/main_vm/src/main/resources/templates/layout/adm/common/dashboard.html b/main_vm/src/main/resources/templates/layout/adm/common/dashboard.html index 95ea772..834dacf 100644 --- a/main_vm/src/main/resources/templates/layout/adm/common/dashboard.html +++ b/main_vm/src/main/resources/templates/layout/adm/common/dashboard.html @@ -1,8 +1,4 @@ - - 대시보드 @@ -120,5 +116,4 @@ - \ No newline at end of file diff --git a/main_vm/src/main/resources/templates/layout/adm/common/system/commoncode.html b/main_vm/src/main/resources/templates/layout/adm/common/system/commoncode.html index c1bc454..a9f4bef 100644 --- a/main_vm/src/main/resources/templates/layout/adm/common/system/commoncode.html +++ b/main_vm/src/main/resources/templates/layout/adm/common/system/commoncode.html @@ -1,8 +1,3 @@ - - - 시나리오코드 @@ -77,12 +72,12 @@ fncDeleteCommonCode(); }); - // $('#listTable').on('page.dt', function(){ - // // var info = table.page.info(); - // // console.log( 'Showing page: '+info.page+' of '+info.pages ); - // // console.log( 'Showing page: ' ); - // modalUi(); - // }); + // $('#listTable').on('page.dt', function(){ + // // var info = table.page.info(); + // // console.log( 'Showing page: '+info.page+' of '+info.pages ); + // // console.log( 'Showing page: ' ); + // modalUi(); + // }); } ); @@ -141,7 +136,7 @@ }); } - function fncDeleteCommonCode(){ + function fncDeleteCommonCode() { var json = {}; var majorCode = $("#setMajorCode").val(); var custCode = $("#setCustCode").val(); @@ -182,7 +177,7 @@ datatype: "JSON", async: false, url: "" - // + "?serviceType=S" + // + "?serviceType=S" , success: function (data) { data.forEach(function (e, f) { @@ -340,8 +335,8 @@ // // if the second column cell is blank apply special formatting // - console.dir(row); - $(row).addClass('modalLoad').attr('rel','reg_edit_modal'); + console.dir(row); + $(row).addClass('modalLoad').attr('rel', 'reg_edit_modal'); } , columnDefs: [ @@ -534,7 +529,7 @@

공통 코드 리스트

- <%-- 삭제--%> + <%-- 삭제--%> 등록
@@ -667,7 +662,9 @@
- <%--

대분류

--%> + <%-- +

대분류

+ --%>

대분류

@@ -728,5 +725,3 @@ - - diff --git a/main_vm/src/main/resources/templates/layout/adm/common/system/cust.html b/main_vm/src/main/resources/templates/layout/adm/common/system/cust.html index 0fca88b..2075831 100644 --- a/main_vm/src/main/resources/templates/layout/adm/common/system/cust.html +++ b/main_vm/src/main/resources/templates/layout/adm/common/system/cust.html @@ -1,265 +1,258 @@ - - - - - - 고객사관리 - + + + 고객사관리 + - + - + -

ICOMSYS ADMIN

-

대시보드

-
+

ICOMSYS ADMIN

+

대시보드

+
+ +
+
+
-
-
- -
-
-
-
-
-

고객사 조회

-
-
-
- 조회 -
+
+
+
+
+

고객사 조회

+
+
+
+ 조회
-
- - - - - - - - - - + +
+
고객사명 -
- -
-
+ + + + + + + + + - -
고객사명 +
+ +
+
-
+ +
-
-
-
-

고객사 리스트

-
-
- 등록 -
+
+
+
+
+

고객사 리스트

+
+ 등록 +
+
-
-
- - - - - - - - - - - - - - - - - +
+ +
고객사명고객사안내멘트사용유무생성일
+ + + + + + + + + + + + + + + + - - - - -
고객사명고객사안내멘트사용유무생성일
-
-
+ + + + + +
-
- - - +
+ + diff --git a/main_vm/src/main/resources/templates/layout/adm/common/system/custInsert.html b/main_vm/src/main/resources/templates/layout/adm/common/system/custInsert.html index e8494ba..ee425a2 100644 --- a/main_vm/src/main/resources/templates/layout/adm/common/system/custInsert.html +++ b/main_vm/src/main/resources/templates/layout/adm/common/system/custInsert.html @@ -1,532 +1,633 @@ - - - - - - - 고객사화면 - - - -
- -
+ + + 고객사화면 + + + +
+ +
+ + + + +
+
+ +
- if (serviceGroup.length < 1) { - $.utils.warning('서비스코드를 입력해주세요.'); - return; - } - var regType = /^[A-Za-z0-9]*$/; - if (!regType.test(serviceGroup)) { - $.utils.warning('영문, 숫자만입력가능합니다.'); - return; - } + +
+
+
+
+

고객사 등록

+
+
+
+ + + + + + + + + + + + + + + + + + + + +
고객사명 * +
+ +
+
고객사코드 * +
+ + + 중복확인 +
+
사용여부 * +
+ +
+
+
+
- var yn = $.ajax({ - type: "GET", - contentType: "application/json; charset=utf-8", - datatype: "JSON", - async: false, - url: '/admin/common/system/cust/service/doubleCheck' + '?serviceGroup=' + serviceGroup, - success: function (data) { - if (data === 'Y') { - // alert("사용할수있는 코드입니다") - $.utils.success('사용할수있는 코드입니다.'); - // $.utils.warning("사용할수없는 코드입니다."); - } else { - $.utils.warning("사용할수없는 코드입니다."); - // alert("사용할수없는 코드입니다") - } - } - }); - // console.log(JSON.stringify(yn.responseText)); - $('#newCustCodeDoubleCheck').val(yn.responseText); - $('#newServiceGroupDoubleCheck').val(yn); - }; +
+
+
+

서비스 그룹 *

+
+
+ 추가 +
+
- function listgo() { - document.location.href = '/view/admin/common/system/cust/manage.do'; - } +
+
    +
+
+
- -
-
- +
+
+ 취소 + 저장 +
+
+
- -
-
-
-
-

고객사 등록

-
-
+ +
- - - - - - + diff --git a/main_vm/src/main/resources/templates/layout/adm/common/system/custUpdate.html b/main_vm/src/main/resources/templates/layout/adm/common/system/custUpdate.html index 190f611..2b6ce34 100644 --- a/main_vm/src/main/resources/templates/layout/adm/common/system/custUpdate.html +++ b/main_vm/src/main/resources/templates/layout/adm/common/system/custUpdate.html @@ -1,442 +1,119 @@ - - - - - - - 고객사화면 - - - -
- -
- - - - +
+
+ +
- -
-
- + +
+
+
+
+

고객사 등록

+
+
+
+ + + + + + + + + + + + + + + + + + + + +
고객사명 * +
+ +
+
고객사코드 * +
+ + + <%-- 중복확인--%> +
+
사용여부 * +
+ +
+
+
- -
-
-
-
-

고객사 등록

-
+
+
+
+

서비스 그룹 *

+
+
+ 추가
+
+ + +
+
    +
+
+
+ +
+
+ 취소 + 저장 +
+
+
+
+ + +
- - - - - - + diff --git a/main_vm/src/main/resources/templates/layout/adm/common/system/groupAuth.html b/main_vm/src/main/resources/templates/layout/adm/common/system/groupAuth.html index 14e78a4..589a6de 100644 --- a/main_vm/src/main/resources/templates/layout/adm/common/system/groupAuth.html +++ b/main_vm/src/main/resources/templates/layout/adm/common/system/groupAuth.html @@ -1,529 +1,521 @@ - - - - - - - 그룹별권한 - - - - + "plugins": ["checkbox"] + }); + }, "1") - + // $('#newTreeWrap').jstree(true).settings.core.data = treeData; + $('#newTreeWrap').jstree('refresh'); -

ICOMSYS ADMIN

-

대시보드

-
+ } + }); + + + } + + + var PagingDataTable = function () { + // console.log("log - " + JSON.stringify({"page": "0", "size": "10"})); + var paging = JSON.stringify({'page': 0, 'size': 10}) + $('#listTable').DataTable( + { + ajax: { + url: '/admin/common/system/groupAuth/list', + contentType: "application/json; charset=utf-8", + type: "POST", + dataType: "JSON", + async: false, + data: function (data) { + var json = {}; + if (data) { + json.page = data.start / data.length; + json.size = 10; + json.serviceGroup = $("#serviceGroup option:selected").val(); + json.codeText = $('#codeText').val(); + } else { + json = JSON.stringify({'page': 0, 'size': 10}); + } + return JSON.stringify(json); + } + , + dataFilter: function (data) { + var jsons = jQuery.parseJSON(data); + // console.log(JSON.stringify(data)); + var json = {}; + json.recordsTotal = jsons.getTotal; + json.recordsFiltered = jsons.getTotal; + json.data = jsons.getList; + // console.log(json); + return JSON.stringify(json); + } + }, + order: [0, "asc"], + scrollX: false, + scrollY: false, + autoWidth: false, + searching: false, + bProcessing: true, + sProcessing: true, + bServerSide: true, + sDom: '<"row view-filter"<"col-sm-12"<"pull-left"><"pull-right"><"clearfix">>>t<"row view-pager"<"col-sm-12"<"text-center"pi>>>', + columns: [ + {data: "serviceGroup"}, + {data: "serviceGroupName"}, + {data: "authGroupSeq"}, + {data: "policyGroupName"}, + {data: "policyGroupDesc"}, + {data: "custCode"}, + {data: "registDate"} + + ], + columnDefs: [ + { + targets: 0, + visible: false, + searchable: false, + orderable: false, + render: function (data) { + return '' + data + ''; + }, + }, + { + targets: 1, + orderable: false, + render: function (data) { + return '' + data + ''; + } + }, + { + targets: 2, + visible: false, + searchable: false, + orderable: false, + render: function (data) { + return '' + data + ''; + } + }, + { + targets: 3, + orderable: false, + render: function (data) { + return '' + data + ''; + } + }, + { + targets: 4, + orderable: false, + render: function (data) { + return '' + data + ''; + } + }, + { + targets: 5, + visible: false, + searchable: false, + orderable: false, + render: function (data) { + return ''; + } + }, + { + targets: 6, + orderable: false, + render: function (data, type, full, meta) { + // var arr = data.slice(); + // return '' + arr[0] + "-" + arr[1] + "-" + arr[2] + ''; + return '' + $.utils.sliceDateTimeFormat(data) + ''; + } + } + ] + } + ) + }; + + function fnCustSearchBtn() { + $('#listTable').DataTable().ajax.reload(); + }; + + + + + + +

ICOMSYS ADMIN

+

대시보드

+
+ +
+ + +
+
- -
-
- -
- -
-
-
-
-

그룹별권한 조회

-
-
-
- 조회 -
+
+
+
+
+

그룹별권한 조회

+
+
+
+ 조회
+
-
- +
+
+ + + + + + + + + + + + + + + +
시나리오그룹 +
+ +
+ 		권한명 +
+ +
+
+
+
+
+
+
+

그룹별권한 리스트

+
+
+ 등록 +
+
+ +
+
+ - - - - + + + + + + - + - - - - + + + + + + + + +
시나리오그룹 -
- -
- 		권한명 -
- -
- 		서비스코드시나리오그룹명권한번호권한명권한설명고객사코드생성일
-
-
-
-
-
-

그룹별권한 리스트

-
-
- 등록 -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
서비스코드시나리오그룹명권한번호권한명권한설명고객사코드생성일
- -
+
-
+
+ - - -
-
- 저장 -
+
+
+ 저장
+
-
- close -
+
+ close
+
- - - + diff --git a/main_vm/src/main/resources/templates/layout/adm/common/system/userView.html b/main_vm/src/main/resources/templates/layout/adm/common/system/userView.html index f22613e..97f5e74 100644 --- a/main_vm/src/main/resources/templates/layout/adm/common/system/userView.html +++ b/main_vm/src/main/resources/templates/layout/adm/common/system/userView.html @@ -1,329 +1,403 @@ - - - + + + 사용자관리 + - - - 사용자관리 - + - + +

ICOMSYS ADMIN

+
+ +
- + -

ICOMSYS ADMIN

-
+
+
- - -
-
- -
- -
-
-
-
-

사용자 수정

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
사용자 ID * -
- - -
-
비밀번호 변경* -
- -
-
비밀번호 오류회수* -
- - 오류회수 초기화 -
-
이름 * -
- -
-
사용여부 * -
- -
-
이메일 주소 -
- -
-
핸드폰 번호 -
- -
-
등급선택 -
- -
-
+
+
+
+
+

사용자 수정

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
사용자 ID * +
+ + +
+
비밀번호 변경* +
+ +
+
비밀번호 오류회수* +
+ + 오류회수 초기화 +
+
이름 * +
+ +
+
사용여부 * +
+ +
+
이메일 주소 +
+ +
+
핸드폰 번호 +
+ +
+
등급선택 +
+ +
+
+
+
-
- -
-
- 추가 -
-
+
-
-
    -
+
+
+ 추가
+
+
+
    +
-
-
- 취소 - 저장 -
+ +
+
+
+ 취소 + 저장
-
+
+ - +
-
-
- 저장 -
+
+
+ 저장
+
-
- close -
+
+ close
+
- - - + diff --git a/main_vm/src/main/resources/templates/layout/fragments/sidebar.html b/main_vm/src/main/resources/templates/layout/fragments/sidebar.html index 6ec7810..575d6bf 100644 --- a/main_vm/src/main/resources/templates/layout/fragments/sidebar.html +++ b/main_vm/src/main/resources/templates/layout/fragments/sidebar.html @@ -3,12 +3,6 @@ - -
@@ -28,10 +22,11 @@ diff --git a/main_vm/src/main/resources/templates/layout/main.html b/main_vm/src/main/resources/templates/layout/main.html new file mode 100644 index 0000000..cadf0a3 --- /dev/null +++ b/main_vm/src/main/resources/templates/layout/main.html @@ -0,0 +1,9 @@ + + + +
+
+ + \ No newline at end of file diff --git a/main_vm/src/main/resources/templates/layout/signin.html b/main_vm/src/main/resources/templates/layout/signin.html index d2f95b0..7ddf814 100644 --- a/main_vm/src/main/resources/templates/layout/signin.html +++ b/main_vm/src/main/resources/templates/layout/signin.html @@ -140,8 +140,9 @@ }) .complete(function (data) { if (data.status == 200) { + console.log(data); document.cookie = 'accessToken=' + data.responseText + '; path=/;'; - + console.log("cookie ="+document.cookie) document.signinInfoForm.action = '/adm/main/actionSecurityLogin.do'; document.signinInfoForm.submit(); } else if (data.status == 400) {