Browse Source

增加链接配置块

seimin 3 years ago
parent
commit
1dd5b4d261

+ 2 - 0
assets/js/controllers/customform/customformCtrl.js

@@ -9117,6 +9117,7 @@ appFormly.config(function config(formlyConfigProvider) {
9117
         //认证计费数据获取
9117
         //认证计费数据获取
9118
         $scope.sumInfo = {};
9118
         $scope.sumInfo = {};
9119
         function getSumInfo() {
9119
         function getSumInfo() {
9120
+          $scope.isHk = $rootScope.isHk;
9120
           if($rootScope.isHk){
9121
           if($rootScope.isHk){
9121
             //用户信息
9122
             //用户信息
9122
             api_webservice1.fetchDataList("queryUser", { "userId": $scope.model.incident.account }).then(function(response) {
9123
             api_webservice1.fetchDataList("queryUser", { "userId": $scope.model.incident.account }).then(function(response) {
@@ -14780,6 +14781,7 @@ appFormly.config(function config(formlyConfigProvider) {
14780
         SweetAlert,
14781
         SweetAlert,
14781
         moment
14782
         moment
14782
       ) {
14783
       ) {
14784
+        $scope.isHk = $rootScope.isHk;
14783
         $scope.roleidcode = true;
14785
         $scope.roleidcode = true;
14784
         // $scope.options.initialValue = undefined;
14786
         // $scope.options.initialValue = undefined;
14785
         if ($rootScope.user && $rootScope.user.role) {
14787
         if ($rootScope.user && $rootScope.user.role) {

+ 7 - 1
assets/js/controllers/loginCtrl.js

@@ -7,7 +7,13 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
7
         // 中南财大
7
         // 中南财大
8
         $rootScope.isZncd = document.domain === 'itsm.zuel.edu.cn';
8
         $rootScope.isZncd = document.domain === 'itsm.zuel.edu.cn';
9
         // 华科
9
         // 华科
10
-        $rootScope.isHk = document.domain === '192.168.3.110';
10
+        $rootScope.isHk = document.domain === '192.168.3.69';
11
+        if($rootScope.isZncd){
12
+            localStorage.setItem('version_qd','isZncd');
13
+        }
14
+        if($rootScope.isHk){
15
+            localStorage.setItem('version_qd','isHk');
16
+        }
11
         //判断项目归属 end
17
         //判断项目归属 end
12
         // 是否单点登录
18
         // 是否单点登录
13
         $scope.isSSo = location.search.length > 0;
19
         $scope.isSSo = location.search.length > 0;

+ 3 - 0
assets/js/controllers/mainCtrl.js

@@ -47,6 +47,9 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
47
     // 监听路由
47
     // 监听路由
48
     $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
48
     $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
49
       console.log(event, toState, toParams, fromState, fromParams)
49
       console.log(event, toState, toParams, fromState, fromParams)
50
+      if(localStorage.getItem('version_qd')){
51
+        $rootScope[localStorage.getItem('version_qd')] = true;
52
+      }
50
       if ((toState.name == 'app.incident.chart' || toState.name == 'app.incident.editor') &&
53
       if ((toState.name == 'app.incident.chart' || toState.name == 'app.incident.editor') &&
51
         fromState.name) {
54
         fromState.name) {
52
         console.log($rootScope.jry_state);
55
         console.log($rootScope.jry_state);

+ 7 - 0
assets/js/controllers/system/sysconfigCtrl.js

@@ -19,6 +19,9 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
19
                 arr.systemConfiguration.push(v);//用户默认密码,登录有效时长
19
                 arr.systemConfiguration.push(v);//用户默认密码,登录有效时长
20
             }
20
             }
21
         })
21
         })
22
+        angular.forEach(a.linkConfig, function (v) {
23
+            arr.systemConfiguration.push(v);
24
+        })
22
         arr.systemConfiguration.push(a.repairMain);//报修主体
25
         arr.systemConfiguration.push(a.repairMain);//报修主体
23
         arr.systemConfiguration.push(a.ifCreate);//自动建单
26
         arr.systemConfiguration.push(a.ifCreate);//自动建单
24
         arr.systemConfiguration.push(a.reqHasCategory);//是否选择事件分类
27
         arr.systemConfiguration.push(a.reqHasCategory);//是否选择事件分类
@@ -80,6 +83,7 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
80
                 console.log(a.myData);
83
                 console.log(a.myData);
81
                 a.baseConfig = [];//基本配置
84
                 a.baseConfig = [];//基本配置
82
                 a.cacheConfig = [];//缓存配置
85
                 a.cacheConfig = [];//缓存配置
86
+                a.linkConfig = [];//链接配置
83
                 a.repairMain = {};//报修主体
87
                 a.repairMain = {};//报修主体
84
                 console.log(a.myData,77777)
88
                 console.log(a.myData,77777)
85
                 angular.forEach(a.myData, function (v, i) {
89
                 angular.forEach(a.myData, function (v, i) {
@@ -89,6 +93,9 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
89
                     if (v.keyconfig == 'userRedisIp' || v.keyconfig == 'userRedisPort') {
93
                     if (v.keyconfig == 'userRedisIp' || v.keyconfig == 'userRedisPort') {
90
                         a.cacheConfig.push(v);//缓存配置
94
                         a.cacheConfig.push(v);//缓存配置
91
                     }
95
                     }
96
+                    if (v.keyconfig == 'wxBxQuestions' || v.keyconfig == 'wxGuide' || v.keyconfig == 'wxClQuestions') {
97
+                        a.linkConfig.push(v);//链接配置
98
+                    }
92
                     if (v.keyconfig == 'repairMain') {
99
                     if (v.keyconfig == 'repairMain') {
93
                         a.repairMain = v;//报修主体
100
                         a.repairMain = v;//报修主体
94
                     }
101
                     }

+ 14 - 0
assets/views/system/sysconfig.html

@@ -41,6 +41,20 @@
41
                     </div>
41
                     </div>
42
                 </div>
42
                 </div>
43
             </div>
43
             </div>
44
+            <!-- 链接配置 -->
45
+            <div class="panel panel-white">
46
+                <div class="panel-hd">链接配置</div>
47
+            </div>
48
+            <div class="panel-bd">
49
+                <div class="form-group col-sm-6" ng-repeat="item in linkConfig">
50
+                    <label class="col-sm-4 control-label" for="{{item.keyconfig}}">
51
+                        {{item.label}}:
52
+                    </label>
53
+                    <div class="col-sm-8">
54
+                        <input id="{{item.keyconfig}}" class="form-control" ng-model="item.valueconfig">
55
+                    </div>
56
+                </div>
57
+            </div>
44
             <!-- 报修主体 -->
58
             <!-- 报修主体 -->
45
             <div class="panel panel-white">
59
             <div class="panel panel-white">
46
                 <div class="panel-hd">报修主体</div>
60
                 <div class="panel-hd">报修主体</div>