Commit e8291be2 authored by frank.xa.zhang's avatar frank.xa.zhang

add admin-- frank

parent 508a5732
...@@ -370,15 +370,15 @@ ...@@ -370,15 +370,15 @@
<div class="org-chart-container"></div> <div class="org-chart-container"></div>
</div> </div>
<div class="org-chart-info-bottom col-sm-12"> <div class="org-chart-info-bottom col-sm-12">
<div class="org-chart-info-shareholders col-sm-3" style="width: 32%;border: 1px solid #e4e4e4"> <div class="org-chart-info-shareholders col-sm-3 data-grid-border">
<div class="org-chart-info-shareholders-header"><span class="lable-text">{{'Shareholders'|translate}}</span></div> <div class="org-chart-info-shareholders-header"><span class="lable-text">{{'Shareholders'|translate}}</span></div>
<div id="orgShareholdersGridContainer" dx-data-grid="orgShareholdersGridOptions" style="margin-top: 10px;"></div> <div id="orgShareholdersGridContainer" dx-data-grid="orgShareholdersGridOptions" style="margin-top: 10px;"></div>
</div> </div>
<div class="org-chart-info-subsidaries col-sm-3" style="width: 32%;border: 1px solid #e4e4e4;margin-left: 25px"> <div class="org-chart-info-subsidaries col-sm-3 data-grid-border" style="margin-left: 25px">
<div class="org-chart-info-shareholders-header"><span class="lable-text">{{'Subsidaries'|translate}}</span></div> <div class="org-chart-info-shareholders-header"><span class="lable-text">{{'Subsidaries'|translate}}</span></div>
<div id="orgSubsidariesGridContainer" dx-data-grid="orgSubsidariesGridOptions" style="margin-top: 10px;"></div> <div id="orgSubsidariesGridContainer" dx-data-grid="orgSubsidariesGridOptions" style="margin-top: 10px;"></div>
</div> </div>
<div class="org-chart-info-directors col-sm-3" style="width: 32%;border: 1px solid #e4e4e4;margin-left: 25px"> <div class="org-chart-info-directors col-sm-3 data-grid-border" style="margin-left: 25px">
<div class="org-chart-info-shareholders-header"><span class="lable-text">{{'Directors'|translate}}</span></div> <div class="org-chart-info-shareholders-header"><span class="lable-text">{{'Directors'|translate}}</span></div>
<div id="orgDirectorsGridContainer" dx-data-grid="orgDirectorsGridOptions" style="margin-top: 10px;"></div> <div id="orgDirectorsGridContainer" dx-data-grid="orgDirectorsGridOptions" style="margin-top: 10px;"></div>
</div> </div>
......
...@@ -784,6 +784,11 @@ ...@@ -784,6 +784,11 @@
font-size: large; font-size: large;
} }
.data-grid-border{
width: 32%;
border: 1px solid #e4e4e4;
}
.org-chart-info-shareholders{ .org-chart-info-shareholders{
} }
......
...@@ -17,7 +17,7 @@ frameworkModule.controller('AppMainController', ['$rootScope', '$scope', '$log', ...@@ -17,7 +17,7 @@ frameworkModule.controller('AppMainController', ['$rootScope', '$scope', '$log',
}; };
$scope.gotoChart = function () { $scope.gotoChart = function () {
// $state.go(); $state.go('organizationFullChart');
}; };
}; };
......
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