Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-web/src/main/webapp/app/framework/app-nav/app-nav.ctrl.js

@@ -121,6 +121,7 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log',
             list.push(constant.analysisPermisson.code);
             list.push(constant.menuRecordManagePermission.code);
             list.push(constant.menuListApprovalPermission.code);
+            list.push(constant.batchImportPermisson.batchImportPermissonCode);
 
             $scope.$root.checkUserPermissionList(list).success(function (data) {
                 $scope.adminSettingShow = data[constant.adminPermission.WebAdmin];
@@ -130,6 +131,8 @@ frameworkModule.controller('AppNavController', ['$rootScope', '$scope', '$log',
                 $scope.analysisShow = data[constant.analysisPermisson.code];
                 $scope.menuRecordManageShow = data[constant.menuRecordManagePermission.code];
                 $scope.menuListApprovalShow = data[constant.menuListApprovalPermission.code];
+                $scope.batchImportShow = data[constant.batchImportPermisson.batchImportPermissonCode];
+
             });
 
         };

atms-web/src/main/webapp/app/framework/app-nav/app-nav.html

@@ -78,12 +78,12 @@
                 <!--</i>-->
             <!--</a>-->
         <!--</div>-->
-        <!--齿轮 进入管理入口-->
-        <div class="nav-element-right">
+        <div class="nav-element-right" ng-show="batchImportShow">
             <a ui-sref="overviewDataImp">
                 <i class="fa fa-circle-o-notch nav-icon-color"></i>
             </a>
         </div>
+        <!--齿轮 进入管理入口-->
         <div class="nav-element-right" ng-show="adminSettingShow">
             <a title="{{'settings'|translate}}" href="/admin" target="_blank">
                 <i class="fa fa-cog nav-icon-color"></i>

atms-web/src/main/webapp/app/framework/app-nav/app-nav.less

@@ -17,7 +17,7 @@
         }
     }
 
-    @media (max-width: 992px) {
+    @media (max-width: 1400px) {
         & {
             min-width: 100%;
             padding-left: 0;
@@ -45,10 +45,18 @@
             .link-sm-show {
                 display: inline-block;
             }
-
             p {
                 color: #333;
+            };
+
         }
     }
+}
+
+@media screen and (max-width: 1400px) {
+    .user-menu{
+        position:absolute!important;
+        top: 55px!important;
+        left: -50px!important;
     }
 }