fanxw преди 2 години
родител
ревизия
42c5d35265

+ 5 - 5
src/main/resources/static/app/intelligent/grainDetection/views/humitureDetection-model.html

@@ -32,7 +32,7 @@
32
             <!--startprint1-->
32
             <!--startprint1-->
33
             <table border="1" id="table" class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%;margin-bottom:0">
33
             <table border="1" id="table" class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%;margin-bottom:0">
34
             	<caption align="top" style="font-size: 25px;text-align: center;color:black">{{orgInfo.orgName}}粮情检测报表</caption>
34
             	<caption align="top" style="font-size: 25px;text-align: center;color:black">{{orgInfo.orgName}}粮情检测报表</caption>
35
-            	<tbody style="font-size: 1px;">
35
+            	<tbody style="font-size: 10px;">
36
             	<tr style="text-align: center;height:3px">
36
             	<tr style="text-align: center;height:3px">
37
             		<td style="border: 1px solid #000;text-align: center;width:9.5%;">仓房名称</td>
37
             		<td style="border: 1px solid #000;text-align: center;width:9.5%;">仓房名称</td>
38
             		<td style="border: 1px solid #000;text-align: center;width:19%;">{{storeHouseCodeObj[vCfCode].storehouseName}}</td>
38
             		<td style="border: 1px solid #000;text-align: center;width:19%;">{{storeHouseCodeObj[vCfCode].storehouseName}}</td>
@@ -103,16 +103,16 @@
103
             	</tbody>
103
             	</tbody>
104
 			</table>
104
 			</table>
105
             <table border="1" class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%;margin-bottom:0">
105
             <table border="1" class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%;margin-bottom:0">
106
-                <tr id="layersAvgTemp" style="font-size: 1px;"></tr>
106
+                <tr id="layersAvgTemp" style="font-size: 10px;"></tr>
107
             </table>
107
             </table>
108
             <table border="1" class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%; margin-bottom:0;">
108
             <table border="1" class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%; margin-bottom:0;">
109
-                <tbody id="t_body" style="font-size: 1px;">
109
+                <tbody id="t_body" style="font-size: 10px;">
110
                 <tr></tr>
110
                 <tr></tr>
111
                 <tr></tr>
111
                 <tr></tr>
112
                 </tbody>
112
                 </tbody>
113
             </table>
113
             </table>
114
             <table border="1" class="table table-bordered" style="table-layout: fixed;border-collapse:collapse; width:100%; margin-bottom:0; text-align: center;">
114
             <table border="1" class="table table-bordered" style="table-layout: fixed;border-collapse:collapse; width:100%; margin-bottom:0; text-align: center;">
115
-                <tbody id="t_body2" style="font-size: 1px;">
115
+                <tbody id="t_body2" style="font-size: 10px;">
116
                 <tr>
116
                 <tr>
117
                     <td class="text-center" style="width:10%">处理意见</td>
117
                     <td class="text-center" style="width:10%">处理意见</td>
118
                     <td colspan="{{td_type_2 % 2 == 0 ? td_type_2/2:(td_type_2 + 1)/2}}" class="text-center" style="width:40%"></td>
118
                     <td colspan="{{td_type_2 % 2 == 0 ? td_type_2/2:(td_type_2 + 1)/2}}" class="text-center" style="width:40%"></td>
@@ -122,7 +122,7 @@
122
                 </tbody>
122
                 </tbody>
123
             </table>
123
             </table>
124
             <table border="1" class="table table-bordered" style="table-layout: fixed;border-collapse:collapse; width:100%;margin-bottom:0;text-align: center;">
124
             <table border="1" class="table table-bordered" style="table-layout: fixed;border-collapse:collapse; width:100%;margin-bottom:0;text-align: center;">
125
-                <tbody id="t_body3" style="font-size: 1px;">
125
+                <tbody id="t_body3" style="font-size: 10px;">
126
                 <tr>
126
                 <tr>
127
                     <td class="text-center" style="width:10%">检测员</td>
127
                     <td class="text-center" style="width:10%">检测员</td>
128
                     <td colspan="{{td_type_avg_1}}" class="text-center"></td>
128
                     <td colspan="{{td_type_avg_1}}" class="text-center"></td>

+ 1 - 1
src/main/resources/static/app/storage/grainCard/views/addQualityInspection-modal.html

@@ -34,7 +34,7 @@
34
 								<td class="text-center">{{warehouseObj[quailtyCard.warehouseId].warehouseName}}</td>
34
 								<td class="text-center">{{warehouseObj[quailtyCard.warehouseId].warehouseName}}</td>
35
 								<td class="text-center">
35
 								<td class="text-center">
36
 									<span ng-if="quailtyCard.typeUpdate=='0'">粮食初检</span>
36
 									<span ng-if="quailtyCard.typeUpdate=='0'">粮食初检</span>
37
-									<span ng-if="quailtyCard.typeUpdate=='4'">日常检查</span>
37
+									<span ng-if="quailtyCard.typeUpdate=='4'">春秋普查</span>
38
 									<span ng-if="quailtyCard.typeUpdate=='2'">强检</span>
38
 									<span ng-if="quailtyCard.typeUpdate=='2'">强检</span>
39
 									<span ng-if="quailtyCard.typeUpdate=='1'">第三方检验</span>
39
 									<span ng-if="quailtyCard.typeUpdate=='1'">第三方检验</span>
40
 									<span ng-if="quailtyCard.typeUpdate=='3'">出库检验</span>
40
 									<span ng-if="quailtyCard.typeUpdate=='3'">出库检验</span>

+ 5 - 5
src/main/resources/static/app/storage/grainCard/views/addQualityInspection.html

@@ -107,7 +107,7 @@
107
                                             <tr ng-repeat="quailckCard in quailckCardListView">
107
                                             <tr ng-repeat="quailckCard in quailckCardListView">
108
                                                 <td class="text-center" colspan="3">
108
                                                 <td class="text-center" colspan="3">
109
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
109
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
110
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
110
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
111
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
111
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
112
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
112
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
113
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
113
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
@@ -254,7 +254,7 @@
254
                                             <tr ng-repeat="quailckCard in quailckCardListView">
254
                                             <tr ng-repeat="quailckCard in quailckCardListView">
255
                                                 <td class="text-center" colspan="3" >
255
                                                 <td class="text-center" colspan="3" >
256
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
256
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
257
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
257
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
258
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
258
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
259
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
259
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
260
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
260
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
@@ -360,7 +360,7 @@
360
                                             <tr ng-repeat="quailckCard in quailckCardListView">
360
                                             <tr ng-repeat="quailckCard in quailckCardListView">
361
                                                 <td class="text-center" colspan="3">
361
                                                 <td class="text-center" colspan="3">
362
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
362
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
363
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
363
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
364
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
364
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
365
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
365
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
366
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
366
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
@@ -466,7 +466,7 @@
466
                                             <tr ng-repeat="quailckCard in quailckCardListView">
466
                                             <tr ng-repeat="quailckCard in quailckCardListView">
467
                                                 <td class="text-center" colspan="3" >
467
                                                 <td class="text-center" colspan="3" >
468
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
468
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
469
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
469
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
470
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
470
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
471
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
471
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
472
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
472
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
@@ -536,7 +536,7 @@
536
                                             <tr ng-repeat="quailckCard in quailckCardListView">
536
                                             <tr ng-repeat="quailckCard in quailckCardListView">
537
                                                 <td class="text-center" colspan="3" >
537
                                                 <td class="text-center" colspan="3" >
538
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
538
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
539
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
539
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
540
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
540
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
541
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
541
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
542
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
542
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>

+ 4 - 4
src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

@@ -698,7 +698,7 @@
698
                                             <tr ng-repeat="quailckCard in quailckCardListView">
698
                                             <tr ng-repeat="quailckCard in quailckCardListView">
699
                                                 <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
699
                                                 <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
700
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
700
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
701
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
701
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
702
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
702
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
703
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
703
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
704
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
704
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
@@ -803,7 +803,7 @@
803
                                             <tr ng-repeat="quailckCard in quailckCardListView">
803
                                             <tr ng-repeat="quailckCard in quailckCardListView">
804
                                                 <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
804
                                                 <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
805
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
805
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
806
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
806
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
807
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
807
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
808
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
808
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
809
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
809
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
@@ -907,7 +907,7 @@
907
                                             <tr ng-repeat="quailckCard in quailckCardListView">
907
                                             <tr ng-repeat="quailckCard in quailckCardListView">
908
                                                 <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
908
                                                 <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
909
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
909
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
910
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
910
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
911
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
911
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
912
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
912
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
913
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
913
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
@@ -962,7 +962,7 @@
962
                                             <tr ng-repeat="quailckCard in quailckCardListView">
962
                                             <tr ng-repeat="quailckCard in quailckCardListView">
963
                                                 <td class="text-center" colspan="3" >
963
                                                 <td class="text-center" colspan="3" >
964
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
964
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
965
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
965
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
966
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
966
                                                     <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
967
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
967
                                                     <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
968
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
968
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>