BUG修复

assets/js/controllers/customform/customformCtrl.js

@@ -13125,6 +13125,8 @@ appFormly.config(function config(formlyConfigProvider) {
       $scope.s_completeNum = 0;//已完成数
       $scope.s_completeNum_online = 0;//线上已完成数
       $scope.s_completeNum_offline = 0;//线下已完成数
+      $scope.s_completeNum_online_total = 0;//线上总数
+      $scope.s_completeNum_offline_total = 0;//线下总数
 
       //页面获取数据 liaomingming
       $scope.refreshData = function (style, filterData) {
@@ -13153,14 +13155,17 @@ appFormly.config(function config(formlyConfigProvider) {
           function (data) {
             var myData = Restangular.stripRestangular(data);
             $scope.gridOptions.totalItems = myData.totalNum;
-            $scope.myData = myData.list;
             if(filterData.sum == 9999){
-              var completeArr = $scope.myData.filter(v=>v.state === 1);
-              $scope.s_totalNum = $scope.myData.length;//总数
-              $scope.s_completeNum = completeArr.length;//已完成数
-              $scope.s_completeNum_online = completeArr.filter(v=>v.online).length;//线上已完成数
-              $scope.s_completeNum_offline = completeArr.filter(v=>!v.online).length;//线下已完成数
+              $scope.s_totalNum = myData.list.length;//总数
+              $scope.s_completeNum = myData.list.filter(v=>v.state === 1).length;//已完成数
+              $scope.s_completeNum_online_total = myData.list.filter(v=>v.online).length;//线上总数
+              $scope.s_completeNum_offline_total = myData.list.filter(v=>!v.online).length;//线下总数
+              $scope.s_completeNum_online = myData.list.filter(v=>v.online).filter(v=>v.state === 1).length;//线上已完成数
+              $scope.s_completeNum_offline = myData.list.filter(v=>!v.online).filter(v=>v.state === 1).length;//线下已完成数
+              return;
             }
+            $scope.myData = myData.list;
+            $scope.memoryfilterData = filterData;
             for (var i = 0; i < $scope.myData.length; i++) {
               //添加序号
               $scope.myData[i]["item"] =
@@ -13177,6 +13182,7 @@ appFormly.config(function config(formlyConfigProvider) {
         idx: 0,
         sum: 9999,
       });
+      $scope.refreshData("expand-right", defaultFilterData);
     },
   });
 

assets/js/controllers/inspect/inspectReportCtrl.js

@@ -230,7 +230,7 @@ app.controller("inspectReportCtrl", [
         width: "18%",
         enableFiltering: false,
         cellTemplate:
-          '<div class="ui-grid-cell-contents"><img class="xj_img" ng-click="grid.appScope.seePic(row.entity,imageurl)" ng-repeat="(index,imageurl) in row.entity.filePath" ng-src="{{imageurl}}"/></div>',
+          '<div class="ui-grid-cell-contents" style="display:flex;flex-wrap:wrap;"><img class="xj_img" ng-click="grid.appScope.seePic(row.entity,imageurl)" ng-repeat="(index,imageurl) in row.entity.filePath" ng-src="{{imageurl}}"/></div>',
       },
       // {
       //   name: "pic1",
@@ -252,7 +252,7 @@ app.controller("inspectReportCtrl", [
         name: "userName",
         displayName: "巡检人",
         width: "12%",
-        enableFiltering: false,
+        enableFiltering: false
       },
       {
         name: "address",
@@ -424,7 +424,10 @@ app.controller("inspectReportCtrl", [
                 i + 1 + filterData.idx * filterData.sum;
             }
             for (var i = 0; i < $scope.myData.length; i++) {
-              //处理日期
+              // 处理巡检人
+              $scope.myData[i].userName = $scope.myData[i].userName || [];
+              $scope.myData[i].userName = $scope.myData[i].userName.join('；');
+              // 处理日期
               $scope.myData[i].startTime = new Date($scope.myData[i].startTime);
               // 处理图片
               if ($scope.myData[i].filePath) {

assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -38,11 +38,9 @@ app.controller("inspectionScope", [
     var loginUser = $rootScope.user;
     $scope.stateModel = JSON.parse($state.params.model);
     console.log($scope.stateModel);
-    if ($scope.stateModel.model == 1) {
-      $scope.modelName = $scope.stateModel.modelName;
-    } else {
+    $scope.modelName = $scope.stateModel.modelName || $scope.stateModel.title;
+    if ($scope.stateModel.model != 1) {
       $scope.stateModel.model = 0;
-      $scope.modelName = $scope.stateModel.title;
     }
     $scope.xinzeng = false;
     $scope.shanchu = false;
@@ -255,7 +253,7 @@ app.controller("inspectionScope", [
           $scope.savercode = function (data) {
             if (data && data.type) {
               if ($scope.addparent) {
-                data.parent = $scope.add1data.parent;
+                data.parent = $scope.add1data.parent || $scope.thisParent;
               } else {
                 data.parent = null;
               }

assets/views/customform/tpl/ui-grid-show.html

@@ -1,2 +1,2 @@
-<div>总：{{s_completeNum}}/{{s_totalNum}}&nbsp;&nbsp;&nbsp;&nbsp;线下： {{s_completeNum_offline}}/{{s_completeNum}}&nbsp;&nbsp;&nbsp;&nbsp;线上：{{s_completeNum_online}}/{{s_completeNum}}</div>
+<div>总：{{s_completeNum}}/{{s_totalNum}}&nbsp;&nbsp;&nbsp;&nbsp;线下： {{s_completeNum_offline}}/{{s_completeNum_offline_total}}&nbsp;&nbsp;&nbsp;&nbsp;线上：{{s_completeNum_online}}/{{s_completeNum_online_total}}</div>
 <div id="grid1" ui-grid="gridOptions" ui-grid-pagination external-scopes="$scope" ui-grid-cellNav ui-grid-resize-columns ui-grid-selection ui-grid-auto-resize class="grid" ></div>