my-csc-config-file.git před 5 roky
rodič
revize
91459a483a

+ 5 - 5
depot-web/src/main/resources/static/app/intelligent/grainDetection/views/grainCondition-list.html

@@ -64,20 +64,20 @@
64 64
                                         <td style="text-align:center;">{{ grainCondition.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
65 65
                                         <td style="text-align:center;">
66 66
                                             <div ng-if="grainCondition.intemp==250">
67
-                                                <span style="color: red;">设备异常</span>
67
+                                                <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
68 68
                                             </div>
69 69
                                             <div ng-if="grainCondition.intemp!=250">{{grainCondition.intemp}}</div>
70 70
                                         </td>
71 71
                                         <td style="text-align:center;">
72 72
                                             <div ng-if="grainCondition.inh==250">
73
-                                                <span style="color: red;">设备异常</span>
73
+                                                <acronym title="设备异常"><span style="color: red;">{{-1}}</span></acronym>
74 74
                                             </div>
75 75
                                             <div ng-if="grainCondition.inh!=250">{{grainCondition.inh}}</div>
76 76
                                         </td>
77 77
                                         <td style="text-align:center;">
78 78
                                             <!--高温报警-->
79 79
                                             <div ng-if="grainCondition.max==250">
80
-                                                <span style="color: red;">设备异常</span>
80
+                                                <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
81 81
                                             </div>
82 82
                                             <div ng-if="grainCondition.max!=250">
83 83
                                                 <div ng-if="grainCondition.max >= warningValueList[grainCondition.storehouse].high">
@@ -96,7 +96,7 @@
96 96
                                         <td style="text-align:center;">
97 97
                                             <!--低温报警-->
98 98
                                             <div ng-if="grainCondition.min==250">
99
-                                                <span style="color: red;">设备异常</span>
99
+                                                <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
100 100
                                             </div>
101 101
                                             <div ng-if="grainCondition.min!=250">
102 102
                                                 <div ng-if="grainCondition.min <= warningValueList[grainCondition.storehouse].low">
@@ -112,7 +112,7 @@
112 112
                                         </td>
113 113
                                         <td style="text-align:center;">
114 114
                                             <div ng-if="grainCondition.avg==250">
115
-                                                <span style="color: red;">设备异常</span>
115
+                                                <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
116 116
                                             </div>
117 117
                                             <div ng-if="grainCondition.avg!=250">{{ grainCondition.avg}}</div>
118 118
                                         </td>

+ 5 - 5
depot-web/src/main/resources/static/app/intelligent/grainDetection/views/humitureDetection-list.html

@@ -75,20 +75,20 @@
75 75
                                         <td style="text-align:center;">{{ humitureDetection.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
76 76
                                         <td style="text-align:center;">
77 77
                                             <div ng-if="humitureDetection.intemp==250">
78
-                                                <span style="color: red;">设备异常</span>
78
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
79 79
                                             </div>
80 80
                                             <div ng-if="humitureDetection.intemp!=250">{{ humitureDetection.intemp }}</div>
81 81
                                         </td>
82 82
                                         <td style="text-align:center;">
83 83
                                             <div ng-if="humitureDetection.inh==250">
84
-                                                <span style="color: red;">设备异常</span>
84
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
85 85
                                             </div>
86 86
                                             <div ng-if="humitureDetection.inh!=250">{{ humitureDetection.inh }}</div>
87 87
                                         </td>
88 88
                                         <td style="text-align:center;">
89 89
                                             <!--高温报警-->
90 90
                                             <div ng-if="humitureDetection.max==250">
91
-                                                <span style="color: red;">设备异常</span>
91
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
92 92
                                             </div>
93 93
                                             <div ng-if="humitureDetection.max!=250">
94 94
                                                 <div ng-if="humitureDetection.max >= warningValueList[humitureDetection.storehouse].high">
@@ -107,7 +107,7 @@
107 107
                                         <td style="text-align:center;">
108 108
                                             <!--低温报警-->
109 109
                                             <div ng-if="humitureDetection.min==250">
110
-                                                <span style="color: red;">设备异常</span>
110
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
111 111
                                             </div>
112 112
                                             <div ng-if="humitureDetection.min!=250">
113 113
                                                 <div ng-if="humitureDetection.min <= warningValueList[humitureDetection.storehouse].low">
@@ -123,7 +123,7 @@
123 123
                                         </td>
124 124
                                         <td style="text-align:center;">
125 125
                                             <div ng-if="humitureDetection.avg==250">
126
-                                                <span style="color: red;">设备异常</span>
126
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
127 127
                                             </div>
128 128
                                             <div ng-if="humitureDetection.avg!=250">{{ humitureDetection.avg}}</div>
129 129
                                         </td>

+ 7 - 7
depot-web/src/main/resources/static/app/intelligent/grainDetection/views/temperatureRecord-model.html

@@ -115,7 +115,7 @@
115 115
                     <th style="border: 1px solid #000;text-align: center;">仓内温</th>
116 116
                     <th style="border: 1px solid #000;text-align: center;">
117 117
                         <div ng-if="intemp==250">
118
-                            <span style="color: red;">设备异常</span>
118
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
119 119
                         </div>
120 120
                         <div ng-if="intemp!=250">{{intemp}}</div>
121 121
                     </th>
@@ -126,14 +126,14 @@
126 126
                     <th style="border: 1px solid #000;text-align: center;">仓内湿</th>
127 127
                     <th style="border: 1px solid #000;text-align: center;">
128 128
                         <div ng-if="inh==250">
129
-                            <span style="color: red;">设备异常</span>
129
+                            <acronym title="设备异常"><span style="color: red;">{{-1}}</span></acronym>
130 130
                         </div>
131 131
                         <div ng-if="inh!=250">{{inh}}</div>
132 132
                     </th>
133 133
                     <th colspan="{{tableTwo_1}}" style="border: 1px solid #000;text-align: center;">平均粮温</th>
134 134
                     <th style="border: 1px solid #000;text-align: center;">
135 135
                         <div ng-if="avg==250">
136
-                            <span style="color: red;">设备异常</span>
136
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
137 137
                         </div>
138 138
                         <div ng-if="avg!=250">{{avg}}</div>
139 139
                     </th>
@@ -142,7 +142,7 @@
142 142
                     <th style="border: 1px solid #000;text-align: center;">仓外温</th>
143 143
                     <th style="border: 1px solid #000;text-align: center;">
144 144
                         <div ng-if="outtemp==250">
145
-                            <span style="color: red;">设备异常</span>
145
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
146 146
                         </div>
147 147
                         <div ng-if="outtemp!=250">{{outtemp}}</div>
148 148
                     </th>
@@ -150,7 +150,7 @@
150 150
                     <th style="border: 1px solid #000;text-align: center;">
151 151
                         <!--高温报警-->
152 152
                         <div ng-if="max==250">
153
-                            <span style="color: red;">设备异常</span>
153
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
154 154
                         </div>
155 155
                         <div ng-if="max!=250">
156 156
                             <div ng-if="max >= warningValueList[vCfCode].high">
@@ -171,7 +171,7 @@
171 171
                     <th style="border: 1px solid #000;text-align: center;">仓外湿</th>
172 172
                     <th style="border: 1px solid #000;text-align: center;">
173 173
                         <div ng-if="outh==250">
174
-                            <span style="color: red;">设备异常</span>
174
+                            <acronym title="设备异常"><span style="color: red;">{{-1}}</span></acronym>
175 175
                         </div>
176 176
                         <div ng-if="outh!=250">{{outh}}</div>
177 177
                     </th>
@@ -179,7 +179,7 @@
179 179
                     <th style="border: 1px solid #000;text-align: center;">
180 180
                         <!--低温报警-->
181 181
                         <div ng-if="min==250">
182
-                            <span style="color: red;">设备异常</span>
182
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
183 183
                         </div>
184 184
                         <div ng-if="min!=250">
185 185
                             <div ng-if="min <= warningValueList[vCfCode].low">

+ 36 - 22
depot-web/src/main/resources/static/app/intelligent/grainInspect/views/grainAnalyze-list.html

@@ -70,48 +70,62 @@
70 70
                                         <td style="text-align:center;">{{ grainAnalyzeList.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
71 71
                                         <td style="text-align:center;">
72 72
                                             <div ng-if="grainAnalyzeList.intemp==250">
73
-                                                <acronym title="设备异常"><span style="color: red;">{{ grainAnalyzeList.intemp }}</span></acronym>
73
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
74 74
                                             </div>
75 75
                                             <div ng-if="grainAnalyzeList.intemp!=250">{{ grainAnalyzeList.intemp }}</div>
76 76
                                         </td>
77 77
                                         <td style="text-align:center;">
78 78
                                             <div ng-if="grainAnalyzeList.inh==250">
79
-                                                <acronym title="设备异常"><span style="color: red;">{{ grainAnalyzeList.inh }}</span></acronym>
79
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
80 80
                                             </div>
81 81
                                             <div ng-if="grainAnalyzeList.inh!=250">{{ grainAnalyzeList.inh }}</div>
82 82
                                         </td>
83 83
                                         <td style="text-align:center;">
84 84
                                             <!--高温报警-->
85
-                                            <div ng-if="grainAnalyzeList.max >= warningValueList[grainAnalyzeList.storehouse].high">
86
-                                                <div ng-if="grainAnalyzeList.max==250">
87
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainAnalyzeList.max }}</span></acronym>
85
+                                            <div ng-if="grainAnalyzeList.max==250">
86
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
87
+                                            </div>
88
+                                            <div ng-if="grainAnalyzeList.max!=250">
89
+                                                <div ng-if="grainAnalyzeList.max >= warningValueList[grainAnalyzeList.storehouse].high">
90
+                                                    <div ng-if="grainAnalyzeList.max!=250">
91
+                                                        <acronym title="粮温高限报警为: {{warningValueList[grainAnalyzeList.storehouse].high}}℃">
92
+                                                            <span style="color: red;">{{ grainAnalyzeList.max }}</span>
93
+                                                        </acronym>
94
+                                                    </div>
88 95
                                                 </div>
89
-                                                <div ng-if="grainAnalyzeList.max!=250">
90
-                                                    <acronym title="粮温高限报警为: {{warningValueList[grainAnalyzeList.storehouse].high}}℃"><span style="color: red;">{{ grainAnalyzeList.max }}</span></acronym>
96
+                                                <div ng-if="grainAnalyzeList.max < warningValueList[grainAnalyzeList.storehouse].high">
97
+                                                    <span>{{ grainAnalyzeList.max }}</span>
98
+                                                </div>
99
+                                                <div ng-if="warningValueList[grainAnalyzeList.storehouse].high == null">
100
+                                                    <span>{{ grainAnalyzeList.max }}</span>
91 101
                                                 </div>
92 102
                                             </div>
93
-                                            <div ng-if="grainAnalyzeList.max < warningValueList[grainAnalyzeList.storehouse].high">
94
-                                                <span>{{ grainAnalyzeList.max }}</span>
95
-                                            </div>
96
-                                            <div ng-if="warningValueList[grainAnalyzeList.storehouse].high == null">
97
-                                                <span>{{ grainAnalyzeList.max }}</span>
98
-                                            </div>
99
-                                            <!--高温预警-->
100 103
                                         </td>
101 104
                                         <td style="text-align:center;">
102 105
                                             <!--低温报警-->
103
-                                            <div ng-if="grainAnalyzeList.min <= warningValueList[grainAnalyzeList.storehouse].low">
104
-                                                <acronym title="粮温低限报警为: {{warningValueList[grainAnalyzeList.storehouse].low}}℃"><span style="color: red;">{{ grainAnalyzeList.min }}</span></acronym>
106
+                                            <div ng-if="grainAnalyzeList.min==250">
107
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
105 108
                                             </div>
106
-                                            <div ng-if="grainAnalyzeList.min > warningValueList[grainAnalyzeList.storehouse].low">
107
-                                                <span>{{ grainAnalyzeList.min }}</span>
109
+                                            <div ng-if="grainAnalyzeList.min!=250">
110
+                                                <div ng-if="grainAnalyzeList.min <= warningValueList[grainAnalyzeList.storehouse].low">
111
+                                                    <acronym title="粮温低限报警为: {{warningValueList[grainAnalyzeList.storehouse].low}}℃">
112
+                                                        <span style="color: red;">{{ grainAnalyzeList.min }}</span>
113
+                                                    </acronym>
114
+                                                </div>
115
+                                                <div ng-if="grainAnalyzeList.min > warningValueList[grainAnalyzeList.storehouse].low">
116
+                                                    <span>{{ grainAnalyzeList.min }}</span>
117
+                                                </div>
118
+                                                <div ng-if="warningValueList[grainAnalyzeList.storehouse].low == null">
119
+                                                    <span>{{ grainAnalyzeList.min }}</span>
120
+                                                </div>
108 121
                                             </div>
109
-                                            <div ng-if="warningValueList[grainAnalyzeList.storehouse].low == null">
110
-                                                <span>{{ grainAnalyzeList.min }}</span>
122
+                                        </td>
123
+                                        <td style="text-align:center;">
124
+                                            <div ng-if="grainAnalyzeList.avg==250">
125
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
111 126
                                             </div>
112
-                                            <!--低温预警-->
127
+                                            <div ng-if="grainAnalyzeList.avg!=250">{{ grainAnalyzeList.avg }}</div>
113 128
                                         </td>
114
-                                        <td style="text-align:center;">{{ grainAnalyzeList.avg}}</td>
115 129
                                         <td style="text-align:center;">
116 130
                                             <a ng-click="grainDetectionDetail(grainAnalyzeList)"><i class=""></i>详情</a>
117 131
                                         </td>

+ 34 - 26
depot-web/src/main/resources/static/app/intelligent/grainInspect/views/pastRecordsData-list.html

@@ -79,52 +79,60 @@
79 79
                                         <td style="text-align:center;">{{ pastRecordsList.time | date:'yyyy-MM-dd HH:mm:ss'}}</td>
80 80
                                         <td style="text-align:center;">
81 81
                                             <div ng-if="pastRecordsList.intemp==250">
82
-                                                <acronym title="设备异常"><span style="color: red;">{{ pastRecordsList.intemp }}</span></acronym>
82
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
83 83
                                             </div>
84 84
                                             <div ng-if="pastRecordsList.intemp!=250">{{ pastRecordsList.intemp }}</div>
85 85
                                         </td>
86 86
                                         <td style="text-align:center;">
87 87
                                             <div ng-if="pastRecordsList.inh==250">
88
-                                                <acronym title="设备异常"><span style="color: red;">{{ pastRecordsList.inh }}</span></acronym>
88
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
89 89
                                             </div>
90 90
                                             <div ng-if="pastRecordsList.inh!=250">{{ pastRecordsList.inh }}</div>
91 91
                                         </td>
92 92
                                         <td style="text-align:center;">
93 93
                                             <!--高温报警-->
94
-                                            <div ng-if="pastRecordsList.max >= warningValueList[pastRecordsList.storehouse].high">
95
-                                                <div ng-if="pastRecordsList.max==250">
96
-                                                    <acronym title="设备异常"><span style="color: red;">{{ pastRecordsList.max }}</span></acronym>
94
+                                            <div ng-if="pastRecordsList.max==250">
95
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
96
+                                            </div>
97
+                                            <div ng-if="pastRecordsList.max!=250">
98
+                                                <div ng-if="pastRecordsList.max >= warningValueList[pastRecordsList.storehouse].high">
99
+                                                    <div ng-if="pastRecordsList.max!=250">
100
+                                                        <acronym title="粮温高限报警为: {{warningValueList[pastRecordsList.storehouse].high}}℃"><span style="color: red;">{{ pastRecordsList.max }}</span></acronym>
101
+                                                    </div>
97 102
                                                 </div>
98
-                                                <div ng-if="pastRecordsList.max!=250">
99
-                                                    <acronym
100
-                                                            title="粮温高限报警为: {{warningValueList[pastRecordsList.storehouse].high}}℃"><span
101
-                                                            style="color: red;">{{ pastRecordsList.max }}</span></acronym>
103
+                                                <div ng-if="pastRecordsList.max < warningValueList[pastRecordsList.storehouse].high">
104
+                                                    <span>{{ pastRecordsList.max }}</span>
105
+                                                </div>
106
+                                                <div ng-if="warningValueList[pastRecordsList.storehouse].high == null">
107
+                                                    <span>{{ pastRecordsList.max }}</span>
102 108
                                                 </div>
103 109
                                             </div>
104
-                                            <div ng-if="pastRecordsList.max < warningValueList[pastRecordsList.storehouse].high">
105
-                                                <span>{{ pastRecordsList.max }}</span>
106
-                                            </div>
107
-                                            <div ng-if="warningValueList[pastRecordsList.storehouse].high == null">
108
-                                                <span>{{ pastRecordsList.max }}</span>
109
-                                            </div>
110
-                                            <!--高温预警-->
111 110
                                         </td>
112 111
                                         <td style="text-align:center;">
113 112
                                             <!--低温报警-->
114
-                                            <div ng-if="pastRecordsList.min <= warningValueList[pastRecordsList.storehouse].low">
115
-                                                <acronym
116
-                                                        title="粮温低限报警为: {{warningValueList[pastRecordsList.storehouse].low}}℃"><span
117
-                                                        style="color: red;">{{ pastRecordsList.min }}</span></acronym>
113
+                                            <div ng-if="pastRecordsList.min==250">
114
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
118 115
                                             </div>
119
-                                            <div ng-if="pastRecordsList.min > warningValueList[pastRecordsList.storehouse].low">
120
-                                                <span>{{ pastRecordsList.min }}</span>
116
+                                            <div ng-if="pastRecordsList.min!=250">
117
+                                                <div ng-if="pastRecordsList.min <= warningValueList[pastRecordsList.storehouse].low">
118
+                                                    <acronym title="粮温低限报警为: {{warningValueList[pastRecordsList.storehouse].low}}℃">
119
+                                                        <span style="color: red;">{{ pastRecordsList.min }}</span>
120
+                                                    </acronym>
121
+                                                </div>
122
+                                                <div ng-if="pastRecordsList.min > warningValueList[pastRecordsList.storehouse].low">
123
+                                                    <span>{{ pastRecordsList.min }}</span>
124
+                                                </div>
125
+                                                <div ng-if="warningValueList[pastRecordsList.storehouse].low == null">
126
+                                                    <span>{{ pastRecordsList.min }}</span>
127
+                                                </div>
121 128
                                             </div>
122
-                                            <div ng-if="warningValueList[pastRecordsList.storehouse].low == null">
123
-                                                <span>{{ pastRecordsList.min }}</span>
129
+                                        </td>
130
+                                        <td style="text-align:center;">
131
+                                            <div ng-if="pastRecordsList.avg==250">
132
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
124 133
                                             </div>
125
-                                            <!--低温预警-->
134
+                                            <div ng-if="pastRecordsList.avg!=250">{{ pastRecordsList.avg}}</div>
126 135
                                         </td>
127
-                                        <td style="text-align:center;">{{ pastRecordsList.avg}}</td>
128 136
                                         <td style="text-align:center;">
129 137
                                             <a ng-click="showView(pastRecordsList)"><i class=""></i>详情</a>
130 138
                                         </td>

+ 32 - 22
depot-web/src/main/resources/static/app/intelligent/grainInspect/views/realTimeData-list.html

@@ -65,49 +65,59 @@
65 65
                                         <td style="text-align:center;">{{ realTimeList.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
66 66
                                         <td style="text-align:center;">
67 67
                                             <div ng-if="realTimeList.intemp==250">
68
-                                                <acronym title="设备异常"><span style="color: red;">{{ realTimeList.intemp }}</span></acronym>
68
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
69 69
                                             </div>
70 70
                                             <div ng-if="realTimeList.intemp!=250">{{ realTimeList.intemp }}</div>
71 71
                                         </td>
72 72
                                         <td style="text-align:center;">
73 73
                                             <div ng-if="realTimeList.inh==250">
74
-                                                <acronym title="设备异常"><span style="color: red;">{{ realTimeList.inh }}</span></acronym>
74
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
75 75
                                             </div>
76 76
                                             <div ng-if="realTimeList.inh!=250">{{ realTimeList.inh }}</div>
77 77
                                         </td>
78 78
 
79 79
                                         <td style="text-align:center;">
80 80
                                             <!--高温报警-->
81
-                                            <div ng-if="realTimeList.max >= warningValueList[realTimeList.storehouse].high">
82
-                                                <div ng-if="realTimeList.max==250">
83
-                                                    <acronym title="设备异常"><span style="color: red;">{{ realTimeList.max }}</span></acronym>
81
+                                            <div ng-if="realTimeList.max==250">
82
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
83
+                                            </div>
84
+                                            <div ng-if="realTimeList.max!=250">
85
+                                                <div ng-if="realTimeList.max >= warningValueList[realTimeList.storehouse].high">
86
+                                                    <div ng-if="realTimeList.max!=250">
87
+                                                        <acronym title="粮温高限报警为: {{warningValueList[realTimeList.storehouse].high}}℃"><span style="color: red;">{{ realTimeList.max }}</span></acronym>
88
+                                                    </div>
84 89
                                                 </div>
85
-                                                <div ng-if="realTimeList.max!=250">
86
-                                                    <acronym title="粮温高限报警为: {{warningValueList[realTimeList.storehouse].high}}℃"><span style="color: red;">{{ realTimeList.max }}</span></acronym>
90
+                                                <div ng-if="realTimeList.max < warningValueList[realTimeList.storehouse].high">
91
+                                                    <span>{{ realTimeList.max }}</span>
92
+                                                </div>
93
+                                                <div ng-if="warningValueList[realTimeList.storehouse].high == null">
94
+                                                    <span>{{ realTimeList.max }}</span>
87 95
                                                 </div>
88 96
                                             </div>
89
-                                            <div ng-if="realTimeList.max < warningValueList[realTimeList.storehouse].high">
90
-                                                <span>{{ realTimeList.max }}</span>
91
-                                            </div>
92
-                                            <div ng-if="warningValueList[realTimeList.storehouse].high == null">
93
-                                                <span>{{ realTimeList.max }}</span>
94
-                                            </div>
95
-                                            <!--高温预警-->
96 97
                                         </td>
97 98
                                         <td style="text-align:center;">
98 99
                                             <!--低温报警-->
99
-                                            <div ng-if="realTimeList.min <= warningValueList[realTimeList.storehouse].low">
100
-                                                <acronym title="粮温低限报警为: {{warningValueList[realTimeList.storehouse].low}}℃"><span style="color: red;">{{ realTimeList.min }}</span></acronym>
100
+                                            <div ng-if="realTimeList.min==250">
101
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
101 102
                                             </div>
102
-                                            <div ng-if="realTimeList.min > warningValueList[realTimeList.storehouse].low">
103
-                                                <span>{{ realTimeList.min }}</span>
103
+                                            <div ng-if="realTimeList.min!=250">
104
+                                                <div ng-if="realTimeList.min <= warningValueList[realTimeList.storehouse].low">
105
+                                                    <acronym title="粮温低限报警为: {{warningValueList[realTimeList.storehouse].low}}℃"><span style="color: red;">{{ realTimeList.min }}</span></acronym>
106
+                                                </div>
107
+                                                <div ng-if="realTimeList.min > warningValueList[realTimeList.storehouse].low">
108
+                                                    <span>{{ realTimeList.min }}</span>
109
+                                                </div>
110
+                                                <div ng-if="warningValueList[realTimeList.storehouse].low == null">
111
+                                                    <span>{{ realTimeList.min }}</span>
112
+                                                </div>
104 113
                                             </div>
105
-                                            <div ng-if="warningValueList[realTimeList.storehouse].low == null">
106
-                                                <span>{{ realTimeList.min }}</span>
114
+                                        </td>
115
+                                        <td style="text-align:center;">
116
+                                            <div ng-if="realTimeList.avg==250">
117
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
107 118
                                             </div>
108
-                                            <!--低温预警-->
119
+                                            <div ng-if="realTimeList.avg!=250">{{ realTimeList.avg}}</div>
109 120
                                         </td>
110
-                                        <td style="text-align:center;">{{ realTimeList.avg}}</td>
111 121
                                         <td has-botton="2" style="text-align:center;">
112 122
                                             <a href-void ng-click="onlyStoreGrainTemperatureDetection(realTimeList.storehouse)"><i class=""></i>{{storeHouseCodeObj[realTimeList.storehouse].storehouseName}}检测</a>
113 123
                                         </td>

+ 43 - 29
depot-web/src/main/resources/static/app/intelligent/grainInspect/views/reportForms-list.html

@@ -101,63 +101,77 @@
101 101
                                             <td style="text-align:center;">{{ grainReport.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
102 102
                                             <td style="text-align:center;">
103 103
                                                 <div ng-if="grainReport.outtemp==250">
104
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainReport.outtemp }}</span></acronym>
104
+                                                    <acronym title="设备异常"><span
105
+                                                            style="color: red;">{{ -100 }}</span></acronym>
105 106
                                                 </div>
106 107
                                                 <div ng-if="grainReport.outtemp!=250">{{ grainReport.outtemp }}</div>
107 108
                                             </td>
108 109
                                             <td style="text-align:center;">
109 110
                                                 <div ng-if="grainReport.outh==250">
110
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainReport.outh }}</span></acronym>
111
+                                                    <acronym title="设备异常"><span
112
+                                                            style="color: red;">{{ -1 }}</span></acronym>
111 113
                                                 </div>
112 114
                                                 <div ng-if="grainReport.outh!=250">{{ grainReport.outh }}</div>
113 115
                                             </td>
114 116
                                             <td style="text-align:center;">
115 117
                                                 <div ng-if="grainReport.intemp==250">
116
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainReport.intemp }}</span></acronym>
118
+                                                    <acronym title="设备异常"><span
119
+                                                            style="color: red;">{{ -100 }}</span></acronym>
117 120
                                                 </div>
118 121
                                                 <div ng-if="grainReport.intemp!=250">{{ grainReport.intemp }}</div>
119 122
                                             </td>
120 123
                                             <td style="text-align:center;">
121 124
                                                 <div ng-if="grainReport.inh==250">
122
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainReport.inh }}</span></acronym>
125
+                                                    <acronym title="设备异常"><span
126
+                                                            style="color: red;">{{ -1 }}</span></acronym>
123 127
                                                 </div>
124 128
                                                 <div ng-if="grainReport.inh!=250">{{ grainReport.inh }}</div>
125 129
                                             </td>
126
-                                            <td style="text-align:center;">{{ grainReport.avg}}</td>
130
+                                            <td style="text-align:center;">
131
+                                                <div ng-if="grainReport.avg==250">
132
+                                                    <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
133
+                                                </div>
134
+                                                <div ng-if="grainReport.avg!=250">{{ grainReport.avg }}</div>
135
+                                            </td>
127 136
                                             <td style="text-align:center;">
128 137
                                                 <!--高温报警-->
129
-                                                <div ng-if="grainReport.max >= warningValueList[grainReport.storehouse].high">
130
-                                                    <div ng-if="grainReport.max==250">
131
-                                                        <acronym title="设备异常"><span style="color: red;">{{ grainReport.max }}</span></acronym>
138
+                                                <div ng-if="grainReport.max==250">
139
+                                                    <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
140
+                                                </div>
141
+                                                <div ng-if="grainReport.max!=250">
142
+                                                    <div ng-if="grainReport.max >= warningValueList[grainReport.storehouse].high">
143
+                                                        <div ng-if="grainReport.max!=250">
144
+                                                            <acronym title="粮温高限报警为: {{warningValueList[grainReport.storehouse].high}}℃">
145
+                                                                <span style="color: red;">{{ grainReport.max }}</span>
146
+                                                            </acronym>
147
+                                                        </div>
132 148
                                                     </div>
133
-                                                    <div ng-if="grainReport.max!=250">
134
-                                                        <acronym
135
-                                                                title="粮温高限报警为: {{warningValueList[grainReport.storehouse].high}}℃"><span
136
-                                                                style="color: red;">{{ grainReport.max }}</span></acronym>
149
+                                                    <div ng-if="grainReport.max < warningValueList[grainReport.storehouse].high">
150
+                                                        <span>{{ grainReport.max }}</span>
151
+                                                    </div>
152
+                                                    <div ng-if="warningValueList[grainReport.storehouse].high == null">
153
+                                                        <span>{{ grainReport.max }}</span>
137 154
                                                     </div>
138 155
                                                 </div>
139
-                                                <div ng-if="grainReport.max < warningValueList[grainReport.storehouse].high">
140
-                                                    <span>{{ grainReport.max }}</span>
141
-                                                </div>
142
-                                                <div ng-if="warningValueList[grainReport.storehouse].high == null">
143
-                                                    <span>{{ grainReport.max }}</span>
144
-                                                </div>
145
-                                                <!--高温预警-->
146 156
                                             </td>
147 157
                                             <td style="text-align:center;">
148 158
                                                 <!--低温报警-->
149
-                                                <div ng-if="grainReport.min <= warningValueList[grainReport.storehouse].low">
150
-                                                    <acronym
151
-                                                            title="粮温低限报警为: {{warningValueList[grainReport.storehouse].low}}℃"><span
152
-                                                            style="color: red;">{{ grainReport.min }}</span></acronym>
153
-                                                </div>
154
-                                                <div ng-if="grainReport.min > warningValueList[grainReport.storehouse].low">
155
-                                                    <span>{{ grainReport.min }}</span>
159
+                                                <div ng-if="grainReport.min==250">
160
+                                                    <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
156 161
                                                 </div>
157
-                                                <div ng-if="warningValueList[grainReport.storehouse].low == null">
158
-                                                    <span>{{ grainReport.min }}</span>
162
+                                                <div ng-if="grainReport.min!=250">
163
+                                                    <div ng-if="grainReport.min <= warningValueList[grainReport.storehouse].low">
164
+                                                        <acronym title="粮温低限报警为: {{warningValueList[grainReport.storehouse].low}}℃">
165
+                                                            <span style="color: red;">{{ grainReport.min }}</span>
166
+                                                        </acronym>
167
+                                                    </div>
168
+                                                    <div ng-if="grainReport.min > warningValueList[grainReport.storehouse].low">
169
+                                                        <span>{{ grainReport.min }}</span>
170
+                                                    </div>
171
+                                                    <div ng-if="warningValueList[grainReport.storehouse].low == null">
172
+                                                        <span>{{ grainReport.min }}</span>
173
+                                                    </div>
159 174
                                                 </div>
160
-                                                <!--低温预警-->
161 175
                                             </td>
162 176
                                         </tr>
163 177
                                         </tbody>