fixed display issues -- frank

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -761,7 +761,7 @@
             $scope.addDirector = function () {
                 $scope.isShowDirectorModal2 = true;
             };
-            var secondGridHeight = 230;
+            var secondGridHeight = 240;
             $scope.directorGridOptions = {
                 bindingOptions: {
                     dataSource: 'directorDatasource'
@@ -1080,10 +1080,11 @@
                     {
                         dataField: "id",
                         allowHeaderFiltering: false,
+                        width:250,
                         caption: $translate.instant('operation'),
                         cellTemplate: function (container, options) {
                             try {
-                                $('<button type="button"  class="btn btn-in-grid" style="margin-top: -11px;" onclick = "downloadDocument(\'' + options.data.id + '\')"><i class="material-icons middle" style="vertical-align: text-bottom">modify</i>download</button>&nbsp;&nbsp;')
+                                $('<button type="button"  class="btn btn-in-grid" style="margin-top: -11px;" onclick = "downloadDocument(\'' + options.data.id + '\')"><i class="material-icons middle" style="vertical-align: text-bottom">edit</i>download</button>&nbsp;&nbsp;')
                                     .appendTo(container);
                                 $('<button type="button"  class="btn btn-in-grid" style="margin-top: -11px;" onclick = "deleteDocument(\'' + options.data.id + '\')"><i class="material-icons middle" style="vertical-align: text-bottom">delete</i>delete</button>&nbsp;&nbsp;')
                                     .appendTo(container);

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

@@ -84,7 +84,7 @@
                         </div>
                         <div class="right-option">
                             <!--<button type="button" id="organizationIsActiveBtn" class="btn" ng-class="{true:'btn-secondary', false:'btn-in-grid'}[!selectCompany.isActive]"-->
-                                    <!--ng-click="updateIsActive()" ng-disabled="!isCanOrganizationIsActiveBtn"><i ng-show="selectCompany.isActive" class="material-icons stop">block</i>{{selectCompany.isActiveStr}}-->
+                            <!--ng-click="updateIsActive()" ng-disabled="!isCanOrganizationIsActiveBtn"><i ng-show="selectCompany.isActive" class="material-icons stop">block</i>{{selectCompany.isActiveStr}}-->
                             <!--</button>-->
                             <!--<span class="right-operate"></span>-->
                         </div>
@@ -106,7 +106,7 @@
                                 {{'ChartInfo' | translate}}
                             </md-nav-item>
                         </md-nav-bar>
-                        <div class="ext-content" style="height:740px;margin-top: 10px">
+                        <div class="ext-content" style="height:713px;margin-top: 10px">
                             <div ng-show="currentNavItem==='page1'" class="org-basic-data-table">
                                 <div class="basic-org-info-wrapper">
                                     <div class="right-option">

atms-web/src/main/webapp/app/common/controls/org-shareholder-structure/org-shareholder-structure.less

+@line-color: rgba(17, 6, 6, 0.6);
+
 .org-shareholder-structure-wrapper {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
@@ -46,7 +48,6 @@
         }
 
         .node-line-right {
-          /*background-color: #fff;*/
           z-index: 1;
           position: absolute;
           top: -10px;
@@ -73,10 +74,11 @@
         }
 
         .focused {
-          background-color: rgba(255, 255, 0, 0.6);
+          //background-color: rgba(255, 255, 0, 0.6);
         }
 
         .edge {
+          display: none !important;
           color: rgba(0, 0, 0, 0.6);
         }
 
@@ -102,19 +104,19 @@
 
       .lines {
         .downLine {
-          background-color: rgba(17, 6, 6, 0.6);
+          background-color: @line-color;
         }
 
         .rightLine {
-          border-right-color: rgba(17, 6, 6, 0.6);
+          border-right-color: @line-color;
         }
 
         .leftLine {
-          border-left-color: rgba(17, 6, 6, 0.6);
+          border-left-color: @line-color;
         }
 
         .topLine {
-          border-top-color: rgba(17, 6, 6, 0.6);;
+          border-top-color: @line-color;
         }
       }