修改测温异常点，显示问题

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

@@ -65,48 +65,58 @@
                                         <td style="text-align:center;">{{ grainCondition.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
                                             <div ng-if="grainCondition.intemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{grainCondition.intemp}}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
                                             </div>
                                             <div ng-if="grainCondition.intemp!=250">{{grainCondition.intemp}}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="grainCondition.inh==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{grainCondition.inh}}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{-1}}</span></acronym>
                                             </div>
                                             <div ng-if="grainCondition.inh!=250">{{grainCondition.inh}}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <!--高温报警-->
-                                            <div ng-if="grainCondition.max >= warningValueList[grainCondition.storehouse].high">
-                                                <div ng-if="grainCondition.max==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainCondition.max }}</span></acronym>
+                                            <div ng-if="grainCondition.max==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
+                                            </div>
+                                            <div ng-if="grainCondition.max!=250">
+                                                <div ng-if="grainCondition.max >= warningValueList[grainCondition.storehouse].high">
+                                                    <div ng-if="grainCondition.max!=250">
+                                                        <acronym title="粮温高限报警为: {{warningValueList[grainCondition.storehouse].high}}℃"><span style="color: red;">{{ grainCondition.max }}</span></acronym>
+                                                    </div>
                                                 </div>
-                                                <div ng-if="grainCondition.max!=250">
-                                                    <acronym title="粮温高限报警为: {{warningValueList[grainCondition.storehouse].high}}℃"><span style="color: red;">{{ grainCondition.max }}</span></acronym>
+                                                <div ng-if="grainCondition.max < warningValueList[grainCondition.storehouse].high">
+                                                    <span>{{ grainCondition.max }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[grainCondition.storehouse].high == null">
+                                                    <span>{{ grainCondition.max }}</span>
                                                 </div>
                                             </div>
-                                            <div ng-if="grainCondition.max < warningValueList[grainCondition.storehouse].high">
-                                                <span>{{ grainCondition.max }}</span>
-                                            </div>
-                                            <div ng-if="warningValueList[grainCondition.storehouse].high == null">
-                                                <span>{{ grainCondition.max }}</span>
-                                            </div>
-                                            <!--高温预警-->
                                         </td>
                                         <td style="text-align:center;">
                                             <!--低温报警-->
-                                            <div ng-if="grainCondition.min <= warningValueList[grainCondition.storehouse].low">
-                                                <acronym title="粮温低限报警为: {{warningValueList[grainCondition.storehouse].low}}℃"><span style="color: red;">{{ grainCondition.min }}</span></acronym>
+                                            <div ng-if="grainCondition.min==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
                                             </div>
-                                            <div ng-if="grainCondition.min > warningValueList[grainCondition.storehouse].low">
-                                                <span>{{ grainCondition.min }}</span>
+                                            <div ng-if="grainCondition.min!=250">
+                                                <div ng-if="grainCondition.min <= warningValueList[grainCondition.storehouse].low">
+                                                    <acronym title="粮温低限报警为: {{warningValueList[grainCondition.storehouse].low}}℃"><span style="color: red;">{{ grainCondition.min }}</span></acronym>
+                                                </div>
+                                                <div ng-if="grainCondition.min > warningValueList[grainCondition.storehouse].low">
+                                                    <span>{{ grainCondition.min }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[grainCondition.storehouse].low == null">
+                                                    <span>{{ grainCondition.min }}</span>
+                                                </div>
                                             </div>
-                                            <div ng-if="warningValueList[grainCondition.storehouse].low == null">
-                                                <span>{{ grainCondition.min }}</span>
+                                        </td>
+                                        <td style="text-align:center;">
+                                            <div ng-if="grainCondition.avg==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
                                             </div>
-                                            <!--低温预警-->
+                                            <div ng-if="grainCondition.avg!=250">{{ grainCondition.avg}}</div>
                                         </td>
-                                        <td style="text-align:center;">{{ grainCondition.avg}}</td>
                                         <td has-botton="2" style="text-align:center;">
                                             <a ng-click="getStoreHouseByData(grainCondition)">{{ storeHouseCodeObj[grainCondition.storehouse].storehouseName }}检测</a>
                                         </td>

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

@@ -70,48 +70,58 @@
                                         <td style="text-align:center;">{{ humitureDetection.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
                                             <div ng-if="humitureDetection.intemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ humitureDetection.intemp }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
                                             <div ng-if="humitureDetection.intemp!=250">{{ humitureDetection.intemp }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="humitureDetection.inh==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ humitureDetection.inh }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
                                             </div>
                                             <div ng-if="humitureDetection.inh!=250">{{ humitureDetection.inh }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <!--高温报警-->
-                                            <div ng-if="humitureDetection.max >= warningValueList[humitureDetection.storehouse].high">
-                                                <div ng-if="humitureDetection.max==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ humitureDetection.max }}</span></acronym>
+                                            <div ng-if="humitureDetection.max==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
+                                            </div>
+                                            <div ng-if="humitureDetection.max!=250">
+                                                <div ng-if="humitureDetection.max >= warningValueList[humitureDetection.storehouse].high">
+                                                    <div ng-if="humitureDetection.max!=250">
+                                                        <acronym title="粮温高限报警为: {{warningValueList[humitureDetection.storehouse].high}}℃"><span style="color: red;">{{ humitureDetection.max }}</span></acronym>
+                                                    </div>
                                                 </div>
-                                                <div ng-if="humitureDetection.max!=250">
-                                                    <acronym title="粮温高限报警为: {{warningValueList[humitureDetection.storehouse].high}}℃"><span style="color: red;">{{ humitureDetection.max }}</span></acronym>
+                                                <div ng-if="humitureDetection.max < warningValueList[humitureDetection.storehouse].high">
+                                                    <span>{{ humitureDetection.max }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[humitureDetection.storehouse].high == null">
+                                                    <span>{{ humitureDetection.max }}</span>
                                                 </div>
                                             </div>
-                                            <div ng-if="humitureDetection.max < warningValueList[humitureDetection.storehouse].high">
-                                                <span>{{ humitureDetection.max }}</span>
-                                            </div>
-                                            <div ng-if="warningValueList[humitureDetection.storehouse].high == null">
-                                                <span>{{ humitureDetection.max }}</span>
-                                            </div>
-                                            <!--高温预警-->
                                         </td>
                                         <td style="text-align:center;">
                                             <!--低温报警-->
-                                            <div ng-if="humitureDetection.min <= warningValueList[humitureDetection.storehouse].low">
-                                                <acronym title="粮温低限报警为: {{warningValueList[humitureDetection.storehouse].low}}℃"><span style="color: red;">{{ humitureDetection.min }}</span></acronym>
+                                            <div ng-if="humitureDetection.min==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
-                                            <div ng-if="humitureDetection.min > warningValueList[humitureDetection.storehouse].low">
-                                                <span>{{ humitureDetection.min }}</span>
+                                            <div ng-if="humitureDetection.min!=250">
+                                                <div ng-if="humitureDetection.min <= warningValueList[humitureDetection.storehouse].low">
+                                                    <acronym title="粮温低限报警为: {{warningValueList[humitureDetection.storehouse].low}}℃"><span style="color: red;">{{ humitureDetection.min }}</span></acronym>
+                                                </div>
+                                                <div ng-if="humitureDetection.min > warningValueList[humitureDetection.storehouse].low">
+                                                    <span>{{ humitureDetection.min }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[humitureDetection.storehouse].low == null">
+                                                    <span>{{ humitureDetection.min }}</span>
+                                                </div>
                                             </div>
-                                            <div ng-if="warningValueList[humitureDetection.storehouse].low == null">
-                                                <span>{{ humitureDetection.min }}</span>
+                                        </td>
+                                        <td style="text-align:center;">
+                                            <div ng-if="humitureDetection.avg==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
-                                            <!--低温预警-->
+                                            <div ng-if="humitureDetection.avg!=250">{{ humitureDetection.avg}}</div>
                                         </td>
-                                        <td style="text-align:center;">{{ humitureDetection.avg }}</td>
                                         <td has-botton="2" style="text-align:center;">
                                             <a href-void ng-click="onlyStoreGrainTemperatureDetection(humitureDetection.storehouse)"><i class=""></i>{{storeHouseCodeObj[humitureDetection.storehouse].storehouseName}}检测</a>
                                         </td>

depot-web/src/main/resources/static/app/intelligent/grainDetection/views/humitureDetection-model.html

@@ -67,7 +67,7 @@
                     <td style="border: 1px solid #000;text-align: center;">仓内温</td>
                     <td style="border: 1px solid #000;text-align: center;">
                         <div ng-if="intemp==250">
-                            <acronym title="设备异常"><span style="color: red;">{{intemp}}</span></acronym>
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
                         </div>
                         <div ng-if="intemp!=250">{{intemp}}</div>
                     </td>
@@ -78,62 +78,72 @@
                     <td style="border: 1px solid #000;text-align: center;">仓内湿</td>
                     <td style="border: 1px solid #000;text-align: center;">
                         <div ng-if="inh==250">
-                            <acronym title="设备异常"><span style="color: red;">{{inh}}</span></acronym>
+                            <acronym title="设备异常"><span style="color: red;">{{-1}}</span></acronym>
                         </div>
                         <div ng-if="inh!=250">{{inh}}</div>
                     </td>
                     <td colspan="{{tableTwo_1}}" style="border: 1px solid #000;text-align: center;">平均粮温</td>
-                    <td style="border: 1px solid #000;text-align: center;">{{avg}}</td>
+                    <td style="border: 1px solid #000;text-align: center;">
+                        <div ng-if="avg==250">
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
+                        </div>
+                        <div ng-if="avg!=250">{{avg}}</div>
+                    </td>
                 </tr>
                 <tr>
                     <td style="border: 1px solid #000;text-align: center;">仓外温</td>
                     <td style="border: 1px solid #000;text-align: center;">
                         <div ng-if="outtemp==250">
-                            <acronym title="设备异常"><span style="color: red;">{{outtemp}}</span></acronym>
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
                         </div>
                         <div ng-if="outtemp!=250">{{outtemp}}</div>
                     </td>
                     <td colspan="{{tableTwo_1}}" style="border: 1px solid #000;text-align: center;">最高粮温</td>
                     <td style="border: 1px solid #000;text-align: center;">
                         <!--高温报警-->
-                        <div ng-if="max >= warningValueList[vCfCode].high">
-                            <div ng-if="max==250">
-                                <acronym title="设备异常"><span style="color: red;">{{max}}</span></acronym>
+                        <div ng-if="max==250">
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
+                        </div>
+                        <div ng-if="max!=250">
+                            <div ng-if="max >= warningValueList[vCfCode].high">
+                                <div ng-if="max!=250">
+                                    <acronym title="粮温高限报警为: {{warningValueList[vCfCode].high}}℃"><span style="color: red;">{{max}}</span></acronym>
+                                </div>
                             </div>
-                            <div ng-if="max!=250">
-                                <acronym title="粮温高限报警为: {{warningValueList[vCfCode].high}}℃"><span style="color: red;">{{max}}</span></acronym>
+                            <div ng-if="max < warningValueList[vCfCode].high">
+                                <span>{{max}}</span>
+                            </div>
+                            <div ng-if="warningValueList[vCfCode].high == null">
+                                <span>{{max}}</span>
                             </div>
                         </div>
-                        <div ng-if="max < warningValueList[vCfCode].high">
-                            <span>{{max}}</span>
-                        </div>
-                        <div ng-if="warningValueList[vCfCode].high == null">
-                            <span>{{max}}</span>
-                        </div>
-                        <!--高温预警-->
                     </td>
                 </tr>
                 <tr>
                     <td style="border: 1px solid #000;text-align: center;">仓外湿</td>
                     <td style="border: 1px solid #000;text-align: center;">
                         <div ng-if="outh==250">
-                            <acronym title="设备异常"><span style="color: red;">{{outh}}</span></acronym>
+                            <acronym title="设备异常"><span style="color: red;">{{-1}}</span></acronym>
                         </div>
                         <div ng-if="outh!=250">{{outh}}</div>
                     </td>
                     <td colspan="{{tableTwo_1}}" style="border: 1px solid #000;text-align: center;">最低粮温</td>
                     <td style="border: 1px solid #000;text-align: center;">
                         <!--低温报警-->
-                        <div ng-if="min <= warningValueList[vCfCode].low">
-                            <acronym title="粮温低限报警为: {{warningValueList[vCfCode].low}}℃"><span style="color: red;">{{min}}</span></acronym>
-                        </div>
-                        <div ng-if="min > warningValueList[vCfCode].low">
-                            <span>{{min}}</span>
+                        <div ng-if="min==250">
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
                         </div>
-                        <div ng-if="warningValueList[vCfCode].low == null">
-                            <span>{{min}}</span>
+                        <div ng-if="min!=250">
+                            <div ng-if="min <= warningValueList[vCfCode].low">
+                                <acronym title="粮温低限报警为: {{warningValueList[vCfCode].low}}℃"><span style="color: red;">{{min}}</span></acronym>
+                            </div>
+                            <div ng-if="min > warningValueList[vCfCode].low">
+                                <span>{{min}}</span>
+                            </div>
+                            <div ng-if="warningValueList[vCfCode].low == null">
+                                <span>{{min}}</span>
+                            </div>
                         </div>
-                        <!--低温预警-->
                     </td>
                 </tr>
             </table>

depot-web/src/main/resources/static/app/intelligent/grainDetection/views/temperatureRecord-list.html

@@ -66,29 +66,34 @@
                                         <td style="text-align:center;">{{thermometryData.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
                                             <div ng-if="thermometryData.intemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ thermometryData.intemp }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
                                             <div ng-if="thermometryData.intemp!=250">{{ thermometryData.intemp }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="thermometryData.inh==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ thermometryData.inh }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
                                             </div>
                                             <div ng-if="thermometryData.inh!=250">{{ thermometryData.inh }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="thermometryData.outtemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ thermometryData.outtemp }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
                                             <div ng-if="thermometryData.outtemp!=250">{{ thermometryData.outtemp }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="thermometryData.outh==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ thermometryData.outh }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
                                             </div>
                                             <div ng-if="thermometryData.outh!=250">{{ thermometryData.outh }}</div>
                                         </td>
-                                        <td style="text-align:center;">{{thermometryData.avg}}</td>
+                                        <td style="text-align:center;">
+                                            <div ng-if="thermometryData.avg==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
+                                            </div>
+                                            <div ng-if="thermometryData.avg!=250">{{ thermometryData.avg}}</div>
+                                        </td>
                                         <!--<td style="text-align:center;">
                                             <a href-void ng-click="showDelete()"><i class=""></i>未标记</a>
                                         </td>

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

@@ -115,7 +115,7 @@
                     <th style="border: 1px solid #000;text-align: center;">仓内温</th>
                     <th style="border: 1px solid #000;text-align: center;">
                         <div ng-if="intemp==250">
-                            <acronym title="设备异常"><span style="color: red;">{{intemp}}</span></acronym>
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
                         </div>
                         <div ng-if="intemp!=250">{{intemp}}</div>
                     </th>
@@ -126,62 +126,72 @@
                     <th style="border: 1px solid #000;text-align: center;">仓内湿</th>
                     <th style="border: 1px solid #000;text-align: center;">
                         <div ng-if="inh==250">
-                            <acronym title="设备异常"><span style="color: red;">{{inh}}</span></acronym>
+                            <acronym title="设备异常"><span style="color: red;">{{-1}}</span></acronym>
                         </div>
                         <div ng-if="inh!=250">{{inh}}</div>
                     </th>
                     <th colspan="{{tableTwo_1}}" style="border: 1px solid #000;text-align: center;">平均粮温</th>
-                    <th style="border: 1px solid #000;text-align: center;">{{avg}}</th>
+                    <th style="border: 1px solid #000;text-align: center;">
+                        <div ng-if="avg==250">
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
+                        </div>
+                        <div ng-if="avg!=250">{{avg}}</div>
+                    </th>
                 </tr>
                 <tr>
                     <th style="border: 1px solid #000;text-align: center;">仓外温</th>
                     <th style="border: 1px solid #000;text-align: center;">
                         <div ng-if="outtemp==250">
-                            <acronym title="设备异常"><span style="color: red;">{{outtemp}}</span></acronym>
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
                         </div>
                         <div ng-if="outtemp!=250">{{outtemp}}</div>
                     </th>
                     <th colspan="{{tableTwo_1}}" style="border: 1px solid #000;text-align: center;">最高粮温</th>
                     <th style="border: 1px solid #000;text-align: center;">
                         <!--高温报警-->
-                        <div ng-if="max >= warningValueList[vCfCode].high">
-                            <div ng-if="max==250">
-                                <acronym title="设备异常"><span style="color: red;">{{max}}</span></acronym>
+                        <div ng-if="max==250">
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
+                        </div>
+                        <div ng-if="max!=250">
+                            <div ng-if="max >= warningValueList[vCfCode].high">
+                                <div ng-if="max!=250">
+                                    <acronym title="粮温高限报警为: {{warningValueList[vCfCode].high}}℃"><span style="color: red;">{{max}}</span></acronym>
+                                </div>
                             </div>
-                            <div ng-if="max!=250">
-                                <acronym title="粮温高限报警为: {{warningValueList[vCfCode].high}}℃"><span style="color: red;">{{max}}</span></acronym>
+                            <div ng-if="max < warningValueList[vCfCode].high">
+                                <span>{{max}}</span>
+                            </div>
+                            <div ng-if="warningValueList[vCfCode].high == null">
+                                <span>{{max}}</span>
                             </div>
                         </div>
-                        <div ng-if="max < warningValueList[vCfCode].high">
-                            <span>{{max}}</span>
-                        </div>
-                        <div ng-if="warningValueList[vCfCode].high == null">
-                            <span>{{max}}</span>
-                        </div>
-                        <!--高温预警-->
                     </th>
                 </tr>
                 <tr>
                     <th style="border: 1px solid #000;text-align: center;">仓外湿</th>
                     <th style="border: 1px solid #000;text-align: center;">
                         <div ng-if="outh==250">
-                            <acronym title="设备异常"><span style="color: red;">{{outh}}</span></acronym>
+                            <acronym title="设备异常"><span style="color: red;">{{-1}}</span></acronym>
                         </div>
                         <div ng-if="outh!=250">{{outh}}</div>
                     </th>
                     <th colspan="{{tableTwo_1}}" style="border: 1px solid #000;text-align: center;">最低粮温</th>
                     <th style="border: 1px solid #000;text-align: center;">
                         <!--低温报警-->
-                        <div ng-if="min <= warningValueList[vCfCode].low">
-                            <acronym title="粮温低限报警为: {{warningValueList[vCfCode].low}}℃"><span style="color: red;">{{min}}</span></acronym>
-                        </div>
-                        <div ng-if="min > warningValueList[vCfCode].low">
-                            <span>{{min}}</span>
+                        <div ng-if="min==250">
+                            <acronym title="设备异常"><span style="color: red;">{{-100}}</span></acronym>
                         </div>
-                        <div ng-if="warningValueList[vCfCode].low == null">
-                            <span>{{min}}</span>
+                        <div ng-if="min!=250">
+                            <div ng-if="min <= warningValueList[vCfCode].low">
+                                <acronym title="粮温低限报警为: {{warningValueList[vCfCode].low}}℃"><span style="color: red;">{{min}}</span></acronym>
+                            </div>
+                            <div ng-if="min > warningValueList[vCfCode].low">
+                                <span>{{min}}</span>
+                            </div>
+                            <div ng-if="warningValueList[vCfCode].low == null">
+                                <span>{{min}}</span>
+                            </div>
                         </div>
-                        <!--低温预警-->
                     </th>
                 </tr>
             </table>

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

@@ -68,48 +68,62 @@
                                         <td style="text-align:center;">{{ grainAnalyzeList.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
                                             <div ng-if="grainAnalyzeList.intemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ grainAnalyzeList.intemp }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
                                             <div ng-if="grainAnalyzeList.intemp!=250">{{ grainAnalyzeList.intemp }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="grainAnalyzeList.inh==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ grainAnalyzeList.inh }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
                                             </div>
                                             <div ng-if="grainAnalyzeList.inh!=250">{{ grainAnalyzeList.inh }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <!--高温报警-->
-                                            <div ng-if="grainAnalyzeList.max >= warningValueList[grainAnalyzeList.storehouse].high">
-                                                <div ng-if="grainAnalyzeList.max==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainAnalyzeList.max }}</span></acronym>
+                                            <div ng-if="grainAnalyzeList.max==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
+                                            </div>
+                                            <div ng-if="grainAnalyzeList.max!=250">
+                                                <div ng-if="grainAnalyzeList.max >= warningValueList[grainAnalyzeList.storehouse].high">
+                                                    <div ng-if="grainAnalyzeList.max!=250">
+                                                        <acronym title="粮温高限报警为: {{warningValueList[grainAnalyzeList.storehouse].high}}℃">
+                                                            <span style="color: red;">{{ grainAnalyzeList.max }}</span>
+                                                        </acronym>
+                                                    </div>
                                                 </div>
-                                                <div ng-if="grainAnalyzeList.max!=250">
-                                                    <acronym title="粮温高限报警为: {{warningValueList[grainAnalyzeList.storehouse].high}}℃"><span style="color: red;">{{ grainAnalyzeList.max }}</span></acronym>
+                                                <div ng-if="grainAnalyzeList.max < warningValueList[grainAnalyzeList.storehouse].high">
+                                                    <span>{{ grainAnalyzeList.max }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[grainAnalyzeList.storehouse].high == null">
+                                                    <span>{{ grainAnalyzeList.max }}</span>
                                                 </div>
                                             </div>
-                                            <div ng-if="grainAnalyzeList.max < warningValueList[grainAnalyzeList.storehouse].high">
-                                                <span>{{ grainAnalyzeList.max }}</span>
-                                            </div>
-                                            <div ng-if="warningValueList[grainAnalyzeList.storehouse].high == null">
-                                                <span>{{ grainAnalyzeList.max }}</span>
-                                            </div>
-                                            <!--高温预警-->
                                         </td>
                                         <td style="text-align:center;">
                                             <!--低温报警-->
-                                            <div ng-if="grainAnalyzeList.min <= warningValueList[grainAnalyzeList.storehouse].low">
-                                                <acronym title="粮温低限报警为: {{warningValueList[grainAnalyzeList.storehouse].low}}℃"><span style="color: red;">{{ grainAnalyzeList.min }}</span></acronym>
+                                            <div ng-if="grainAnalyzeList.min==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
-                                            <div ng-if="grainAnalyzeList.min > warningValueList[grainAnalyzeList.storehouse].low">
-                                                <span>{{ grainAnalyzeList.min }}</span>
+                                            <div ng-if="grainAnalyzeList.min!=250">
+                                                <div ng-if="grainAnalyzeList.min <= warningValueList[grainAnalyzeList.storehouse].low">
+                                                    <acronym title="粮温低限报警为: {{warningValueList[grainAnalyzeList.storehouse].low}}℃">
+                                                        <span style="color: red;">{{ grainAnalyzeList.min }}</span>
+                                                    </acronym>
+                                                </div>
+                                                <div ng-if="grainAnalyzeList.min > warningValueList[grainAnalyzeList.storehouse].low">
+                                                    <span>{{ grainAnalyzeList.min }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[grainAnalyzeList.storehouse].low == null">
+                                                    <span>{{ grainAnalyzeList.min }}</span>
+                                                </div>
                                             </div>
-                                            <div ng-if="warningValueList[grainAnalyzeList.storehouse].low == null">
-                                                <span>{{ grainAnalyzeList.min }}</span>
+                                        </td>
+                                        <td style="text-align:center;">
+                                            <div ng-if="grainAnalyzeList.avg==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
-                                            <!--低温预警-->
+                                            <div ng-if="grainAnalyzeList.avg!=250">{{ grainAnalyzeList.avg }}</div>
                                         </td>
-                                        <td style="text-align:center;">{{ grainAnalyzeList.avg}}</td>
                                         <td style="text-align:center;">
                                             <a ng-click="grainDetectionDetail(grainAnalyzeList)"><i class=""></i>详情</a>
                                         </td>

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

@@ -76,57 +76,64 @@
                                         <td style="text-align:center;">
                                             {{dicData[storehouseCode[pastRecordsList.storehouse].hwxz]}}
                                         </td>
-                                        <td style="text-align:center;">{{ pastRecordsList.time | date:'yyyy-MM-dd
-                                            HH:mm:ss' }}
+                                        <td style="text-align:center;">{{ pastRecordsList.time | date:'yyyy-MM-dd HH:mm:ss' }}
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="pastRecordsList.intemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ pastRecordsList.intemp }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
                                             <div ng-if="pastRecordsList.intemp!=250">{{ pastRecordsList.intemp }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="pastRecordsList.inh==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ pastRecordsList.inh }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
                                             </div>
                                             <div ng-if="pastRecordsList.inh!=250">{{ pastRecordsList.inh }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <!--高温报警-->
-                                            <div ng-if="pastRecordsList.max >= warningValueList[pastRecordsList.storehouse].high">
-                                                <div ng-if="pastRecordsList.max==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ pastRecordsList.max }}</span></acronym>
+                                            <div ng-if="pastRecordsList.max==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
+                                            </div>
+                                            <div ng-if="pastRecordsList.max!=250">
+                                                <div ng-if="pastRecordsList.max >= warningValueList[pastRecordsList.storehouse].high">
+                                                    <div ng-if="pastRecordsList.max!=250">
+                                                        <acronym title="粮温高限报警为: {{warningValueList[pastRecordsList.storehouse].high}}℃"><span style="color: red;">{{ pastRecordsList.max }}</span></acronym>
+                                                    </div>
                                                 </div>
-                                                <div ng-if="pastRecordsList.max!=250">
-                                                    <acronym
-                                                            title="粮温高限报警为: {{warningValueList[pastRecordsList.storehouse].high}}℃"><span
-                                                            style="color: red;">{{ pastRecordsList.max }}</span></acronym>
+                                                <div ng-if="pastRecordsList.max < warningValueList[pastRecordsList.storehouse].high">
+                                                    <span>{{ pastRecordsList.max }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[pastRecordsList.storehouse].high == null">
+                                                    <span>{{ pastRecordsList.max }}</span>
                                                 </div>
                                             </div>
-                                            <div ng-if="pastRecordsList.max < warningValueList[pastRecordsList.storehouse].high">
-                                                <span>{{ pastRecordsList.max }}</span>
-                                            </div>
-                                            <div ng-if="warningValueList[pastRecordsList.storehouse].high == null">
-                                                <span>{{ pastRecordsList.max }}</span>
-                                            </div>
-                                            <!--高温预警-->
                                         </td>
                                         <td style="text-align:center;">
                                             <!--低温报警-->
-                                            <div ng-if="pastRecordsList.min <= warningValueList[pastRecordsList.storehouse].low">
-                                                <acronym
-                                                        title="粮温低限报警为: {{warningValueList[pastRecordsList.storehouse].low}}℃"><span
-                                                        style="color: red;">{{ pastRecordsList.min }}</span></acronym>
+                                            <div ng-if="pastRecordsList.min==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
-                                            <div ng-if="pastRecordsList.min > warningValueList[pastRecordsList.storehouse].low">
-                                                <span>{{ pastRecordsList.min }}</span>
+                                            <div ng-if="pastRecordsList.min!=250">
+                                                <div ng-if="pastRecordsList.min <= warningValueList[pastRecordsList.storehouse].low">
+                                                    <acronym title="粮温低限报警为: {{warningValueList[pastRecordsList.storehouse].low}}℃">
+                                                        <span style="color: red;">{{ pastRecordsList.min }}</span>
+                                                    </acronym>
+                                                </div>
+                                                <div ng-if="pastRecordsList.min > warningValueList[pastRecordsList.storehouse].low">
+                                                    <span>{{ pastRecordsList.min }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[pastRecordsList.storehouse].low == null">
+                                                    <span>{{ pastRecordsList.min }}</span>
+                                                </div>
                                             </div>
-                                            <div ng-if="warningValueList[pastRecordsList.storehouse].low == null">
-                                                <span>{{ pastRecordsList.min }}</span>
+                                        </td>
+                                        <td style="text-align:center;">
+                                            <div ng-if="pastRecordsList.avg==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
-                                            <!--低温预警-->
+                                            <div ng-if="pastRecordsList.avg!=250">{{ pastRecordsList.avg}}</div>
                                         </td>
-                                        <td style="text-align:center;">{{ pastRecordsList.avg}}</td>
                                         <td style="text-align:center;">
                                             <a ng-click="showView(pastRecordsList)"><i class=""></i>详情</a>
                                         </td>

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

@@ -65,49 +65,59 @@
                                         <td style="text-align:center;">{{ realTimeList.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
                                             <div ng-if="realTimeList.intemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ realTimeList.intemp }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
                                             <div ng-if="realTimeList.intemp!=250">{{ realTimeList.intemp }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="realTimeList.inh==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ realTimeList.inh }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">{{ -1 }}</span></acronym>
                                             </div>
                                             <div ng-if="realTimeList.inh!=250">{{ realTimeList.inh }}</div>
                                         </td>
 
                                         <td style="text-align:center;">
                                             <!--高温报警-->
-                                            <div ng-if="realTimeList.max >= warningValueList[realTimeList.storehouse].high">
-                                                <div ng-if="realTimeList.max==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ realTimeList.max }}</span></acronym>
+                                            <div ng-if="realTimeList.max==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
+                                            </div>
+                                            <div ng-if="realTimeList.max!=250">
+                                                <div ng-if="realTimeList.max >= warningValueList[realTimeList.storehouse].high">
+                                                    <div ng-if="realTimeList.max!=250">
+                                                        <acronym title="粮温高限报警为: {{warningValueList[realTimeList.storehouse].high}}℃"><span style="color: red;">{{ realTimeList.max }}</span></acronym>
+                                                    </div>
                                                 </div>
-                                                <div ng-if="realTimeList.max!=250">
-                                                    <acronym title="粮温高限报警为: {{warningValueList[realTimeList.storehouse].high}}℃"><span style="color: red;">{{ realTimeList.max }}</span></acronym>
+                                                <div ng-if="realTimeList.max < warningValueList[realTimeList.storehouse].high">
+                                                    <span>{{ realTimeList.max }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[realTimeList.storehouse].high == null">
+                                                    <span>{{ realTimeList.max }}</span>
                                                 </div>
                                             </div>
-                                            <div ng-if="realTimeList.max < warningValueList[realTimeList.storehouse].high">
-                                                <span>{{ realTimeList.max }}</span>
-                                            </div>
-                                            <div ng-if="warningValueList[realTimeList.storehouse].high == null">
-                                                <span>{{ realTimeList.max }}</span>
-                                            </div>
-                                            <!--高温预警-->
                                         </td>
                                         <td style="text-align:center;">
                                             <!--低温报警-->
-                                            <div ng-if="realTimeList.min <= warningValueList[realTimeList.storehouse].low">
-                                                <acronym title="粮温低限报警为: {{warningValueList[realTimeList.storehouse].low}}℃"><span style="color: red;">{{ realTimeList.min }}</span></acronym>
+                                            <div ng-if="realTimeList.min==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
-                                            <div ng-if="realTimeList.min > warningValueList[realTimeList.storehouse].low">
-                                                <span>{{ realTimeList.min }}</span>
+                                            <div ng-if="realTimeList.min!=250">
+                                                <div ng-if="realTimeList.min <= warningValueList[realTimeList.storehouse].low">
+                                                    <acronym title="粮温低限报警为: {{warningValueList[realTimeList.storehouse].low}}℃"><span style="color: red;">{{ realTimeList.min }}</span></acronym>
+                                                </div>
+                                                <div ng-if="realTimeList.min > warningValueList[realTimeList.storehouse].low">
+                                                    <span>{{ realTimeList.min }}</span>
+                                                </div>
+                                                <div ng-if="warningValueList[realTimeList.storehouse].low == null">
+                                                    <span>{{ realTimeList.min }}</span>
+                                                </div>
                                             </div>
-                                            <div ng-if="warningValueList[realTimeList.storehouse].low == null">
-                                                <span>{{ realTimeList.min }}</span>
+                                        </td>
+                                        <td style="text-align:center;">
+                                            <div ng-if="realTimeList.avg==250">
+                                                <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                             </div>
-                                            <!--低温预警-->
+                                            <div ng-if="realTimeList.avg!=250">{{ realTimeList.avg}}</div>
                                         </td>
-                                        <td style="text-align:center;">{{ realTimeList.avg}}</td>
                                         <td has-botton="2" style="text-align:center;">
                                             <a href-void ng-click="onlyStoreGrainTemperatureDetection(realTimeList.storehouse)"><i class=""></i>{{storeHouseCodeObj[realTimeList.storehouse].storehouseName}}检测</a>
                                         </td>

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

@@ -98,68 +98,81 @@
                                             <td style="text-align:center;">
                                                 {{storehouseCode[grainReport.storehouse].kcsl}}
                                             </td>
-                                            <td style="text-align:center;">{{ grainReport.time | date:'yyyy-MM-dd
-                                                HH:mm:ss' }}
+                                            <td style="text-align:center;">{{ grainReport.time | date:'yyyy-MM-dd HH:mm:ss' }}
                                             </td>
                                             <td style="text-align:center;">
                                                 <div ng-if="grainReport.outtemp==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainReport.outtemp }}</span></acronym>
+                                                    <acronym title="设备异常"><span
+                                                            style="color: red;">{{ -100 }}</span></acronym>
                                                 </div>
                                                 <div ng-if="grainReport.outtemp!=250">{{ grainReport.outtemp }}</div>
                                             </td>
                                             <td style="text-align:center;">
                                                 <div ng-if="grainReport.outh==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainReport.outh }}</span></acronym>
+                                                    <acronym title="设备异常"><span
+                                                            style="color: red;">{{ -1 }}</span></acronym>
                                                 </div>
                                                 <div ng-if="grainReport.outh!=250">{{ grainReport.outh }}</div>
                                             </td>
                                             <td style="text-align:center;">
                                                 <div ng-if="grainReport.intemp==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainReport.intemp }}</span></acronym>
+                                                    <acronym title="设备异常"><span
+                                                            style="color: red;">{{ -100 }}</span></acronym>
                                                 </div>
                                                 <div ng-if="grainReport.intemp!=250">{{ grainReport.intemp }}</div>
                                             </td>
                                             <td style="text-align:center;">
                                                 <div ng-if="grainReport.inh==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ grainReport.inh }}</span></acronym>
+                                                    <acronym title="设备异常"><span
+                                                            style="color: red;">{{ -1 }}</span></acronym>
                                                 </div>
                                                 <div ng-if="grainReport.inh!=250">{{ grainReport.inh }}</div>
                                             </td>
-                                            <td style="text-align:center;">{{ grainReport.avg}}</td>
+                                            <td style="text-align:center;">
+                                                <div ng-if="grainReport.avg==250">
+                                                    <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
+                                                </div>
+                                                <div ng-if="grainReport.avg!=250">{{ grainReport.avg }}</div>
+                                            </td>
                                             <td style="text-align:center;">
                                                 <!--高温报警-->
-                                                <div ng-if="grainReport.max >= warningValueList[grainReport.storehouse].high">
-                                                    <div ng-if="grainReport.max==250">
-                                                        <acronym title="设备异常"><span style="color: red;">{{ grainReport.max }}</span></acronym>
+                                                <div ng-if="grainReport.max==250">
+                                                    <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
+                                                </div>
+                                                <div ng-if="grainReport.max!=250">
+                                                    <div ng-if="grainReport.max >= warningValueList[grainReport.storehouse].high">
+                                                        <div ng-if="grainReport.max!=250">
+                                                            <acronym title="粮温高限报警为: {{warningValueList[grainReport.storehouse].high}}℃">
+                                                                <span style="color: red;">{{ grainReport.max }}</span>
+                                                            </acronym>
+                                                        </div>
                                                     </div>
-                                                    <div ng-if="grainReport.max!=250">
-                                                        <acronym
-                                                                title="粮温高限报警为: {{warningValueList[grainReport.storehouse].high}}℃"><span
-                                                                style="color: red;">{{ grainReport.max }}</span></acronym>
+                                                    <div ng-if="grainReport.max < warningValueList[grainReport.storehouse].high">
+                                                        <span>{{ grainReport.max }}</span>
+                                                    </div>
+                                                    <div ng-if="warningValueList[grainReport.storehouse].high == null">
+                                                        <span>{{ grainReport.max }}</span>
                                                     </div>
                                                 </div>
-                                                <div ng-if="grainReport.max < warningValueList[grainReport.storehouse].high">
-                                                    <span>{{ grainReport.max }}</span>
-                                                </div>
-                                                <div ng-if="warningValueList[grainReport.storehouse].high == null">
-                                                    <span>{{ grainReport.max }}</span>
-                                                </div>
-                                                <!--高温预警-->
                                             </td>
                                             <td style="text-align:center;">
                                                 <!--低温报警-->
-                                                <div ng-if="grainReport.min <= warningValueList[grainReport.storehouse].low">
-                                                    <acronym
-                                                            title="粮温低限报警为: {{warningValueList[grainReport.storehouse].low}}℃"><span
-                                                            style="color: red;">{{ grainReport.min }}</span></acronym>
-                                                </div>
-                                                <div ng-if="grainReport.min > warningValueList[grainReport.storehouse].low">
-                                                    <span>{{ grainReport.min }}</span>
+                                                <div ng-if="grainReport.min==250">
+                                                    <acronym title="设备异常"><span style="color: red;">{{ -100 }}</span></acronym>
                                                 </div>
-                                                <div ng-if="warningValueList[grainReport.storehouse].low == null">
-                                                    <span>{{ grainReport.min }}</span>
+                                                <div ng-if="grainReport.min!=250">
+                                                    <div ng-if="grainReport.min <= warningValueList[grainReport.storehouse].low">
+                                                        <acronym title="粮温低限报警为: {{warningValueList[grainReport.storehouse].low}}℃">
+                                                            <span style="color: red;">{{ grainReport.min }}</span>
+                                                        </acronym>
+                                                    </div>
+                                                    <div ng-if="grainReport.min > warningValueList[grainReport.storehouse].low">
+                                                        <span>{{ grainReport.min }}</span>
+                                                    </div>
+                                                    <div ng-if="warningValueList[grainReport.storehouse].low == null">
+                                                        <span>{{ grainReport.min }}</span>
+                                                    </div>
                                                 </div>
-                                                <!--低温预警-->
                                             </td>
                                         </tr>
                                         </tbody>