hefeng лет назад: 5
Родитель
Сommit
ee798dfc66

+ 2 - 2
src/main/resources/static/app/home/controller/headerCtrl.js

@@ -18,9 +18,9 @@ angular.module('app.system').controller("headerCtrl",
18 18
 		}
19 19
 		$("#isDepot").show();
20 20
 		if(sessionStorage.getItem("depotOrgId") == "163"){//中转库
21
-			$("#swlk").attr("href","http://172.16.2.26:99/"); 
21
+			$("#swlk").attr("href","http://172.16.3.41:8087/zz/camera.html"); 
22 22
 		}else{//昆南库
23
-			$("#swlk").attr("href","http://172.16.2.26:88/"); 
23
+			$("#swlk").attr("href","http://172.16.3.41:8087/kn/camera.html"); 
24 24
 		}
25 25
 	}else{
26 26
 		sessionStorage.setItem("isDepot", true);

+ 1 - 1
src/main/resources/static/app/intelligent/gasDetection/views/gasDetection-list.html

@@ -53,7 +53,7 @@
53 53
                                         <th data-class="expand" style="text-align:center;">采集时间</th>
54 54
                                         <th data-class="expand" style="text-align:center;">磷化氢(ppm)</th>
55 55
                                         <th data-class="expand" style="text-align:center;">氧气(%)</th>
56
-                                        <th data-class="expand" style="text-align:center;">二氧化碳(%)</th>
56
+                                        <th data-class="expand" style="text-align:center;">二氧化碳(ppm)</th>
57 57
                                         <th has-botton="2" data-class="expand" style="text-align:center;">操作</th>
58 58
                                         <th data-class="expand" style="text-align:center;">检测分布图</th>
59 59
                                     </tr>

+ 1 - 1
src/main/resources/static/app/intelligent/gasDetection/views/record-list.html

@@ -49,7 +49,7 @@
49 49
                                         <th data-class="expand" style="text-align:center;">采集时间</th>
50 50
                                         <th data-class="expand" style="text-align:center;">磷化氢(ppm)</th>
51 51
                                         <th data-class="expand" style="text-align:center;">氧气(%)</th>
52
-                                        <th data-class="expand" style="text-align:center;">二氧化碳(%)</th>
52
+                                        <th data-class="expand" style="text-align:center;">二氧化碳(ppm)</th>
53 53
                                     </tr>
54 54
                                     </thead>
55 55
 

+ 1 - 1
src/main/resources/static/app/intelligent/statisticalReport/views/detailsReport-list.html

@@ -96,7 +96,7 @@
96 96
                                         <td data-class="expand" style="text-align:center;">{{pageInfo.ph3avg}}</td>
97 97
                                         <td data-class="expand" style="text-align:center;">O2浓度(%)</td>
98 98
                                         <td data-class="expand" style="text-align:center;">{{pageInfo.o2avg}}</td>
99
-                                        <td data-class="expand" style="text-align:center;">CO2浓度(%)</td>
99
+                                        <td data-class="expand" style="text-align:center;">CO2浓度(ppm)</td>
100 100
                                         <td data-class="expand" style="text-align:center;">{{pageInfo.co2avg}}</td>
101 101
                                     </tr>
102 102
                                     <tr>

+ 3 - 4
src/main/resources/static/app/intelligent/statisticalReport/views/submitReport-list.html

@@ -75,14 +75,13 @@
75 75
                                         <td style="text-align:center;">{{submitReport.water}}</td>
76 76
                                         <td style="text-align:center;">
77 77
                                             <div ng-if="submitReport.inTemp==250">
78
-                                                <acronym title="设备异常"><span style="color: red;">{{ submitReport.inTemp }}</span></acronym>
78
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
79 79
                                             </div>
80 80
                                             <div ng-if="submitReport.inTemp!=250">{{ submitReport.inTemp }}</div>
81 81
                                         </td>
82 82
                                         <td style="text-align:center;">
83 83
                                             <div ng-if="submitReport.inH==250">
84
-                                                <acronym title="设备异常"><span
85
-                                                        style="color: red;">{{ submitReport.inH }}</span></acronym>
84
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
86 85
                                             </div>
87 86
                                             <div ng-if="submitReport.inH!=250">{{ submitReport.inH }}</div>
88 87
                                         </td>
@@ -94,7 +93,7 @@
94 93
                                             <!--高温报警-->
95 94
                                             <div ng-if="submitReport.maxTemp >= warningValueList[submitReport.storeHouse].high">
96 95
                                                 <div ng-if="submitReport.maxTemp==250">
97
-                                                    <acronym title="设备异常"><span style="color: red;">{{ submitReport.maxTemp }}</span></acronym>
96
+                                                    <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
98 97
                                                 </div>
99 98
                                                 <div ng-if="submitReport.maxTemp!=250">
100 99
                                                     <acronym

+ 6 - 6
src/main/resources/static/app/intelligent/statisticalReport/views/summaryReport-list.html

@@ -59,7 +59,7 @@
59 59
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;">最多虫数</th>
60 60
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;">最少虫数</th>
61 61
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;">氧气浓度(%)</th>
62
-                                        <th data-class="expand" style="text-align:center;vertical-align:middle;">二氧化碳浓度(%)</th>
62
+                                        <th data-class="expand" style="text-align:center;vertical-align:middle;">二氧化碳浓度(ppm)</th>
63 63
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;">磷化氢浓度(ppm)</th>
64 64
                                     </tr>
65 65
                                     </thead>
@@ -75,25 +75,25 @@
75 75
                                         </td>
76 76
                                         <td style="text-align:center;">
77 77
                                             <div ng-if="summaryReport.outH==250">
78
-                                                <acronym title="设备异常"><span style="color: red;">{{ summaryReport.outH }}</span></acronym>
78
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
79 79
                                             </div>
80 80
                                             <div ng-if="summaryReport.outH!=250">{{ summaryReport.outH }}</div>
81 81
                                         </td>
82 82
                                         <td style="text-align:center;">
83 83
                                             <div ng-if="summaryReport.outTemp==250">
84
-                                                <acronym title="设备异常"><span style="color: red;">{{ summaryReport.outTemp }}</span></acronym>
84
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
85 85
                                             </div>
86 86
                                             <div ng-if="summaryReport.outTemp!=250">{{ summaryReport.outTemp }}</div>
87 87
                                         </td>
88 88
                                         <td style="text-align:center;">
89 89
                                             <div ng-if="summaryReport.inH==250">
90
-                                                <acronym title="设备异常"><span style="color: red;">{{ summaryReport.inH }}</span></acronym>
90
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
91 91
                                             </div>
92 92
                                             <div ng-if="summaryReport.inH!=250">{{ summaryReport.inH }}</div>
93 93
                                         </td>
94 94
                                         <td style="text-align:center;">
95 95
                                             <div ng-if="summaryReport.inTemp==250">
96
-                                                <acronym title="设备异常"><span style="color: red;">{{ summaryReport.inTemp }}</span></acronym>
96
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
97 97
                                             </div>
98 98
                                             <div ng-if="summaryReport.inTemp!=250">{{ summaryReport.inTemp }}</div>
99 99
                                         </td>
@@ -102,7 +102,7 @@
102 102
                                             <!--高温报警-->
103 103
                                             <div ng-if="summaryReport.maxTemp >= warningValueList[summaryReport.storeHouse].high">
104 104
                                                 <div ng-if="summaryReport.maxTemp==250">
105
-                                                    <acronym title="设备异常"><span style="color: red;">{{ summaryReport.maxTemp }}</span></acronym>
105
+                                                    <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
106 106
                                                 </div>
107 107
                                                 <div ng-if="summaryReport.maxTemp!=250">
108 108
                                                     <acronym title="粮温高限报警为: {{warningValueList[summaryReport.storeHouse].high}}℃"><span style="color: red;">{{ summaryReport.maxTemp }}</span></acronym>

+ 1 - 1
src/main/resources/static/app/layout/partials/header.tpl.html

@@ -105,7 +105,7 @@
105 105
                             <i class="nav-feng-line"></i>
106 106
 						</div>
107 107
 						<div class="nav-li" role="presentation" id="isDepot" style="display: none;">
108
-							<a href="http://172.16.2.26:88/" target="_blank" id="swlk">
108
+							<a href="http://172.16.3.41:8087/kn/camera.html" target="_blank" id="swlk">
109 109
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/lcgl.png" /></i>
110 110
 								三维粮库</a>
111 111
 							<i class="nav-feng-line"></i>