安全管理接口功能实现

src/main/resources/static/app/monitor/controller/cameraCtrl.js

@@ -163,6 +163,12 @@ angular.module('app.camera')
         var validator = $("#camera-form").validate();
         $scope.saveData = function() {
             if (validator.form()) {
+                if ($scope.cameraEdit.live == "1" && ($scope.cameraEdit.storehouseId == "" ||
+                    $scope.cameraEdit.storehouseId === "undefined" ||
+                    $scope.cameraEdit.storehouseId == null)) {
+                    alert("仓内摄像头必须选择所属仓房！");
+                    return;
+                }
             	if($scope.addedDetail.length == 0){
                     alert("请添加硬盘录像机数据！");
                     return;

src/main/resources/static/app/monitor/views/camera-edit.html

@@ -30,7 +30,7 @@
 								<fieldset>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label txt-bg-red">摄像头名称</label>
+											<label class="label txt-bg-red">摄像头名称<span style="color: red;">*</span></label>
 											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="text" name="name" ng-model="cameraEdit.name"
@@ -38,7 +38,7 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label txt-bg-red">摄像头别名</label>
+											<label class="label txt-bg-red">摄像头别名<span style="color: red;">*</span></label>
 											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="text" name="alias" ng-model="cameraEdit.alias"
@@ -46,7 +46,7 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label>所属厂商</label>
+											<label>所属厂商<span style="color: red;">*</span></label>
 											<label class="select">
 												<select ng-model="cameraEdit.factory"
 														ng-options="enum.enumcode as enum.enumname for enum in parentObj[5330]"
@@ -58,7 +58,7 @@
 									</div>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label txt-bg-red">账号</label>
+											<label class="label txt-bg-red">账号<span style="color: red;">*</span></label>
 											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="text" name="username" ng-model="cameraEdit.username"
@@ -66,7 +66,7 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label txt-bg-red">密码</label>
+											<label class="label txt-bg-red">密码<span style="color: red;">*</span></label>
 											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="password" name="password" ng-model="cameraEdit.password"
@@ -74,7 +74,7 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label txt-bg-red">IP地址</label>
+											<label class="label txt-bg-red">IP地址<span style="color: red;">*</span></label>
 											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="text" name="ip" ng-model="cameraEdit.ip"
@@ -100,9 +100,9 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label txt-bg-red">设备类型</label>
+											<label class="label txt-bg-red">设备类型<span style="color: red;">*</span></label>
 											<label class="select">
-												<select ng-model="cameraEdit.type"
+												<select ng-model="cameraEdit.type" name="type"
 														ng-options="enum.enumcode as enum.enumname for enum in parentObj[5331]"
 														class="form-control" required>
 													<option value="">--请选择--</option>
@@ -112,7 +112,7 @@
 									</div>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label txt-bg-red">端口</label>
+											<label class="label txt-bg-red">端口<span style="color: red;">*</span></label>
 											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="text" name="port" ng-model="cameraEdit.port"
@@ -128,9 +128,9 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label txt-bg-red">所在位置</label>
+											<label class="label txt-bg-red">所在位置<span style="color: red;">*</span></label>
 											<label class="select">
-												<select ng-model="cameraEdit.live" ng-change="changeEvent()"
+												<select ng-model="cameraEdit.live" ng-change="changeEvent()" name="live"
 														ng-options="enum.enumcode as enum.enumname for enum in parentObj[5332]"
 														class="form-control" required>
 													<option value="">--请选择--</option>

src/main/resources/static/app/storage/grainCard/views/addQualityInspection-modal.html

@@ -33,11 +33,11 @@
 								<td class="text-center">{{storehouseObj[quailtyCard.houseId].storehouseName}}</td>
 								<td class="text-center">{{warehouseObj[quailtyCard.warehouseId].warehouseName}}</td>
 								<td class="text-center">
-									<span ng-if="quailtyCard.type=='0'">粮食初检</span>
-									<span ng-if="quailtyCard.type=='4'">日常检查</span>
-									<span ng-if="quailtyCard.type=='2'">强检</span>
-									<span ng-if="quailtyCard.type=='1'">第三方检验</span>
-									<span ng-if="quailtyCard.type=='3'">出库检验</span>
+									<span ng-if="quailtyCard.typeUpdate=='0'">粮食初检</span>
+									<span ng-if="quailtyCard.typeUpdate=='4'">日常检查</span>
+									<span ng-if="quailtyCard.typeUpdate=='2'">强检</span>
+									<span ng-if="quailtyCard.typeUpdate=='1'">第三方检验</span>
+									<span ng-if="quailtyCard.typeUpdate=='3'">出库检验</span>
 								</td>
 								<td class="text-center">{{dicData[quailtyCard.subType]}}</td>
 								<td class="text-center">{{quailtyCard.checker}}</td>

src/main/resources/static/app/storage/grainCard/views/addQualityInspection.html

@@ -106,11 +106,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3">
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center">{{dicData[quailckCard.level]}}</td>
@@ -253,11 +253,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3" >
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center">{{dicData[quailckCard.level]}}</td>
@@ -359,11 +359,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3">
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center">{{dicData[quailckCard.level]}}</td>
@@ -465,11 +465,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3" >
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center">{{dicData[quailckCard.level]}}</td>
@@ -535,11 +535,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3" >
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" colspan="3">{{dicData[quailckCard.level]}}</td>

src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

@@ -608,11 +608,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3" height="50px" style="vertical-align: middle;text-align: center;">
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.level]}}</td>
@@ -734,11 +734,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">
@@ -839,11 +839,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;" >{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.level]}}</td>
@@ -943,11 +943,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.level]}}</td>
@@ -998,11 +998,11 @@
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3" >
-                                                    <span ng-if="quailckCard.type=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.type=='4'">日常检查</span>
-                                                    <span ng-if="quailckCard.type=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.type=='1' ">第三方检验</span>
-                                                    <span ng-if="quailckCard.type=='3' ">出库检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='4'">日常检查</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
+                                                    <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" colspan="3">{{dicData[quailckCard.level]}}</td>