Merge pull request #422 from lepdou/ConfigPage404

apollo-portal/src/main/resources/static/config.html

@@ -20,8 +20,17 @@
     <!--具体配置信息-->
     <div class="row config-info-container">
 
-        <!--tag导航-->
-        <div class="col-md-3 col-xs-3 col-sm-3" ng-controller="ConfigBaseInfoController">
+        <div ng-controller="ConfigBaseInfoController">
+
+            <div class="J_appNotFound hidden row text-center app-not-found" ng-show="notFoundApp">
+                <img src="img/404.png">
+                <br>
+                <p>
+                    <span ng-bind="pageContext.appId"></span> 不存在，<a href="/app.html">点击创建</a>
+                </p>
+            </div>
+
+            <div class="J_appFound hidden col-md-3 col-xs-3 col-sm-3" ng-show="!notFoundApp">
                 <div id="treeview"></div>
                 <!--app info-->
                 <section class="panel">
@@ -66,6 +75,7 @@
 
                     </div>
                 </section>
+
                 <a class="list-group-item" ng-show="missEnvs.length > 0" ng-click="createAppInMissEnv()">
                     <div class="row icon-text icon-plus-orange">
                         <p class="btn-title ng-binding">补缺环境</p>
@@ -99,7 +109,7 @@
 
 
             </div>
-
+        </div>
 
         <!--namespaces-->
         <div class="col-md-9 col-xs-9 col-sm-9 config-item-container hide" ng-controller="ConfigNamespaceController">

apollo-portal/src/main/resources/static/scripts/controller/config/ConfigBaseInfoController.js

 application_module.controller("ConfigBaseInfoController",
                               ['$rootScope', '$scope', '$location', 'toastr', 'AppService', 'PermissionService',
-                               'AppUtil',
-                               function ($rootScope, $scope, $location, toastr, AppService, PermissionService,
+                               'AppUtil', ConfigBaseInfoController]);
+
+function ConfigBaseInfoController($rootScope, $scope, $location, toastr, AppService, PermissionService,
                     AppUtil) {
 
     var appId = AppUtil.parseParams($location.$$url).appid;
@@ -40,14 +41,28 @@ application_module.controller("ConfigBaseInfoController",
 
     $rootScope.pageContext = pageContext;
 
-                                   ////// load cluster nav tree //////
+    $scope.notFoundApp = true;
+    ////// app info //////
+    AppService.load($rootScope.pageContext.appId).then(function (result) {
+        $scope.notFoundApp = false;
+
+        $scope.appBaseInfo = result;
+        $scope.appBaseInfo.orgInfo = result.orgName + '(' + result.orgId + ')';
+
+        loadNavTree();
+
+        $(".J_appFound").removeClass("hidden");
+    }, function (result) {
+        $(".J_appNotFound").removeClass("hidden");
+    });
 
+    function loadNavTree() {
         AppService.load_nav_tree($rootScope.pageContext.appId).then(function (result) {
             var navTree = [];
             var nodes = AppUtil.collectData(result);
 
             if (!nodes || nodes.length == 0) {
-                                           toastr.error("加载环境信息出错");
+                toastr.error("系统出错,请重试或联系系统负责人");
                 return;
             }
             //default first env if session storage is empty
@@ -149,24 +164,16 @@ application_module.controller("ConfigBaseInfoController",
             $rootScope.envMapClusters = envMapClusters;
 
         }, function (result) {
-                                       toastr.error(AppUtil.errorMsg(result), "加载导航出错");
-                                   });
-
-                                   ////// app info //////
-
-                                   AppService.load($rootScope.pageContext.appId).then(function (result) {
-                                       $scope.appBaseInfo = result;
-                                       $scope.appBaseInfo.orgInfo = result.orgName + '(' + result.orgId + ')';
-                                   }, function (result) {
-                                       toastr.error(AppUtil.errorMsg(result), "加载App信息出错");
+            toastr.error(AppUtil.errorMsg(result), "系统出错,请重试或联系系统负责人");
         });
+    }
 
     ////// 补缺失的环境 //////
     $scope.missEnvs = [];
     AppService.find_miss_envs($rootScope.pageContext.appId).then(function (result) {
         $scope.missEnvs = AppUtil.collectData(result);
     }, function (result) {
-                                       console.log(AppUtil.errorMsg(result));
+        
     });
 
     $scope.createAppInMissEnv = function () {
@@ -211,5 +218,5 @@ application_module.controller("ConfigBaseInfoController",
         $("#masterNoPermissionDialog").modal('show');
     }
 
-                               }]);
+}
 

apollo-portal/src/main/resources/static/styles/common-style.css

@@ -541,3 +541,8 @@ table th {
     border-color: #a94442;
 }
 
+.app-not-found {
+    padding-top: 50px;
+    font-size: 18px;
+}
+

apollo-portal/src/main/resources/static/views/component/namespace-panel.html

@@ -57,7 +57,7 @@
                     <img src="img/sync.png">
                     同步配置
                 </a>
-                <a type="button" class="btn btn-danger btn-sm J_tableview_btn"
+                <a type="button" class="btn btn-default btn-sm J_tableview_btn"
                    data-tooltip="tooltip" data-placement="bottom" title="您没有任何配置权限,请申请"
                    ng-click="showNoModifyPermissionDialog()"
                    ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission">