Przeglądaj źródła

应急端前端-1显示修改

hanqingsong 5 lat temu
rodzic
commit
4519219348

+ 7 - 7
depot-web/src/main/resources/static/app/intelligent/grainDetection/controller/humitureDetectionModel.js

@@ -93,7 +93,7 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
93 93
     };
94 94
     $scope.calculateMethod();
95 95
 
96
-    // 动态表
96
+    // 动态表(绝对0度:273.15,所以使用274)
97 97
     $scope.getDataToCFCodeAndTime = function () {
98 98
         // 带标杆号温度表格
99 99
         temperatureRecordService.tempTableByTimeAndCfCode(items.id).then(function (data) {
@@ -158,7 +158,7 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
158 158
                                             "<td style=\"border-style: none none solid none;text-align: center;\">"
159 159
                                             + "<acronym title=\"粮温高限报警为: " + aamax + "℃\">"
160 160
                                             + "<span style=\"color: red;\">" + '↑' + tier + "</span>" + "</acronym>" + "</td>");
161
-                                    } else if (tier <= (wvl == undefined ? -1 : wvl.low)) { // 低温报警
161
+                                    } else if (tier <= (wvl == undefined ? -274 : wvl.low)) { // 低温报警
162 162
                                         $("#table_6 tr").eq(trId + 1).append(
163 163
                                             "<td style=\"border-style: none none solid none;text-align: center;\">"
164 164
                                             + "<acronym title=\"粮温低限报警为: " + aamin + "℃\">"
@@ -182,7 +182,7 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
182 182
                                         "<td style=\"border-style: none none hidden none;text-align: center;\">"
183 183
                                         + "<acronym title=\"粮温高限报警为: " + aamax + "℃\">"
184 184
                                         + "<span style=\"color: red;\">" + '↑' + tier + "</span>" + "</acronym>" + "</td>");
185
-                                } else if (tier <= (wvl == undefined ? -1 : wvl.low)) { // 低温报警
185
+                                } else if (tier <= (wvl == undefined ? -274 : wvl.low)) { // 低温报警
186 186
                                     $("#table_6 tr").eq(trId + 1).append(
187 187
                                         "<td style=\"border-style: none none hidden none;text-align: center;\">"
188 188
                                         + "<acronym title=\"粮温低限报警为: " + aamin + "℃\">"
@@ -207,7 +207,7 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
207 207
                                         "<td style=\"border-style: none none solid none;text-align: center;\">"
208 208
                                         + "<acronym title=\"粮温高限报警为: " + aamax + "℃\">"
209 209
                                         + "<span style=\"color: red;\">" + '↑' + tier + "</span>" + "</acronym>" + "</td>");
210
-                                } else if (tier <= (wvl == undefined ? -1 : wvl.low)) { // 低温报警
210
+                                } else if (tier <= (wvl == undefined ? -274 : wvl.low)) { // 低温报警
211 211
                                     $("#table_6 tr").eq(trId + 1).append(
212 212
                                         "<td style=\"border-style: none none solid none;text-align: center;\">"
213 213
                                         + "<acronym title=\"粮温低限报警为: " + aamin + "℃\">"
@@ -230,7 +230,7 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
230 230
                                         "<td style=\"border-style: none none hidden none;text-align: center;\">"
231 231
                                         + "<acronym title=\"粮温高限报警为: " + aamax + "℃\">"
232 232
                                         + "<span style=\"color: red;\">" + '↑' + tier + "</span>" + "</acronym>" + "</td>");
233
-                                } else if (tier <= (wvl == undefined ? -1 : wvl.low)) { // 低温报警
233
+                                } else if (tier <= (wvl == undefined ? -274 : wvl.low)) { // 低温报警
234 234
                                     $("#table_6 tr").eq(trId + 1).append(
235 235
                                         "<td style=\"border-style: none none hidden none;text-align: center;\">"
236 236
                                         + "<acronym title=\"粮温低限报警为: " + aamin + "℃\">"
@@ -347,7 +347,7 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
347 347
                             "<td style=\"border-style: none solid none none;text-align: center;\">"
348 348
                             + "<span style=\"color: red;\">-100</span>" + "</td>");
349 349
                     } else {
350
-                        if (lmin <= (wvl == undefined ? -1 : wvl.low)) {
350
+                        if (lmin <= (wvl == undefined ? -274 : wvl.low)) {
351 351
                             $("#table_avg tr").eq(i + 1).append(
352 352
                                 "<td style=\"border-style: none solid none none;text-align: center;\">"
353 353
                                 + "<acronym title=\"粮温低限报警为: " + aamin + "℃\">"
@@ -405,7 +405,7 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
405 405
                     $("#table_avg tr").eq(2).append(
406 406
                         "<td colspan='" + $scope.td_type_5 + "' style=\"border-style: none solid none none;text-align: left;color: red;\">-100</td>");
407 407
                 } else {
408
-                    if ($scope.min <= (wvl == undefined ? -1 : wvl.low)) {
408
+                    if ($scope.min <= (wvl == undefined ? -274 : wvl.low)) {
409 409
                         $("#table_avg tr").eq(2).append(
410 410
                             "<td colspan='" + $scope.td_type_5 + "' style=\"border-style: none solid none none;text-align: left;\">"
411 411
                             + "<acronym title=\"粮温低限报警为: " + lmin + "℃\">"