OWL ITS + 탐지시스템(인터넷 진흥원)
이민희
2021-11-12 7410b4773ab3be6650163dde9bfb70870136d166
$injector 오류 해결
5개 파일 변경됨
36 ■■■■■ 파일 변경됨
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js 4 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js 21 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js 4 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/main.js 3 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/companyField/companyFieldList.html 4 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -352,6 +352,10 @@
                                            }
                                            break;
                                        case "DEPARTMENT_EX":
                                            makeTag += "<div style='margin-top: 5px;'>" + scope.data.departmentDescription + "</div>";
                                            break;
                                        case "DEPARTMENT_COUNT":
                                            if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) {
                                                makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modifyDepartmentCount(data.id)'>" + scope.data.departmentCount + "</span>";
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -17,8 +17,8 @@
                    makeTableConfigs : makeTableConfigs, //  테이블 설정
                    initSearch : initSearch, //검색 조건 초기화
                    add : add, //업체 생성
                    makeSearchConditions : makeSearchConditions, //엑셀 다운로드
                    removes : removes, //업체 삭제
                    makeSearchConditions : makeSearchConditions //엑셀 다운로드
                };
                //  변수
@@ -52,6 +52,13 @@
                function initSearch() {
                    $scope.vm.search.name = "";
                    $scope.fn.getPageList(0);
                }
                //  업체 관리 검색 조건을 만든다.
                function makeSearchConditions() {
                    return{
                        name: $scope.vm.search.name
                    };
                }
                //  사용자 정의 필드 목록 테이블 설정
@@ -107,9 +114,8 @@
                        currentPage = selectedPage;
                    }
                    var conditions = {
                        name : $scope.vm.search.name //업체명
                    };
                    //  업체 관리 검색 조건을 만든다.
                    var conditions = $scope.fn.makeSearchConditions();
                    //테이블 리스트 데이터 컨트롤러 요청
                    CompanyField.find($resourceProvider.getContent(conditions,
@@ -217,13 +223,6 @@
                                });
                            }
                        });
                }
                function makeSearchConditions() {
                    var conditions = {
                        name: $scope.vm.search.name
                    }
                    return conditions;
                }
                $scope.fn.makeTableConfigs();
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -71,7 +71,9 @@
                        .setHName("manageDepartment.departmentEx")
                        .setHWidth("width-100-p bold")
                        .setDAlign("text-center")
                        .setDName("departmentDescription"));
                        .setDName("departmentDescription")
                        .setDType("renderer")
                        .setDRenderer("DEPARTMENT_EX"));
                    $scope.vm.tableConfigs2.push($tableProvider.config()
                        .setHName("manageDepartment.departmentCount")
                        .setHWidth("width-120-p")
src/main/webapp/scripts/main.js
@@ -553,7 +553,8 @@
    'workflowStatusService',
    'companyFieldService',
    'ispFieldService',
    'hostingFieldService'
    'hostingFieldService',
    'userWorkspaceService'
], function ($, angular, domReady, app, sortable, crypto) {
    //  대시보드에서 Sortable 인식 못하는 문제 해결
    window.Sortable = sortable;
src/main/webapp/views/companyField/companyFieldList.html
@@ -67,7 +67,7 @@
                        <div class="col-5 text-right" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')">
                            <form class="form-inline justify-content-sm-end pull-right" method="post"
                                  action="/companyField/downloadExcel"
                                  name="companyFieldList">
                                  name="companyFieldListForm">
                                <input type="hidden" name="conditions">
                                <div class="btn-group">
                                    <button aria-expanded="false" aria-haspopup="true"
@@ -76,7 +76,7 @@
                                    </button>
                                    <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
                                         x-placement="bottom-start">
                                        <a class="dropdown-item cursor" form-submit="companyFieldList" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" form-submit="companyFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">엑셀 다운로드</span></a>
                                        <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">삭제</span></a>
                                    </div>
                                </div>