Merge remote-tracking branch 'origin/master'

src/main/resources/static/app/home/controller/headerCtrl.js

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

src/main/resources/static/app/intelligent/coldStorage/controller/airConditionControlCtrl.js

@@ -1,5 +1,5 @@
 "use strict";
-angular.module('app.intelligent').controller("airConditionControlCtrl", function ($scope, $state, $rootScope, $stateParams, ktinfoService, $uibModal,airConditionControlService) {
+angular.module('app.intelligent').controller("airConditionControlCtrl", function ($scope, $state, $rootScope, $stateParams, $filter, ktinfoService, $uibModal,airConditionControlService) {
 
     // 默认分页
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
@@ -119,7 +119,7 @@ angular.module('app.intelligent').controller("airConditionControlCtrl", function
         params.intemp = ktinfo.intemp; // 室温
         params.valarmstatue = ktinfo.valarmstatue; // 设备状态 0:正常；1：异常
         params.vstatue = ktinfo.vstatue; // 操作状态 0关闭，1打开，2反正，3停止
-        params.updatetime = ktinfo.updatetime; // 更新时间
+        params.updatetime = $filter('date')(ktinfo.updatetime, "yyyy-MM-dd HH:mm:ss"); // 更新时间
         params.remark = ktinfo.remark; // 备注
         params.typeSet = typeSet; // 区分查看和设置
         $uibModal.open({

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

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

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

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

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

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

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

@@ -75,14 +75,13 @@
                                         <td style="text-align:center;">{{submitReport.water}}</td>
                                         <td style="text-align:center;">
                                             <div ng-if="submitReport.inTemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ submitReport.inTemp }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                             </div>
                                             <div ng-if="submitReport.inTemp!=250">{{ submitReport.inTemp }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="submitReport.inH==250">
-                                                <acronym title="设备异常"><span
-                                                        style="color: red;">{{ submitReport.inH }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                             </div>
                                             <div ng-if="submitReport.inH!=250">{{ submitReport.inH }}</div>
                                         </td>
@@ -94,7 +93,7 @@
                                             <!--高温报警-->
                                             <div ng-if="submitReport.maxTemp >= warningValueList[submitReport.storeHouse].high">
                                                 <div ng-if="submitReport.maxTemp==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ submitReport.maxTemp }}</span></acronym>
+                                                    <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                                 </div>
                                                 <div ng-if="submitReport.maxTemp!=250">
                                                     <acronym

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

@@ -59,7 +59,7 @@
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;">最多虫数</th>
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;">最少虫数</th>
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;">氧气浓度(%)</th>
-                                        <th data-class="expand" style="text-align:center;vertical-align:middle;">二氧化碳浓度(%)</th>
+                                        <th data-class="expand" style="text-align:center;vertical-align:middle;">二氧化碳浓度(ppm)</th>
                                         <th data-class="expand" style="text-align:center;vertical-align:middle;">磷化氢浓度(ppm)</th>
                                     </tr>
                                     </thead>
@@ -75,25 +75,25 @@
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="summaryReport.outH==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ summaryReport.outH }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                             </div>
                                             <div ng-if="summaryReport.outH!=250">{{ summaryReport.outH }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="summaryReport.outTemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ summaryReport.outTemp }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                             </div>
                                             <div ng-if="summaryReport.outTemp!=250">{{ summaryReport.outTemp }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="summaryReport.inH==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ summaryReport.inH }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                             </div>
                                             <div ng-if="summaryReport.inH!=250">{{ summaryReport.inH }}</div>
                                         </td>
                                         <td style="text-align:center;">
                                             <div ng-if="summaryReport.inTemp==250">
-                                                <acronym title="设备异常"><span style="color: red;">{{ summaryReport.inTemp }}</span></acronym>
+                                                <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                             </div>
                                             <div ng-if="summaryReport.inTemp!=250">{{ summaryReport.inTemp }}</div>
                                         </td>
@@ -102,7 +102,7 @@
                                             <!--高温报警-->
                                             <div ng-if="summaryReport.maxTemp >= warningValueList[summaryReport.storeHouse].high">
                                                 <div ng-if="summaryReport.maxTemp==250">
-                                                    <acronym title="设备异常"><span style="color: red;">{{ summaryReport.maxTemp }}</span></acronym>
+                                                    <acronym title="设备异常"><span style="color: red;">-100</span></acronym>
                                                 </div>
                                                 <div ng-if="summaryReport.maxTemp!=250">
                                                     <acronym title="粮温高限报警为: {{warningValueList[summaryReport.storeHouse].high}}℃"><span style="color: red;">{{ summaryReport.maxTemp }}</span></acronym>

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

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