告警转换修改

assets/js/controllers/desk/jry_emergencyCtrl.js

@@ -101,10 +101,25 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
                     '</div>'
 
             },
+            {
+
+                name: 'alarmId',
+
+                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>' +
+
+                    '</div>'
+
+            },
 
             {
 
-                name: 'alarmSystem',
+                name: 'equipment',
 
                 displayName: '告警来源',
 
@@ -112,7 +127,7 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
                 maxWidth:'120',
                 cellTemplate: '<div>' +
 
-                    '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.alarm.alarmSystem}}</div>' +
+                    '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.alarm.equipment}}</div>' +
 
                     '</div>'
 
@@ -134,7 +149,7 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
 
                 name: 'requester.name',
 
-                displayName: '告警类型',
+                displayName: '故障现象报修',
 
                 width: '10%',
 
@@ -396,6 +411,8 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
 
             console.log(data)
 
+            var login_requester = JSON.parse(localStorage.getItem('login_requester'));
+
             var formdata = {
 
                 // 'model': {
@@ -433,14 +450,22 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
                 // }
                 'model':{
                     'incident':{
-                        'description':data.alarm.alarmContent,
-                        'alarm':data.alarm
+                        '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',
+                        'alarm': data.alarm
                     }
                 },
                 'alarmIncident': data
 
             }
 
+            if(login_requester){
+                formdata.model.incident.requester = login_requester;
+                formdata.model.incident.area = login_requester.place.area;
+                formdata.model.incident.place = login_requester.place;
+                formdata.model.incident.contacts = login_requester.name;
+                formdata.model.incident.contactsInformation = login_requester.mphone;
+                formdata.model.incident.source = { 'id': 1550 };
+            }
             console.log(formdata)
 
             // if (formdata.alarmIncident.state == '未建单') {
@@ -507,6 +532,9 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
         // };
 
         $scope.onDblClick = function(row) {
+            if(!row.entity){
+                row.entity = angular.copy(row);
+            }
 
             console.log(row)
 
@@ -807,6 +835,11 @@ app.controller('WechatOperCtrl2', ['$rootScope', '$http', '$scope', '$modal', 'S
 
     // console.log($scope.notBeing);
 
+    // 查看
+    $scope.look = function() {
+        $scope.colobject.grid.appScope.onDblClick($scope.item);
+    }
+
     // 处理 --wt
 
     $scope.edit = function() {
@@ -1005,6 +1038,7 @@ app.directive('wechatoperator2', function() {
         template: '<div class="links cl-effect-1 ui-grid-cell-contents pull-left" >' +
 
             // '<a ng-click="edit()"  ng-show="{{handle}}" tooltip="生成事件" tooltip-placement="left"><i class="icon  iconfont icon-bianji bianjifont"></i></a>' +
+            '<a ng-click="look()"  tooltip="查看" tooltip-placement="right">查看</a>' +
 
             '<a ng-click="edit()" ng-show="{{handle}}"  class="bianjifont">建单</a>' + '<a ng-click="notAccept ()" ng-show="{{handle}}"  class="bianjifont">不受理</a>' + '<a ng-click="being ()"  ng-show="{{notBeing}}"  class="bianjifont">暂不处理</a>' +