视频分析外链+查询追溯原型

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

@@ -97,5 +97,20 @@ angular.module('app.additionalHome', ['ui.router', 'ngResource']).config(functio
 	    			return lazyScript.register('build/vendor.graphs.js');
 	    		}
 	    	}
+	    })
+		// 查询追溯
+		.state('app.additionalHome.traceability', {
+	    	url: '/additionalHome/traceability', 
+	    	views: {
+	    		"content@app": {
+	    			controller: 'QualityCheckCtrl',
+	    			templateUrl: 'app/synth/qualityTrace/views/qualityIframe.html'
+	    		}
+	    	},
+	    	resolve:{
+	    		scripts: function(lazyScript){
+	    			return lazyScript.register('build/vendor.graphs.js');
+	    		}
+	    	}
 	    });
 });

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

@@ -236,6 +236,14 @@ angular.module('app.system').controller("headerCtrl",
 	}
 	
 	$rootScope.now = new Date();
+
+	//跳转到查询追溯原型页
+	$scope.skipLqBugList = function (a) {
+		if(a ==3 ) {
+			console.log('这是查询追溯跳转按钮')
+		}
+		$state.go("app.additionalHome.traceability")
+	};
 	 
 })
 

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

@@ -83,7 +83,8 @@
 							<i class="nav-feng-line"></i>
 						</div> -->
 						<div has-func="23" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==23]">
-							<a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource')">
+							<!-- <a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource')"> -->
+							<a href-void ng-click="skipLqBugList(3)">
 								<i class="nav-icon" style='position: relative;top:7px'><img alt="查询追溯" src="styles/img/home-1/nav-icon/chaxzs-icon.png" /></i>
 								查询追溯</a>
                             <i class="nav-feng-line"></i>

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

@@ -2099,17 +2099,15 @@
                     <!-- <li>
                         <a data-ui-sref="app.prewarning.index">业务介绍</a>
                     </li> -->
-                    <li>
+                    <li data-ui-sref-active="active">
                         <a data-ui-sref="app.prewarning.temperature">温度报警</a>
                     </li>
-                    <li data-menu-collapse data-ui-sref-active="active">
-                        <a href="#" data-ui-sref="app.numbermanage.numbermanage.emptyPoliceList">
-                            <i class="fa fa-lg fa-fw fa-folder-open"></i>库存空仓报警
-                        </a>
-                        <ul>
-                            <li data-ui-sref-active="active">
-                                <a data-ui-sref="app.business.agent.monitor.play">视频分析</a></li>
-                        </ul>
+                    <li data-ui-sref-active="active">
+                        <a data-ui-sref="app.numbermanage.numbermanage.emptyPoliceList">库存空仓报警</a>
+                    </li>
+
+                    <li data-ui-sref-active="active">
+                        <a data-ui-sref="app.prewarning.video">视频分析</a>
                     </li>
                     <li data-ui-sref-active="active">
                         <a data-ui-sref="app.intelligent.grainDetection.AbnormalEquipment">设备异常报警信息</a>

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

@@ -39,7 +39,18 @@ angular.module('app.prewarning')
                     templateUrl: 'app/intelligent/grainDetection/views/warningThreshold-list.html'
                 }
             }
-        }
-    )            
+        })
+        // 视频分析
+        .state('app.prewarning.video', {
+            url: '/prewarning/video/:orgId',
+            data: {
+                title: '视频实时画面'
+            },
+            views: {
+                "content@app": {
+                    templateUrl: 'app/prewarning/views/video-analysis.html'
+                }
+            }
+        })            
         
 });

src/main/resources/static/app/prewarning/views/video-analysis.html

@@ -0,0 +1,7 @@
+<META HTTP-EQUIV="pragma" CONTENT="no-cache">
+<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
+<META HTTP-EQUIV="expires" CONTENT="0">
+<div id="content" >
+    <iframe id="videoAnalysis" title="视频分析" width="100%"; height =750; src="http://47.100.180.194/" frameborder="0"></iframe>
+</div>
+

src/main/resources/static/app/synth/qualityTrace/views/qualityIframe.html

@@ -0,0 +1,6 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+	<iframe src="https://t0h0fx.axshare.com" frameborder="0" width="100%" height="750"></iframe>
+
+</div>
+