摄像头类型改动、质检也去掉粮食等级

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

@@ -310,12 +310,12 @@ angular.module('app.camera')
                 },
                 {
                     cameraId : "",
-                    alias : "业务类",
+                    alias : "业务",
                     children : []
                 },
                 {
                     cameraId : "",
-                    alias : "安防类",
+                    alias : "安防",
                     children : []
                 }
             ];

src/main/resources/static/app/monitor/record/controller/cameraRecordCtrl.js

@@ -77,13 +77,13 @@ angular.module('app.cameraRecord')
                 {
                     isParent : true,
                     cameraId : "",
-                    alias : "业务类",
+                    alias : "业务",
                     children : []
                 },
                 {
                     isParent : true,
                     cameraId : "",
-                    alias : "安防类",
+                    alias : "安防",
                     children : []
                 }
             ];

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

@@ -68,7 +68,14 @@
                                         <td>{{camera.channelNumber}}</td>
                                         <td>{{camera.ip}}</td>
                                         <td>{{camera.factory=='200'?"海康":"大华"}}</td>
-                                        <td>{{camera.live==1?"仓内":camera.live==2?"业务类":"安防类"}}</td>
+                                        <td>
+                                            <div ng-switch="{{camera.live}}">
+                                                <div ng-switch-when="3">安防</div>
+		                                    	<div ng-switch-when="1">仓内</div>
+		                                    	<div ng-switch-when="2">业务</div>
+                                            </div>
+<!--                                             {{camera.live==1?"仓内":camera.live==2?"业务":"安防"}} -->
+                                        </td>
                                         <td>
                                             <a href-void ng-click="showEdit(camera.id,'edit')"><i class="fa fa-edit"></i>修改</a>
                                             <a href-void ng-click="remove(camera.id)"><i

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-edit.html

@@ -164,13 +164,13 @@
 												</label>
 											</section>
 											<section class="col col-3">
-												<label class="label">粮油等级：<span style="color: red;">*</span></label>
-												<label class="select">
-													<select ng-model="qualitycheck.levelUpdate" ng-disabled="true" ng-readonly="isShow"
-															ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
-														<option value="">-- 粮油等级 --</option>
-													</select>
-												</label>
+<!-- 												<label class="label">粮油等级：<span style="color: red;">*</span></label> -->
+<!-- 												<label class="select"> -->
+<!-- 													<select ng-model="qualitycheck.levelUpdate" ng-disabled="true" ng-readonly="isShow" -->
+<!-- 															ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required> -->
+<!-- 														<option value="">-- 粮油等级 --</option> -->
+<!-- 													</select> -->
+<!-- 												</label> -->
 											</section>
 										</div>
 									</fieldset>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-sample-edit.html

@@ -164,13 +164,13 @@
 												</label>
 											</section>
 											<section class="col col-3">
-												<label class="label">粮油等级：<span style="color: red;">*</span></label>
-												<label class="select">
-													<select ng-model="qualitycheck.levelUpdate" ng-disabled="true" ng-readonly="isShow"
-															ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
-														<option value="">-- 粮油等级 --</option>
-													</select>
-												</label>
+<!-- 												<label class="label">粮油等级：<span style="color: red;">*</span></label> -->
+<!-- 												<label class="select"> -->
+<!-- 													<select ng-model="qualitycheck.levelUpdate" ng-disabled="true" ng-readonly="isShow" -->
+<!-- 															ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required> -->
+<!-- 														<option value="">-- 粮油等级 --</option> -->
+<!-- 													</select> -->
+<!-- 												</label> -->
 											</section>
 										</div>
 									</fieldset>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-outcheck-edit.html

@@ -155,13 +155,13 @@
 												</label>
 											</section>
 											<section class="col col-3">
-												<label class="label">粮油等级：<span style="color: red;">*</span></label>
-												<label class="select">
-													<select ng-model="qualitycheck.levelUpdate" ng-disabled="true" ng-readonly="isShow"
-															ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
-														<option value="">-- 粮油等级 --</option>
-													</select>
-												</label>
+<!-- 												<label class="label">粮油等级：<span style="color: red;">*</span></label> -->
+<!-- 												<label class="select"> -->
+<!-- 													<select ng-model="qualitycheck.levelUpdate" ng-disabled="true" ng-readonly="isShow" -->
+<!-- 															ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required> -->
+<!-- 														<option value="">-- 粮油等级 --</option> -->
+<!-- 													</select> -->
+<!-- 												</label> -->
 											</section>
 										</div>
 									</fieldset>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-outcheck-sample-edit.html

@@ -154,13 +154,13 @@
 												</label>
 											</section>
 											<section class="col col-3">
-												<label class="label">粮油等级：<span style="color: red;">*</span></label>
-												<label class="select">
-													<select ng-model="qualitycheck.levelUpdate" ng-disabled="true" ng-readonly="isShow"
-															ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
-														<option value="">-- 粮油等级 --</option>
-													</select>
-												</label>
+<!-- 												<label class="label">粮油等级：<span style="color: red;">*</span></label> -->
+<!-- 												<label class="select"> -->
+<!-- 													<select ng-model="qualitycheck.levelUpdate" ng-disabled="true" ng-readonly="isShow" -->
+<!-- 															ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required> -->
+<!-- 														<option value="">-- 粮油等级 --</option> -->
+<!-- 													</select> -->
+<!-- 												</label> -->
 											</section>
 										</div>
 									</fieldset>