优化

assets/js/controllers/desk/jry_emergencyCtrl.js

@@ -108,7 +108,6 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
                 displayName: '告警ID',
 
                 width: '10%',
-                maxWidth:'120',
                 cellTemplate: '<div>' +
 
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.alarm.alarmId}}</div>' +
@@ -124,7 +123,6 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
                 displayName: '告警来源',
 
                 width: '10%',
-                maxWidth:'120',
                 cellTemplate: '<div>' +
 
                     '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.alarm.equipment}}</div>' +
@@ -145,21 +143,23 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
 
                     '</div>'
 
-            }, {
+            }, 
+            // {
 
-                name: 'requester.name',
+            //     name: 'requester.name',
 
-                displayName: '故障现象报修',
+            //     displayName: '故障现象报修',
 
-                width: '10%',
+            //     width: '10%',
 
-                cellTemplate: '<div>' +
+            //     cellTemplate: '<div>' +
 
-                    '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.alarm.alarmType}}</div>' +
+            //         '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.alarm.alarmType}}</div>' +
 
-                    '</div>'
+            //         '</div>'
 
-            }, {
+            // }, 
+            {
 
                 name: 'alarmStatus',
 
@@ -191,13 +191,13 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
 
                 name: 'address',
 
-                displayName: '定位',
+                displayName: '告警IP',
 
                 width: '13%',
                 maxWidth:'120',
                 cellTemplate: '<div>' +
 
-                    '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  > {{row.entity.alarm.alarmLocation}}</div>' +
+                    '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  > {{row.entity.alarm.alarmIp}}</div>' +
 
                     '</div>'
 
@@ -450,7 +450,7 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
                 // }
                 'model':{
                     'incident':{
-                        'description': 'ID：'+data.alarm.alarmId+'\r\n'+ '来源：'+data.alarm.equipment+'\r\n'+ '时间：'+data.alarm.alarmActiveTime+'\r\n'+ '紧急度：'+data.alarm.alarmSeverity+'\r\n'+ '内容：'+data.alarm.alarmContent+'\r\n'+ '描述：'+data.alarm.alarmDescription+'\r\n'+ '地址：'+data.alarm.alarmLocation+'\r\n',
+                        'description': 'ID：'+(data.alarm.alarmId||'')+'\r\n'+ '来源：'+(data.alarm.equipment||'')+'\r\n'+ '时间：'+(data.alarm.alarmActiveTime||'')+'\r\n'+ '紧急度：'+(data.alarm.alarmSeverity||'')+'\r\n'+ '内容：'+(data.alarm.alarmContent||'')+'\r\n'+ '描述：'+(data.alarm.alarmDescription||'')+'\r\n'+ 'IP：'+(data.alarm.alarmIp||'') +'\r\n'+ '地址：'+(data.alarm.alarmLocation||'')+'\r\n',
                         'alarm': data.alarm
                     }
                 },

assets/js/controllers/loginCtrl.js

@@ -5,7 +5,8 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
         //判断项目归属 start
         //因项目众多，前端为了加以区分，所以用域名加以判断，后期有更好的方式可以自行修改
         // 中南财大
-        $rootScope.isZncd = document.domain === 'itsm.zuel.edu.cn';
+        // $rootScope.isZncd = document.domain === 'itsm.zuel.edu.cn';
+        $rootScope.isZncd = document.domain === true;
         //判断项目归属 end
         // 是否单点登录
         $scope.isSSo = location.search.length > 0;

assets/js/main.js

@@ -17,11 +17,12 @@ var callIp = protocolName + "//" + domainName;
 // var seiminCallIp = '192.168.3.233';//本地
 // var seiminCallIp = '202.114.235.100';//财大
 var seiminCallIp = '';
-if(document.domain === 'itsm.zuel.edu.cn'){
-    seiminCallIp = '202.114.235.100:5678';//财大
-}else{
-    seiminCallIp = '192.168.3.233:5678';//本地
-}
+seiminCallIp = '202.114.235.100:5678';//财大
+// if(document.domain === 'itsm.zuel.edu.cn'){
+//     seiminCallIp = '202.114.235.100:5678';//财大
+// }else{
+//     seiminCallIp = '192.168.3.233:5678';//本地
+// }
 // 信用社
 // var serverIp = "http://192.168.2.63:80/service"; //跟其他有关
 // var reportIp = "http://192.168.2.63:80/service"; //跟报表有关

assets/views/login_login.html

@@ -119,8 +119,8 @@
                 </p> -->
                 <!-- wt -->
                 <p style="overflow:hidden">
-                    <button ng-style="{width:isZncd?'48%':'100%'}" ng-click="handleLoginClick(loginForm)" class="btn-primary wt_btn fl" style="width: 48%!important;"> 登录 </button>
-                    <a ng-if="isZncd" href="http://itsm.zuel.edu.cn:8080/" class="btn-primary wt_btn fr" style="width: 48%!important;margin-top:30px;line-height:52px;"> 统一身份认证 </a>
+                    <button ng-click="handleLoginClick(loginForm)" class="btn-primary wt_btn fl" style="width: 48%!important;"> 登录 </button>
+                    <a href="http://itsm.zuel.edu.cn:8080/" class="btn-primary wt_btn fr" style="width: 48%!important;margin-top:30px;line-height:52px;"> 统一身份认证 </a>
                 </p>
                 <!-- 激活码:<input type="text" ng-model="ceshilicense">   -->
                 <!-- <div class="col-xs-12">

index.html

@@ -44,8 +44,8 @@
     <!-- Clip-Two Theme -->
     <link rel="stylesheet" data-ng-href="assets/css/themes/{{ app.layout.theme }}.css" />
     <script>
-        if(document.domain === 'itsm.zuel.edu.cn'){
-            window.console.log = function(){};//财大
+        if(document.domain !== 'localhost'){
+            window.console.log = function(){};
         }
     </script>
     <style>