巡检报告优化

assets/js/controllers/inspect/inspectReportCtrl.js

@@ -5,6 +5,7 @@
 app.controller("inspectReportCtrl", [
   "$rootScope",
   "$scope",
+  "$sce",
   "$state",
   "$timeout",
   "$interval",
@@ -23,6 +24,7 @@ app.controller("inspectReportCtrl", [
   function (
     $rootScope,
     $scope,
+    $sce,
     $state,
     $timeout,
     $interval,
@@ -230,7 +232,7 @@ app.controller("inspectReportCtrl", [
         width: "18%",
         enableFiltering: false,
         cellTemplate:
-          '<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>',
+          '<div class="ui-grid-cell-contents" style="display:inline;"><div ng-if="row.entity.filePath[true]">线上 <img class="xj_img" ng-click="grid.appScope.seePic(row.entity,imageurl)" ng-repeat="(index,imageurl) in row.entity.filePath[true]" ng-src="{{imageurl}}"/></div><div ng-if="row.entity.filePath[false]">线下 <img class="xj_img" ng-click="grid.appScope.seePic(row.entity,imageurl)" ng-repeat="(index,imageurl) in row.entity.filePath[false]" ng-src="{{imageurl}}"/></div></div>',
       },
       // {
       //   name: "pic1",
@@ -241,18 +243,20 @@ app.controller("inspectReportCtrl", [
       //     '<div class="ui-grid-cell-contents"><img class="xj_img" ng-click="grid.appScope.seePic(row.entity,index)" ng-repeat="(item,index) in [1,2,3]" src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fp2.itc.cn%2Fq_70%2Fimages03%2F20201101%2F75417504ddc843d78610d1cb8dd9c402.jpeg&refer=http%3A%2F%2Fp2.itc.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1649583898&t=1ead2b8808f10e3da9d6864543d90bce"/></div>',
       // },
       {
-        name: "model.descriptionTextarea",
+        name: "descriptionTextarea",
         displayName: "整改意见",
         width: "18%",
         enableFiltering: false,
         cellTemplate:
-          '<div class="ui-grid-cell-contents"><div class="inspectPar"><p>{{row.entity.model.descriptionTextarea}}</p></div></div>',
+          '<div class="ui-grid-cell-contents"><div class="inspectPar"><p ng-bind-html="row.entity.descriptionTextarea"></p></div></div>',
       },
       {
         name: "userName",
         displayName: "巡检人",
         width: "12%",
-        enableFiltering: false
+        enableFiltering: false,
+        cellTemplate:
+          '<div class="ui-grid-cell-contents"><div class="inspectPar"><p ng-bind-html="row.entity.userName"></p></div></div>',
       },
       {
         name: "address",
@@ -424,20 +428,39 @@ app.controller("inspectReportCtrl", [
                 i + 1 + filterData.idx * filterData.sum;
             }
             for (var i = 0; i < $scope.myData.length; i++) {
+              var descriptionTextareaStr = '';
+              // 处理整改意见
+              if($scope.myData[i].descriptionTextarea){
+                for(var key in $scope.myData[i].descriptionTextarea){
+                  descriptionTextareaStr += $scope.myData[i].descriptionTextarea[key] + '<br>';
+                }
+                $scope.myData[i].descriptionTextarea = $sce.trustAsHtml(descriptionTextareaStr);
+              }
               // 处理巡检人
               $scope.myData[i].userName = $scope.myData[i].userName || [];
-              $scope.myData[i].userName = $scope.myData[i].userName.join('；');
+              var userNameStr = ''
+              $scope.myData[i].userName.forEach((v, i)=>{
+                userNameStr += v + '<br>';
+              })
+              $scope.myData[i].userName = $sce.trustAsHtml(userNameStr);
               // 处理日期
               $scope.myData[i].startTime = new Date($scope.myData[i].startTime);
               // 处理图片
-              if ($scope.myData[i].filePath) {
-                $scope.myData[i].filePath = $scope.myData[i].filePath
-                  .split(",")
-                  .map((v) => imgBaseUrl + "/file" + v);
-              } else {
-                $scope.myData[i].filePath = [];
+              // if ($scope.myData[i].filePath) {
+              //   $scope.myData[i].filePath = $scope.myData[i].filePath
+              //     .split(",")
+              //     .map((v) => imgBaseUrl + "/file" + v);
+              // } else {
+              //   $scope.myData[i].filePath = [];
+              // }
+              // ----------------
+              var descriptionTextareaStr = '';
+              if($scope.myData[i].filePath){
+                for(var key in $scope.myData[i].filePath){
+                  $scope.myData[i].filePath[key] = $scope.myData[i].filePath[key].split(",").map((v) => imgBaseUrl + "/file" + v);
+                }
               }
-              //巡检项cnm
+              //巡检项
               $scope.myData[i].xj_items = $scope.myData[i].fields
                 .filter((v) => {
                   v.key = (v.key || "").toString();

assets/views/inspect/inspectReport.html

@@ -232,14 +232,15 @@
             </div>
           </td>
           <td>
-            <img class="xj_img" ng-click="seePic(data,imageurl)" ng-repeat="(index,imageurl) in data.filePath" ng-src="{{imageurl}}"/>
+            <div ng-if="data.filePath[true]">线上 <img class="xj_img" ng-click="seePic(data,imageurl)" ng-repeat="(index,imageurl) in data.filePath[true]" ng-src="{{imageurl}}"/></div>
+            <div ng-if="data.filePath[false]">线下<img class="xj_img" ng-click="seePic(data,imageurl)" ng-repeat="(index,imageurl) in data.filePath[false]" ng-src="{{imageurl}}"/></div>
           </td>
           <td>
             <div class="td">
-              <div class="inspectPar"><p>{{data.model.descriptionTextarea}}</p></div>
+              <div class="inspectPar"><p ng-bind-html="data.descriptionTextarea"></p></div>
             </div>
           </td>
-          <td>{{data.userName}}</td>
+          <td ng-bind-html="data.userName"></td>
           <td>{{data.address}}</td>
         </tr>
       </table>