Explorar el Código

修改温湿度报警状态

hanqingsong hace 1 año
padre
commit
4882e3af57

+ 5 - 4
src/main/resources/static/app/warnAndAlarm/tempWet/views/tempAlarm-list.html

@@ -70,10 +70,11 @@
70 70
                                             <td style="text-align:center;">{{ warning.restoreTime}}</td>
71 71
                                             <td style="text-align:center;">{{ warning.durationDays }}</td>
72 72
                                             <td style="text-align:center;" >
73
-                                                <span ng-if="(warning.processStatus == null || warning.supervisionStatus == null) && warning.approvalStatus != '999999'">待处理</span>
74
-                                                <span ng-if="warning.processStatus != null && warning.supervisionStatus == null && warning.approvalStatus != '999999'">处理中</span>
75
-                                                <span ng-if="warning.processStatus != null && warning.supervisionStatus != null && warning.approvalStatus != '999999'">督办中</span>
76
-                                                <span ng-if="warning.processStatus != null && warning.supervisionStatus != null && warning.approvalStatus == '999999'">处理完成</span>
73
+                                                <span ng-if="warning.processStatus == null || warning.processStatus == '100201'">待处理</span>
74
+                                                <span ng-if="warning.supervisionStatus == null && warning.processStatus != '100202'">处理中</span>
75
+                                                <span ng-if="(warning.processStatus == null || warning.processStatus == '100203') && warning.supervisionStatus != null">待处理 督办中</span>
76
+                                                <span ng-if="warning.processStatus != null && warning.supervisionStatus != null">督办中</span>
77
+                                                <span ng-if="warning.approvalStatus == '999999'">完成</span>
77 78
                                             </td>
78 79
                                             <td style="text-align:center;">
79 80
                                                 <a href-void ng-click="showGrainDetectionList(warning)"><i class=""></i>检测记录</a>&emsp;