seimin 2 anos atrás
pai
commit
6b8d47598b

+ 2 - 1
assets/js/controllers/mainCtrl.js

@@ -611,7 +611,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
611 611
       // }
612 612
       var perfix = "sidebar.nav.";
613 613
       var toTransKeypageTitle = perfix + $rootScope.currTitle;
614
-      return $rootScope.app.name + ' - ' + ($filter('translate')(toTransKeypageTitle) || $rootScope.app.description);
614
+      // return $rootScope.app.name + ' - ' + ($filter('translate')(toTransKeypageTitle) || $rootScope.app.description);
615
+      return $rootScope.app.name;
615 616
     };
616 617
 
617 618
 

+ 1 - 1
assets/js/controllers/system/sysconfigCtrl.js

@@ -250,7 +250,7 @@ app.controller("sysconfigCtrl", ["$parse", "$rootScope", "$scope", "$state", "$t
250 250
         var arr = {};
251 251
         arr.systemConfiguration = [];
252 252
         angular.forEach(a.baseConfig, function (v) {
253
-            if (v.keyconfig == 'pwd' || v.keyconfig == 'conversationSeconds') {
253
+            if (v.keyconfig == 'pwd' || v.keyconfig == 'conversationSeconds' || v.keyconfig == 'systemName' || v.keyconfig == 'largeScreenName') {
254 254
                 arr.systemConfiguration.push(v);//用户默认密码,登录有效时长
255 255
             }
256 256
         })

+ 5 - 3
assets/js/main.js

@@ -58,6 +58,8 @@ app.run(['$rootScope', '$state', '$stateParams', '$auth', '$http', '$cookieStore
58 58
         // set below basic information
59 59
         // $rootScope.audioiIp="http://218.197.181.213:8080"
60 60
         $rootScope.app = {
61
+            logo: '',
62
+            favicon: '',
61 63
             name: '', // name of your project
62 64
             author: '', // author's name or company name
63 65
             description: '', // brief description
@@ -83,12 +85,12 @@ app.run(['$rootScope', '$state', '$stateParams', '$auth', '$http', '$cookieStore
83 85
             }
84 86
         };
85 87
         // 获取项目名称----网络与信息化运维管理系统
86
-        $rootScope.getProjectName = function () {
87
-            api_login.getProjectName().then(function (res) {
88
+        $rootScope.getSysNameAndLogo = function () {
89
+            api_login.getSysNameAndLogo().then(function (res) {
88 90
                 $rootScope.app.name = $rootScope.app.author = $rootScope.app.description = res.sysName;
89 91
             })
90 92
         }
91
-        $rootScope.getProjectName();
93
+        $rootScope.getSysNameAndLogo();
92 94
         // $http.defaults.headers.common["X-Auth-Token"] = $cookieStore.get('Auth-Token') || null;
93 95
         // $http.defaults.headers.common["X-Auth-Token"] = $cookieStore.get('Auth-Token') || null;
94 96
         Restangular.setErrorInterceptor(function (element, operation, what, url, headers, queryParams) {