Home Explore Help
Register Sign In
seimin
/
zuel-itsm-3.0.2
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

巡检修改

seimin 3 years ago
parent
28540c4264
commit
46fc9500c1
4 changed files with 21 additions and 3 deletions
Unified View Show Diff Stats
  1. 3 0
      assets/js/controllers/customform/customformCtrl.js
  2. 1 1
      assets/js/controllers/inspect/inspectListCtrl.js
  3. 1 1
      assets/js/controllers/inspect/inspectPlanCtrl.js
  4. 16 1
      assets/js/controllers/inspect/inspectReportCtrl.js

+ 3 - 0
assets/js/controllers/customform/customformCtrl.js
View File 

@@ -11336,7 +11336,9 @@ appFormly.config(function config(formlyConfigProvider) {
11336 
                         return !p.parent;
 11336 
                         return !p.parent;
11337 
                       })
 11337 
                       })
11338 
                     }
 11338 
                     }
11339 
+                    console.log(result.list)
11339 
                     var list = formatDataTree2(result.list);
 11340 
                     var list = formatDataTree2(result.list);
11341 
+                    console.log(list)
11340 
                     // $scope.treeList = angular.copy(list);
 11342 
                     // $scope.treeList = angular.copy(list);
11341 
                     var resultList = [];
 11343 
                     var resultList = [];
11342 
                     //转换数据
 11344 
                     //转换数据
 
@@ -11375,6 +11377,7 @@ appFormly.config(function config(formlyConfigProvider) {
11375 
                       return resultList;
 11377 
                       return resultList;
11376 
                     }
 11378 
                     }
11377 
                     var __arr = trasData(list,null);
 11379 
                     var __arr = trasData(list,null);
11380 
+                    console.log(__arr)
11378 
                     if(options.model.inspectionType){
 11381 
                     if(options.model.inspectionType){
11379 
                       //有巡检类型，则需要回显
 11382 
                       //有巡检类型，则需要回显
11380 
                       __arr.forEach(w=>{
 11383 
                       __arr.forEach(w=>{

+ 1 - 1
assets/js/controllers/inspect/inspectListCtrl.js
View File 

@@ -182,7 +182,7 @@ app.controller("inspectListCtrl", [
182 
         enableFiltering: false,
 182 
         enableFiltering: false,
183 
       },
 183 
       },
184 
       {
 184 
       {
185 
-        name: "inspection.executeUser.name",
185 
+        name: "processUser.name",
186 
         displayName: "处理人",
 186 
         displayName: "处理人",
187 
         width: "8%",
 187 
         width: "8%",
188 
         minWidth: 80,
 188 
         minWidth: 80,

+ 1 - 1
assets/js/controllers/inspect/inspectPlanCtrl.js
View File 

@@ -145,7 +145,7 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
145 
             displayName: '当前批次进度',
 145 
             displayName: '当前批次进度',
146 
             width: '12%',
 146 
             width: '12%',
147 
             enableFiltering: false,
 147 
             enableFiltering: false,
148 
-            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.completed + "/" + row.entity.doing}}</div>'
148 
+            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.completed + "/" + (row.entity.doing + row.entity.completed)}}</div>'
149 
         },
 149 
         },
150 
         {
 150 
         {
151 
             name: 'executionTime2',
 151 
             name: 'executionTime2',

+ 16 - 1
assets/js/controllers/inspect/inspectReportCtrl.js
View File 

@@ -81,6 +81,12 @@ app.controller("inspectReportCtrl", [
81 
           ${docHead}
 81 
           ${docHead}
82 
           <body onLoad="window.print()">
 82 
           <body onLoad="window.print()">
83 
           <style>
 83 
           <style>
84 
+          .ui-grid-row{
85 
+            margin-top:0!important;
86 
+          }
87 
+          .ui-grid-canvas{
88 
+            height:auto!important;
89 
+          }
84 
           .ui-grid-viewport{
 90 
           .ui-grid-viewport{
85 
             width:100%!important;
 91 
             width:100%!important;
86 
             height:100%!important;
 92 
             height:100%!important;
 
@@ -251,7 +257,10 @@ app.controller("inspectReportCtrl", [
251 
         enableFiltering: false,
 257 
         enableFiltering: false,
252 
         cellTemplate: `<div class="ui-grid-cell-contents">
 258 
         cellTemplate: `<div class="ui-grid-cell-contents">
253 
             <div class="inspectPar">
 259 
             <div class="inspectPar">
254 
-              <p ng-repeat="item in row.entity.xj_items">{{item.name}}：{{item.value=="false"?"异常":"正常"}}</p>
260 
+              <p ng-repeat="item in row.entity.xj_items">
261 
+                <span ng-if="item.key == 'sdCheckEnable7'||item.key == 'sdCheckEnable11'||item.key == 'sdCheckEnable12'">{{item.name}}：{{item.value=="false"?"否":"是"}}</span>
262 
+                <span ng-if="item.key != 'sdCheckEnable7'&&item.key != 'sdCheckEnable11'&&item.key != 'sdCheckEnable12'">{{item.name}}：{{item.value=="false"?"异常":"正常"}}</span>
263 
+              </p>
255 
             </div>
 264 
             </div>
256 
           </div>`,
 265 
           </div>`,
257 
       },
 266 
       },
 
@@ -285,6 +294,12 @@ app.controller("inspectReportCtrl", [
285 
         width: "12%",
 294 
         width: "12%",
286 
         enableFiltering: false,
 295 
         enableFiltering: false,
287 
       },
 296 
       },
297 
+      {
298 
+        name: "address",
299 
+        displayName: "地址",
300 
+        width: "12%",
301 
+        enableFiltering: false,
302 
+      },
288 
       //   {
 303 
       //   {
289 
       //     minWidth: "230",
 304 
       //     minWidth: "230",
290 
       //     name: "操作",
 305 
       //     name: "操作",