Просмотр исходного кода

巡检计划的巡检分类回显

seimin лет назад: 3
Родитель
Сommit
d60ba36a40

+ 5 - 0
assets/css/styles.css

@@ -56,6 +56,11 @@
56
 
56
 
57
 
57
 
58
 /* helper class when showing content */
58
 /* helper class when showing content */
59
+.ellipsis{
60
+    overflow: hidden;
61
+    text-overflow: ellipsis;
62
+    white-space: nowrap;
63
+}
59
 
64
 
60
 
65
 
61
 /*.printheight{
66
 /*.printheight{

+ 3 - 3
assets/js/controllers/customform/customformCtrl.js

@@ -11377,11 +11377,11 @@ appFormly.config(function config(formlyConfigProvider) {
11377
                       return resultList;
11377
                       return resultList;
11378
                     }
11378
                     }
11379
                     var __arr = trasData(list,null);
11379
                     var __arr = trasData(list,null);
11380
-                    console.log(__arr)
11381
-                    if(options.model.inspectionType){
11380
+                    console.log(__arr,options.model.typeIds.split(','))
11381
+                    if(options.model.typeIds){
11382
                       //有巡检类型,则需要回显
11382
                       //有巡检类型,则需要回显
11383
                       __arr.forEach(w=>{
11383
                       __arr.forEach(w=>{
11384
-                        w.ticked = w.id == options.model.inspectionType.id;
11384
+                        w.ticked = options.model.typeIds.split(',').includes(w.id+'');
11385
                       })
11385
                       })
11386
                     }
11386
                     }
11387
                     $scope.webBrowsersGrouped = __arr;
11387
                     $scope.webBrowsersGrouped = __arr;

+ 8 - 8
assets/views/report/incident_report.html

@@ -351,9 +351,9 @@
351
                         <div class="TB_cont table">
351
                         <div class="TB_cont table">
352
                             <div class="TB_LB">
352
                             <div class="TB_LB">
353
                                 <div class="TB_LB_head">
353
                                 <div class="TB_LB_head">
354
-                                    <div class="TB_LB_item" style="width: 6%;">序号</div>
355
-                                    <div class="TB_LB_item" style="width: 10%;">处理组/人</div>
356
-                                    <div class="TB_LB_item" style="width: 15%;cursor: pointer;"
354
+                                    <div class="TB_LB_item" style="width: 5%;">序号</div>
355
+                                    <div class="TB_LB_item" style="width: 15%;">处理组/人</div>
356
+                                    <div class="TB_LB_item" style="width: 13%;cursor: pointer;"
357
                                         ng-click='YWTop_Data("sum")'>事件总数 (件)
357
                                         ng-click='YWTop_Data("sum")'>事件总数 (件)
358
                                         <span>↑</span> <span>↓</span>
358
                                         <span>↑</span> <span>↓</span>
359
                                     </div>
359
                                     </div>
@@ -370,22 +370,22 @@
370
                                         ng-click='YWTop_Data("solvetime")'>解决平均时长 (分)
370
                                         ng-click='YWTop_Data("solvetime")'>解决平均时长 (分)
371
                                         <span>↑</span> <span>↓</span>
371
                                         <span>↑</span> <span>↓</span>
372
                                     </div>
372
                                     </div>
373
-                                    <div class="TB_LB_item" style="width: 12%;">满意度 (%)</div>
373
+                                    <div class="TB_LB_item" style="width: 10%;">满意度 (%)</div>
374
                                 </div>
374
                                 </div>
375
                                 <div class="body">
375
                                 <div class="body">
376
                                     <div class="TB_LB_body" ng-repeat='(idx,val) in YWBB_table_data'>
376
                                     <div class="TB_LB_body" ng-repeat='(idx,val) in YWBB_table_data'>
377
-                                        <div class="TB_LB_item" style="width: 6%;">
377
+                                        <div class="TB_LB_item" style="width: 5%;">
378
                                             <span ng-class="{'num1':idx==0,'num2':idx==1,'num3':idx==2}">
378
                                             <span ng-class="{'num1':idx==0,'num2':idx==1,'num3':idx==2}">
379
                                                 <span class="txt">{{idx+1}}</span>
379
                                                 <span class="txt">{{idx+1}}</span>
380
                                             </span>
380
                                             </span>
381
                                         </div>
381
                                         </div>
382
-                                        <div class="TB_LB_item" style="width: 10%;">{{val.name}}</div>
383
-                                        <div class="TB_LB_item" style="width: 15%;">{{val.sum}}</div>
382
+                                        <div class="TB_LB_item ellipsis" style="width: 15%;" title="{{val.name}}">{{val.name}}</div>
383
+                                        <div class="TB_LB_item" style="width: 13%;">{{val.sum}}</div>
384
                                         <div class="TB_LB_item" style="width: 12%;">{{val.responseSum}}</div>
384
                                         <div class="TB_LB_item" style="width: 12%;">{{val.responseSum}}</div>
385
                                         <div class="TB_LB_item" style="width: 15%;">{{val.responsetime}}</div>
385
                                         <div class="TB_LB_item" style="width: 15%;">{{val.responsetime}}</div>
386
                                         <div class="TB_LB_item" style="width: 15%;">{{val.solveSum}}</div>
386
                                         <div class="TB_LB_item" style="width: 15%;">{{val.solveSum}}</div>
387
                                         <div class="TB_LB_item" style="width: 15%;">{{val.solvetime}}</div>
387
                                         <div class="TB_LB_item" style="width: 15%;">{{val.solvetime}}</div>
388
-                                        <div class="TB_LB_item" style="width: 12%;">{{val.myd}}</div>
388
+                                        <div class="TB_LB_item" style="width: 10%;">{{val.myd}}</div>
389
                                     </div>
389
                                     </div>
390
                                 </div>
390
                                 </div>
391
                             </div>
391
                             </div>