Skip to content

T
traffic-front
Commit fa8f0004 authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

add UI page -- frank

parent ecba8143
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 58 deletions
atms-web/src/main/webapp/Scripts/module-part4.js
View file @ fa8f0004
......@@ -58,5 +58,22 @@ var infrastructureModule = angular.module('app.infrastructure', ["isteven-multi-
sticky: true
});
$stateProvider.state({
name: 'organizationFullChart',
url: '/organizationFullChart',
views: {
'@': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.infrastructure]);
}],
template: '<organization-full-chart></organization-full-chart>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.infrastructure),
deepStateRedirect: true,
sticky: true
});
$stickyStateProvider.enableDebug(true);
}]);
\ No newline at end of file
atms-web/src/main/webapp/app-resources/css/nav.css
View file @ fa8f0004
......@@ -42,6 +42,17 @@
/*padding-right: 35px;*/
}
.sub-button {
font-size: 15px;
position: relative;
float: left;
height: 55px;
line-height: 55px;
width: 300px;
text-align: center;
/*top: -19px;*/
}
.nav-element-left {
font-size: 15px;
position: relative;
......@@ -115,7 +126,7 @@
}
.nav-sub-container.second {
padding-left: 550px;
padding-left: 350px;
}
.nav-sub-container.first:after {
......@@ -132,7 +143,7 @@
float: left;
height: 55px;
line-height: 55px;
width: 140px;
width: 140px;
text-align: center;
}
......@@ -163,7 +174,7 @@
}
.nav-sub-container .element-left a.active {
color: #e0301e;
color: #e0301e;
}
.nav-icon-color {
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationFullChart/organization-full-chart.ctrl.js 0 → 100644
View file @ fa8f0004
infrastructureModule.controller('organizationFullChartController', ['$scope', function ($scope) {
'use strict';
(function initialize() {
$log.debug('organizationFullChartController.ctor()...');
})();
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/organizationFullChart/organization-full-chart.html 0 → 100644
View file @ fa8f0004
<div class="organization-full-chart-mapper">
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/organizationFullChart/organization-full-chart.js 0 → 100644
View file @ fa8f0004
infrastructureModule.directive('organizationFullChart', ['$log', function ($log) {
'use strict';
$log.debug('organizationFullChart.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/admin/infrastructure/organizationFullChart/organization-full-chart.html' + '?_=' + Math.random(),
replace: true,
scope: {},
controller: 'organizationFullChartController',
link: function (scope, element, attrs, $element) {
}
}
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ fa8f0004
......@@ -5,7 +5,8 @@
$scope.expanded = false;
$scope.showOrgs = true;
$scope.ShowSingle = false;
$scope.showSingle = false;
$scope.selectNodeCount=0;
$scope.startDate = new Date(2019, 0, 1);
$scope.endDate = new Date(2019, 11, 31);
......@@ -2430,6 +2431,11 @@
// 选中事件
// $scope.selectCompany = org;
orgService.getSingleOrg(org.id).success(function (data) {
if($scope.selectNodeCount>1) {
$scope.showOrgs = false;
$scope.showSingle = true;
}
$scope.selectNodeCount++;
$scope.selectCompany = data;
$scope.selectCompany.isActiveStr = $translate.instant(isActiveMap[$scope.selectCompany.isActive]);
//$log.debug("org.regionID: " + org.regionID);
......@@ -3811,15 +3817,19 @@
$scope.showOrgs = false;
console.log(org);
$scope.selectCompany = org;
$scope.ShowSingle = true;
$scope.showSingle = true;
};
$scope.showAll = function () {
$scope.showOrgs = true;
$scope.ShowSingle = false;
$scope.showSingle = false;
$scope.selectCompany = {};
};
$scope.uploadAttach=function () {
};
(function initialize() {
$log.debug('organizationManageController.ctor()...');
//scope model
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.less
View file @ fa8f0004
......@@ -436,11 +436,11 @@
.quarter-div{
width: 50%;
float: left;
padding: 30px 10px 10px 10px;
padding: 30px 10px 10px 0px;
.form-group{
padding-top: 7px;
padding-left: 0;
line-height: 2em;
line-height: 3em;
margin-left: -15px;
margin-right: -15px;
}
......@@ -461,6 +461,15 @@
display: block;
}
.attachment-container{
.attachment-header{
}
.attachment-option{
height: 40px;
}
}
.picture-panel {
margin-left: 0px;
margin-right: -200px;
......@@ -748,6 +757,46 @@
}
.org-compliance-info{
max-height: 100%;
.org-compliance-info-mapper{
.org-compliance-info-header{
margin-top: 10px;
.compliance-lable{
font-weight: bold;
font-size: large;
}
}
}
}
.org-chart-info{
.org-chart-info-mapper{
.org-chart-info-top{
padding-top: 450px;
height: 50%;
}
.org-chart-info-bottom{
height: 50%;
.lable-text{
font-weight: bold;
font-size: large;
}
.org-chart-info-shareholders{
}
.org-chart-info-subsidaries{
}
.org-chart-info-directors{
}
}
}
}
.accountset-modal-table {
height: 100%;
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.ctrl.js
View file @ fa8f0004
......@@ -101,9 +101,9 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log',
$('.nav-sub-container').hide();
$('.nav-sub-container.' + className).show();
}, function () {
var className = $(this).attr('hover-show');
setTimeout(function () { //等待 nav-sub-container hover 设置上对应的值
if (enterSubHeader) {
var className = $(this).attr('hover-show');
if (!enterSubHeader) {
$('.nav-sub-container.' + className).hide();
}
}, 200);
......@@ -116,35 +116,6 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log',
$('.nav-sub-container').hide();
});
// 是否显示admin齿轮，校验是否有WebAdmin权限，不是校验is_admin字段
// todo 增值税申报和报表审批菜单没有做权限管理，可以在这里一起加上
var list = [];
list.push(constant.adminPermission.WebAdmin);
list.push(constant.vatPermission.code);
list.push(constant.menuRecordManagePermission.code);
list.push(constant.menuListApprovalPermission.code);
list.push(constant.batchImportPermisson.batchImportPermissonCode);
//税享权限
list.push(constant.InteractionPermission.code);
$scope.$root.checkUserPermissionList(list).success(function (data) {
$scope.adminSettingShow = data[constant.adminPermission.WebAdmin];
$scope.menuCalendarShow = true;
$scope.menuEntityManagementShow = true;
// $scope.vatShow = data[constant.vatPermission.code];
// $scope.menuRecordManageShow = data[constant.menuRecordManagePermission.code];
// $scope.menuListApprovalShow = data[constant.menuListApprovalPermission.code];
// $scope.batchImportShow = data[constant.batchImportPermisson.batchImportPermissonCode];
// //税享权限
// $scope.InteractionShow = data[constant.InteractionPermission.code];
});
};
//设置 菜单选中状态
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ fa8f0004
......@@ -5,13 +5,13 @@
<span style="font-weight:bold;">Entity Info Database</span>
</div>
<div class="nav-element-left" hover-show="first" atms-permission permission-control-type="ngIf" permission-code="{{vatPermission.taxCalendarDisplay.menuControl}}">
<div class="nav-element-left">
<a ui-sref-active="active" ui-sref="taxCalendar">
<span id="taxCalendar" class="nav-icon-color">{{'MenuCalendar' | translate}}</span>
</a>
</div>
<div class="nav-element-left" hover-show="second" ng-if="menuEntityManagementShow">
<a ui-sref="organization">
<div class="nav-element-left">
<a ui-sref="organization" hover-show="second">
<span class="nav-icon-color">{{'MenuEntityManagement' | translate}}</span>
</a>
</div>
......@@ -79,25 +79,13 @@
</div>
<div class="nav-sub-container second">
<div class="element-left">
<a ui-sref-active="active" ui-sref="organization" ng-if="specialUser!=='simon'">
<span class="nav-sub-icon-color">{{'MenuEntityInformation' | translate}}</span>
</a>
<a ng-if="specialUser==='simon'">
<span class="nav-sub-icon-color">{{'MenuEntityInformation' | translate}}</span>
<div class="sub-bar-content">
<div class="sub-button">
<a ui-sref-active="active" ui-sref="organizationFullChart">
<span class="nav-sub-icon-color">{{'organizationFullChart' | translate}}</span>
</a>
</div>
<div class="element-left">
<a ui-sref-active="active" ui-sref="ownershipChart" ng-if="specialUser!=='simon'">
<span class="nav-sub-icon-color">{{'MenuOwnershipChart' | translate}}</span>
</a>
<a ng-if="specialUser==='simon'">
<span class="nav-sub-icon-color">{{'MenuOwnershipChart' | translate}}</span>
</a>
</div>
</div>
<!--<div class="nav-sub-container second">-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment