油罐液位修改

depot-web/src/main/resources/static/app/intelligent/grainInspect/controller/ollRealTimeDataListCtrl.js

@@ -32,8 +32,8 @@ angular.module('app.intelligent').controller("ollRealTimeDataListCtrl", function
         params.id = realTimeList.id;
         $uibModal.open({
             size: 'lg',
-            templateUrl: 'app/intelligent/grainDetection/views/humitureDetection-model.html',
-            controller: 'humitureDetectionModel',
+            templateUrl: 'app/intelligent/oilTemperatureDetection/views/oilTemperature-model.html',
+            controller: 'oilTemperatureModel',
             resolve: {
                 // 传入参数
                 items: function () {

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

@@ -60,8 +60,8 @@
                                         <td style="text-align:center;">{{ $index + 1 }}</td>
                                         <td style="text-align:center;">{{ storeHouseCodeObj[dewDetection.oiltankCode].storehouseName }}</td>
                                         <td style="text-align:center;">{{ storeHouseCodeObj[dewDetection.oiltankCode].tankHeigth}}</td>
-                                        <td style="text-align:center;">{{dicData[storehouseCode[dewDetection.oiltankCode].pz]}}</td>
-                                        <td style="text-align:center;">{{dicData[storehouseCode[dewDetection.oiltankCode].hwxz]}}</td>
+                                        <td style="text-align:center;">{{dicData[storehouseCodeYG[dewDetection.oiltankCode].pz]}}</td>
+                                        <td style="text-align:center;">{{dicData[storehouseCodeYG[dewDetection.oiltankCode].hwxz]}}</td>
                                         <td style="text-align:center;">{{ dewDetection.tTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">{{ dewDetection.tCurrent}}</td>
                                         <td style="text-align:center;">{{ dewDetection.tMax}}</td>

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

@@ -65,13 +65,13 @@
                                         <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>
@@ -80,7 +80,7 @@
                                             <!--高温报警-->
                                             <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>
+                                                    <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                                 </div>
                                                 <div ng-if="realTimeList.max!=250">
                                                     <acronym title="油温高限报警为: {{warningValueList[realTimeList.storehouse].high}}℃"><span style="color: red;">{{ realTimeList.max }}</span></acronym>
@@ -97,7 +97,12 @@
                                         <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!=250">
+                                                    <acronym title="油温低限报警为: {{warningValueList[realTimeList.storehouse].low}}℃"><span style="color: red;">{{ realTimeList.min }}</span></acronym>
+                                                </div>
                                             </div>
                                             <div ng-if="realTimeList.min > warningValueList[realTimeList.storehouse].low">
                                                 <span>{{ realTimeList.min }}</span>
@@ -107,7 +112,12 @@
                                             </div>
                                             <!--低温预警-->
                                         </td>
-                                        <td style="text-align:center;">{{ realTimeList.avg}}</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;">
                                             <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/levelDetection/views/levelDetection-list.html

@@ -62,8 +62,8 @@
                                         <td style="text-align:center;">{{ $index + 1 }}</td>
                                         <td style="text-align:center;">{{ storeHouseCodeObj[dewDetection.oiltankCode].storehouseName }}</td>
                                         <td style="text-align:center;">{{ storeHouseCodeObj[dewDetection.oiltankCode].tankHeigth}}</td>
-                                        <td style="text-align:center;">{{dicData[storehouseCode[dewDetection.oiltankCode].pz]}}</td>
-                                        <td style="text-align:center;">{{dicData[storehouseCode[dewDetection.oiltankCode].hwxz]}}</td>
+                                        <td style="text-align:center;">{{dicData[storehouseCodeYG[dewDetection.oiltankCode].pz]}}</td>
+                                        <td style="text-align:center;">{{dicData[storehouseCodeYG[dewDetection.oiltankCode].hwxz]}}</td>
                                         <td style="text-align:center;">{{ dewDetection.tTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">{{ dewDetection.tCurrent}}</td>
                                         <td style="text-align:center;">{{ dewDetection.tMax}}</td>

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

@@ -76,20 +76,20 @@
                                         <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">
-                                                <span style="color: red;">设备异常</span>
+                                                <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">
-                                                <span style="color: red;">设备异常</span>
+                                                <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==250">
-                                                <span style="color: red;">设备异常</span>
+                                                <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">
@@ -108,7 +108,7 @@
                                         <td style="text-align:center;">
                                             <!--低温报警-->
                                             <div ng-if="humitureDetection.min==250">
-                                                <span style="color: red;">设备异常</span>
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                             </div>
                                             <div ng-if="humitureDetection.min!=250">
                                                 <div ng-if="humitureDetection.min <= warningValueList[humitureDetection.storehouse].low">
@@ -124,7 +124,7 @@
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="humitureDetection.avg==250">
-                                                <span style="color: red;">设备异常</span>
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                             </div>
                                             <div ng-if="humitureDetection.avg!=250">{{ humitureDetection.avg}}</div>
                                         </td>