seimin 2 vuotta sitten
vanhempi
commit
f2320781de

+ 11 - 11
assets/js/controllers/incident/incidentCtrl.js

@@ -252,7 +252,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
252
             {
252
             {
253
                 name: 'contactsInformation',
253
                 name: 'contactsInformation',
254
                 displayName: '联系人',
254
                 displayName: '联系人',
255
-                width: '12%',
255
+                width: '7%',
256
                 cellTemplate: '<div>' +
256
                 cellTemplate: '<div>' +
257
                     '<div class="ui-grid-cell-contents">{{row.entity.contacts||"无"}}<br>{{row.entity.contactsInformation||"无"}}</div>' +
257
                     '<div class="ui-grid-cell-contents">{{row.entity.contacts||"无"}}<br>{{row.entity.contactsInformation||"无"}}</div>' +
258
                     '</div>'
258
                     '</div>'
@@ -277,8 +277,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
277
             {
277
             {
278
                 name: 'acceptUser.name',
278
                 name: 'acceptUser.name',
279
                 displayName: '受理|处理人',
279
                 displayName: '受理|处理人',
280
-                width: '7%',
281
-                minWidth: '80',
280
+                width: '6%',
281
+                minWidth: '70',
282
                 enableSorting: false,
282
                 enableSorting: false,
283
                 cellTemplate: '<div>' +
283
                 cellTemplate: '<div>' +
284
                     '<div class="ui-grid-cell-contents" >{{row.entity.acceptUser?row.entity.acceptUser.name:"无"}}<br>{{row.entity.handlingPersonnelUser?row.entity.handlingPersonnelUser.name:"无"}}</div>' +
284
                     '<div class="ui-grid-cell-contents" >{{row.entity.acceptUser?row.entity.acceptUser.name:"无"}}<br>{{row.entity.handlingPersonnelUser?row.entity.handlingPersonnelUser.name:"无"}}</div>' +
@@ -287,18 +287,18 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
287
             {
287
             {
288
                 name: 'acceptDate',
288
                 name: 'acceptDate',
289
                 displayName: '登记|接单时间',
289
                 displayName: '登记|接单时间',
290
-                width: '10%',
291
-                minWidth: '140',
290
+                width: '7%',
291
+                minWidth: '130',
292
                 enableFiltering: false,
292
                 enableFiltering: false,
293
-                cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}<br>{{row.entity.responseHandleTime||"无"}}</div></div>'
293
+                cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}<br>{{grid.appScope.transferTime(row.entity.responseHandleTime)}}</div></div>'
294
             },
294
             },
295
             {
295
             {
296
                 name: 'acceptDate1',
296
                 name: 'acceptDate1',
297
                 displayName: '解决时间',
297
                 displayName: '解决时间',
298
-                width: '10%',
299
-                minWidth: '140',
298
+                width: '7%',
299
+                minWidth: '130',
300
                 enableFiltering: false,
300
                 enableFiltering: false,
301
-                cellTemplate: '<div><div class="ui-grid-cell-contents">{{row.entity.handleTime||"无"}}</div></div>'
301
+                cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.handleTime)}}</div></div>'
302
             },
302
             },
303
             {
303
             {
304
                 name: 'groupORHandlerUser',
304
                 name: 'groupORHandlerUser',
@@ -313,8 +313,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
313
             {
313
             {
314
                 name: 'state.name',
314
                 name: 'state.name',
315
                 displayName: '状态',
315
                 displayName: '状态',
316
-                width: '5%',
317
-                minWidth: '70',
316
+                width: '4%',
317
+                minWidth: '50',
318
                 enableSorting: false,
318
                 enableSorting: false,
319
                 cellTemplate: '<div>' +
319
                 cellTemplate: '<div>' +
320
                     '<div class="ui-grid-cell-contents" >{{row.entity.state.name}}</div>' +
320
                     '<div class="ui-grid-cell-contents" >{{row.entity.state.name}}</div>' +

+ 6 - 2
assets/views/incident/list.html

@@ -520,13 +520,17 @@
520
     .ui-grid-row:nth-child(even) .ui-grid-cell {
520
     .ui-grid-row:nth-child(even) .ui-grid-cell {
521
         background: #fafafa !important;
521
         background: #fafafa !important;
522
         display: flex;
522
         display: flex;
523
-        justify-content: center;
523
+        /* justify-content: center; */
524
         align-items: center;
524
         align-items: center;
525
     }
525
     }
526
 
526
 
527
+    .ui-grid-cell-contents{
528
+        text-align: left;
529
+    }
530
+
527
     .ui-grid-row:nth-child(odd) .ui-grid-cell {
531
     .ui-grid-row:nth-child(odd) .ui-grid-cell {
528
         display: flex;
532
         display: flex;
529
-        justify-content: center;
533
+        /* justify-content: center; */
530
         align-items: center;
534
         align-items: center;
531
     }
535
     }
532
 
536