瀏覽代碼

统计分析

彭宇 2 年之前
父節點
當前提交
8c2a5c9e47
共有 3 個文件被更改,包括 35 次插入15 次删除
  1. 2 2
      src/api/haikang/haikang.js
  2. 11 6
      src/components/TVWall.vue
  3. 22 7
      src/views/bigdata/bigdata.vue

+ 2 - 2
src/api/haikang/haikang.js

@@ -9,9 +9,9 @@ export function getHaiKangVideoServer(param) {
   })
 }
 // 查询电视墙
-export function getTVWallList() {
+export function tvCameraList() {
   return request({
-    url: '/center-monitor/TVWallController/init',
+    url: '/center-firecontrol/VisuForestMonitorCenterController/tvCameraList',
     method: 'get',
   })
 }

+ 11 - 6
src/components/TVWall.vue

@@ -8,16 +8,16 @@
 	  		<span>45</span>
 	  	</div> -->
 	  	<div class="i-list-con" style="height: 64vh; overflow-y: scroll;">
-	  		<span v-for="(forestFarm,index) in 10" :key="index">
-	  			<div class="d-l-con">
+	  		<span v-for="(item,index) in cameraList" :key="index">
+	  			<div class="d-l-con" @click="playhk(item.channelCode)">
 	  				<div class="d-l-l-text">
 	  					<i class="i-small"></i>
-	  					<h4>asdasd爱仕达</h4>
+	  					<h4>{{ item.cameraName }}</h4>
 	  				</div>
 	  			</div>
 	  		</span>
 	  	</div>
-	  </div>		
+	  </div>
       <div style="width:70%;height:400px;position:absolute;">
         <!--视频窗口展示---大华-->
         <div id="dom1" class="dom1"></div>
@@ -32,6 +32,7 @@
 <script>
 /** ----------------------------------摄像头预览开始------------------------------------- */
 import { getDahuaVideoServer, getTVWallList } from '@/api/dahua/dahua'
+import { tvCameraList } from '@/api/haikang/haikang'
 import DHWs from '@/dahua/lib/DHWs'
 
 /** ----------------------------------摄像头预览结束------------------------------------- */
@@ -254,6 +255,7 @@ export default {
       mixedVideoDisplayMode: 2,
       isShowTipe: true,
       /** ----------------------------------摄像头预览结束------------------------------------- */
+      cameraList:[],
       initCount: 0,
       pubKey: '',
       oWebControl: null
@@ -302,6 +304,9 @@ export default {
       // this.preview()
       /** ----------------------------------大华摄像头预览结束------------------------------------- */
       /** ----------------------------------海康摄像头预览开始------------------------------------- */
+      tvCameraList().then(response => {
+        this.cameraList=response.data
+      })
       that.initPlugin()
       setTimeout(function() {
         that.playhk();
@@ -536,8 +541,8 @@ export default {
       return encrypt.encrypt(value)
     },
     //播放海康摄像头
-    playhk(){
-      var cameraIndexCode = '33e7f21691a843f6bcb4866efebe088b'     //获取输入的监控点编号值,必填
+    playhk(channelCode){
+      var cameraIndexCode = channelCode     //获取输入的监控点编号值,必填
       var streamMode = 0                                     //主子码流标识:0-主码流,1-子码流
       var transMode = 1                                      //传输协议:0-UDP,1-TCP
       var gpuMode = 0                                        //是否启用GPU硬解,0-不启用,1-启用

+ 22 - 7
src/views/bigdata/bigdata.vue

@@ -21,7 +21,7 @@
 			<div class="bigdata-list wid-li-1">
 				<div class="b-con mg-b-20">
 					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>事件类型、分布统计</span>
+						<span>事件来源,类型统计</span>
 					</div>
 					<div class="twins">
 						<div class="count">
@@ -34,13 +34,13 @@
 				</div>
 				<div class="b-con mg-b-20">
 					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>人口分布统计</span>
+						<span>林场分布统计</span>
 					</div>
 					<chartPopulation></chartPopulation>
 				</div>
 				<div class="b-con">
 					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>企业分布统计</span>
+						<span>设备类型统计</span>
 					</div>
 					<chartEnterprise></chartEnterprise>
 				</div>
@@ -58,13 +58,13 @@
 			<div class="bigdata-list wid-li-1 m-l-15">
 				<div class="b-con mg-b-20">
 					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>隐患分布统计</span>
+						<span>起火原因统计</span>
 					</div>
 					<chartDanger></chartDanger>
 				</div>
 				<div class="b-con mg-b-20">
 					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>林场分布统计</span>
+						<span>重点区域统计</span>
 					</div>
 					<chartForestFarm></chartForestFarm>
 				</div>
@@ -79,13 +79,13 @@
 			<div class="bigdata-list wid-li-1 m-l-15">
 				<div class="b-con mg-b-20">
 					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>散养户分布统计</span>
+						<span>设备上报数量统计</span>
 					</div>
 					<chartFreelyraise></chartFreelyraise>
 				</div>
 				<div class="b-con mg-b-20">
 					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>养殖场分布统计</span>
+						<span>珍惜古树统计</span>
 					</div>
 					<chartFarm></chartFarm>
 				</div>
@@ -162,6 +162,21 @@
 					<chartFireControl></chartFireControl>
 				</div>
 			</div>
+      <!-- 第九纵向-->
+      <div class="bigdata-list wid-li-1 m-l-15">
+        <div class="b-con mg-b-20 tall">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>探测器分布、类型统计</span>
+          </div>
+          <chartDetector></chartDetector>
+        </div>
+        <div class="b-con mg-b-20">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>消防力量分布统计</span>
+          </div>
+          <chartFireControl></chartFireControl>
+        </div>
+      </div>
 		</div>
 
 	</div>