设备报废确认提示

src/main/resources/static/app/business/device/controller/deviceOutCtrl.js

@@ -16,6 +16,9 @@ angular.module('app.business')
 	 
 	// 报废
  	$scope.showOut = function (sbbh) {
+        if (!confirm("您确定要报废吗？")) {
+            return;
+        }
          $http({
              method: 'POST',
              url: APP_CONFIG.deviceUrl + '/devicePutStorage/outUpdate',

src/main/resources/static/app/business/module.js

@@ -196,7 +196,7 @@ angular.module('app.business')
             }
         })
         // 温度报警
-        /*.state('app.business.warning.temperature', {
+        .state('app.business.warning.temperature', {
                 url: '/business/warning/temperature',
                 data: {
                     title: '温度报警列表'
@@ -208,9 +208,9 @@ angular.module('app.business')
                     }
                 }
             }
-        )*/
+        )
 		// 湿度报警
-        /*.state('app.business.warning.humidity', {
+        .state('app.business.warning.humidity', {
 			url: '/business/warning/humidity',
 			data: {
 				title: '湿度报警'
@@ -221,7 +221,7 @@ angular.module('app.business')
 					templateUrl: 'app/supervise/views/humidityWarningThreshold.html'
 				}
 			}
-		})*/
+		})
 		// 结露报警
         .state('app.business.warning.dewing', {
 			url: '/business/warning/dewing',

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

@@ -502,12 +502,12 @@
                             <li has-func="300">
                                 <a data-ui-sref="app.supervise.situation.gas">气体浓度报警</a>
                             </li> -->
-                            <!--<li has-func="301">
+                            <li has-func="301">
                                 <a data-ui-sref="app.business.warning.temperature">温度报警</a>
                             </li>
 							<li has-func="450">
 								<a data-ui-sref="app.business.warning.humidity">湿度报警</a>
-							</li>-->
+							</li>
                             <li has-func="450">
                                 <a data-ui-sref="app.business.warning.dewing">结露预警</a>
                             </li>
@@ -526,17 +526,17 @@
                                     <li data-ui-sref-active="active">
                                         <a data-ui-sref="app.business.warning.rotation-warning.plan-warning-time">预警时间</a>
                                     </li>
-                                    <!-- <li data-ui-sref-active="active">
+                                     <li data-ui-sref-active="active">
                                         <a data-ui-sref="app.business.warning.rotation-warning.plan-warning-set">轮换预警设置</a>
-                                    </li> -->
+                                    </li>
                                     <li data-ui-sref-active="active">
                                         <a data-ui-sref="app.business.warning.rotation-warning.plan-warning-list">预警列表</a>
                                     </li>
                                 </ul>
                             </li>
-                            <!--<li has-func="451">
+                            <li has-func="451">
                                 <a data-ui-sref="app.business.warning.store">超期储存报警</a>
-                            </li>-->
+                            </li>
                             <li has-func="453">
                                 <a data-ui-sref="app.business.warning.internalControl">内控预警</a>
                             </li>

src/main/resources/static/app/warnAndAlarm/tempWet/views/tempAlarm-list.html

@@ -70,7 +70,7 @@
                                             <td style="text-align:center;">{{ warning.restoreTime}}</td>
                                             <td style="text-align:center;">{{ warning.durationDays }}</td>
                                             <td style="text-align:center;" >
-                                                <span ng-if="warning.processStatus == null && warning.supervisionStatus == null && warning.approvalStatus != '999999'">待处理</span>
+                                                <span ng-if="(warning.processStatus == null || warning.supervisionStatus == null) && warning.approvalStatus != '999999'">待处理</span>
                                                 <span ng-if="warning.processStatus != null && warning.supervisionStatus == null && warning.approvalStatus != '999999'">处理中</span>
                                                 <span ng-if="warning.processStatus != null && warning.supervisionStatus != null && warning.approvalStatus != '999999'">督办中</span>
                                                 <span ng-if="warning.processStatus != null && warning.supervisionStatus != null && warning.approvalStatus == '999999'">处理完成</span>