seimin 3 年之前
父節點
當前提交
e3fea1c5ab

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

@@ -11377,7 +11377,7 @@ 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,options.model.typeIds.split(','))
11380
+                    // console.log(__arr,options.model.typeIds.split(','))
11381
                     if(options.model.typeIds){
11381
                     if(options.model.typeIds){
11382
                       //有巡检类型,则需要回显
11382
                       //有巡检类型,则需要回显
11383
                       __arr.forEach(w=>{
11383
                       __arr.forEach(w=>{

+ 2 - 2
assets/js/controllers/inspect/inspectReportCtrl.js

@@ -218,8 +218,8 @@ app.controller("inspectReportCtrl", [
218
         cellTemplate: `<div class="ui-grid-cell-contents">
218
         cellTemplate: `<div class="ui-grid-cell-contents">
219
             <div class="inspectPar">
219
             <div class="inspectPar">
220
               <p ng-repeat="item in row.entity.xj_items">
220
               <p ng-repeat="item in row.entity.xj_items">
221
-                <span ng-if="item.key == 'sdCheckEnable7'||item.key == 'sdCheckEnable11'||item.key == 'sdCheckEnable12'">{{item.name}}:{{item.value=="false"?"否":"是"}}</span>
222
-                <span ng-if="item.key != 'sdCheckEnable7'&&item.key != 'sdCheckEnable11'&&item.key != 'sdCheckEnable12'">{{item.name}}:{{item.value=="false"?"异常":"正常"}}</span>
221
+                <span ng-if="item.key == 'sdCheckEnable7'||item.key == 'sdCheckEnable11'||item.key == 'sdCheckEnable12'">{{item.name}}:{{item.value=="true"?"是":"否"}}</span>
222
+                <span ng-if="item.key != 'sdCheckEnable7'&&item.key != 'sdCheckEnable11'&&item.key != 'sdCheckEnable12'">{{item.name}}:{{item.value=="true"?"正常":"异常"}}</span>
223
               </p>
223
               </p>
224
             </div>
224
             </div>
225
           </div>`,
225
           </div>`,

+ 6 - 6
assets/views/inspect/inspectReport.html

@@ -151,8 +151,8 @@
151
           margin-top: 40mm;
151
           margin-top: 40mm;
152
         }
152
         }
153
         #print .fm h2{
153
         #print .fm h2{
154
-          -webkit-writing-mode: vertical-rl;
155
-          writing-mode: vertical-rl;
154
+          width: 20px;
155
+          word-wrap: break-word;
156
           font-size: 60px;
156
           font-size: 60px;
157
         }
157
         }
158
         #print .fm h3{
158
         #print .fm h3{
@@ -202,8 +202,8 @@
202
       </style>
202
       </style>
203
       <div class="fm">
203
       <div class="fm">
204
         <h1>巡&nbsp;&nbsp;检&nbsp;&nbsp;报&nbsp;&nbsp;告</h1>
204
         <h1>巡&nbsp;&nbsp;检&nbsp;&nbsp;报&nbsp;&nbsp;告</h1>
205
-        <h2>{{queryList.title?queryList.title.title.split('').join('&nbsp;&nbsp;'):''}}</h2>
206
-        <h3>批次号:{{queryList.batchNo?queryList.batchNo.name:''}}</h2>
205
+        <h2>{{queryList.title?queryList.title.title.split('').join('&nbsp;'):''}}</h2>
206
+        <h3>批次号:{{queryList.batchNo?queryList.batchNo.name:''}}</h3>
207
       </div>
207
       </div>
208
       <table>
208
       <table>
209
         <tr>
209
         <tr>
@@ -224,8 +224,8 @@
224
             <div class="td">
224
             <div class="td">
225
               <div class="inspectPar">
225
               <div class="inspectPar">
226
                 <p ng-repeat="item in data.xj_items">
226
                 <p ng-repeat="item in data.xj_items">
227
-                  <span ng-if="item.key == 'sdCheckEnable7'||item.key == 'sdCheckEnable11'||item.key == 'sdCheckEnable12'">{{item.name}}:{{item.value=="false"?"否":"是"}}</span>
228
-                  <span ng-if="item.key != 'sdCheckEnable7'&&item.key != 'sdCheckEnable11'&&item.key != 'sdCheckEnable12'">{{item.name}}:{{item.value=="false"?"异常":"正常"}}</span>
227
+                  <span ng-if="item.key == 'sdCheckEnable7'||item.key == 'sdCheckEnable11'||item.key == 'sdCheckEnable12'">{{item.name}}:{{item.value=="true"?"是":"否"}}</span>
228
+                  <span ng-if="item.key != 'sdCheckEnable7'&&item.key != 'sdCheckEnable11'&&item.key != 'sdCheckEnable12'">{{item.name}}:{{item.value=="true"?"正常":"异常"}}</span>
229
                 </p>
229
                 </p>
230
               </div>
230
               </div>
231
             </div>
231
             </div>