访问大华摄像头通道问题和大数据统计表

src/components/TVWall.vue

@@ -346,7 +346,7 @@ export default {
                 // userName: 'system',
                 // userPwd: 'Admin@123',
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res

src/components/eventLocation.vue

@@ -559,7 +559,7 @@ export default {
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res

src/views/bigdata/bigdata.vue

@@ -81,7 +81,7 @@
             <span>事件趋势</span>
           </div>
           <chartEventTrend></chartEventTrend>
-          <strong></strong>
+          <!--<strong></strong>-->
         </div>
       </div>
       <!-- 第四纵向-->
@@ -100,27 +100,6 @@
         </div>
       </div>
       <!-- 第五纵向-->
-      <!--<div class="bigdata-list wid-li-3 m-l-15 flex-r">-->
-      <!--<div class="b-con mg-b-20 tall">-->
-      <!--<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">-->
-      <!--<span>网格人员</span>-->
-      <!--</div>-->
-      <!--<chartGridStaff></chartGridStaff>-->
-      <!--</div>-->
-      <!--<div class="b-con mg-b-20 b-49">-->
-      <!--<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">-->
-      <!--<span>防火队</span>-->
-      <!--</div>-->
-      <!--<chartFireBrigade></chartFireBrigade>-->
-      <!--</div>-->
-      <!--<div class="b-con mg-b-20 b-49">-->
-      <!--<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">-->
-      <!--<span>气象站</span>-->
-      <!--</div>-->
-      <!--<chartWeatherStation></chartWeatherStation>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!-- 第六纵向-->
       <div class="bigdata-list wid-li-1 m-l-15">
         <div class="b-con mg-b-20 taller">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
@@ -129,6 +108,15 @@
           <chartEquipmentDistribution></chartEquipmentDistribution>
         </div>
       </div>
+      <!-- 第六纵向-->
+      <div class="bigdata-list wid-li-3 m-l-15 flex-r">
+        <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>
     </div>
 
   </div>
@@ -153,6 +141,7 @@ import chartNoBurningArea from './chart-noBurningArea.vue' //10 禁烧区分布
 // import chartGridStaff from './chart-gridStaff.vue' //13 网格人员、、
 // import chartWeatherStation from './chart-weatherStation.vue' //14 气象站、、
 import chartEquipmentDistribution from './chart-equipmentDistribution' //16 设备分布、、
+import chartDetector from './chart-detector' //16 设备分布、、
 import { getRlt } from '@/api/bigdata'
 import {
   fontConfig
@@ -175,7 +164,8 @@ export default {
     // chartFireBrigade,
     // chartGridStaff,
     // chartWeatherStation,
-    chartEquipmentDistribution
+    chartEquipmentDistribution,
+    chartDetector
   },
   data() {
     return {

src/views/bigdata/chart-detector.vue

@@ -0,0 +1,106 @@
+<!-- **************************************NO.17 探测器*************************************** -->
+<template>
+	<div class="chart-container">
+		<div id="detector1" style="width: 100%; height:25vh; ">
+		</div>
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+  import {getSjlylxtj} from '@/api/bigdata'
+	export default {
+		name: 'detector',
+		data() {
+			return {
+				count: 0
+			}
+		},
+		mounted() {
+			this.sjlylxtj();
+		},
+
+		methods: {
+      sjlylxtj() {
+        let that = this
+        getSjlylxtj().then(resp => {
+          that.myEcharts(resp.data.type)
+        })
+      },
+			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=gK9VdA5_F06NTrpr
+			myEcharts(seriesData) {
+				var chartDom = document.getElementById('detector1');
+				var myChart = echarts.init(chartDom);
+				var option;
+				 option = {
+				    tooltip: {
+				        trigger: 'item',
+				    },
+				    color: ['#f7c778', '#d77169', '#c14f60', '#4d9564', '#215b85', ],
+
+				    series : [
+				        {
+				            name:'',
+				            type:'funnel',
+				            x: '10%',
+				            y: 15,
+				            //x2: 80,
+				            y2: 15,
+				            width: '80%',
+				            // height: {totalHeight} - y - y2,
+				            min: 0,
+				            max: 100,
+				            minSize: '40%',
+				            maxSize: '100%',
+				            sort : 'descending', // 'ascending', 'descending'
+				            gap :0,
+				            data:seriesData.sort(function (a, b) {
+                      return a.value - b.value}),
+				            roseType: true,
+				            label: {
+				                normal: {
+				                    color:'#fff',
+				                    formatter:'{b} {c}',
+				                    position: 'center',
+				                    rich:{
+				                        style:{
+				                            fontSize:'20px',
+											color:'#ffffff',
+				                        },
+
+				                    }
+				                }
+				            },
+				            itemStyle: {
+				                normal: {
+				                    borderWidth: 0,
+				                    shadowBlur: 30,
+				                    shadowOffsetX: 0,
+				                    shadowOffsetY: 10,
+				                    shadowColor: 'rgba(0, 0, 0, 0.5)'
+				                }
+				            }
+
+				        }
+
+				    ]
+				};
+				option && myChart.setOption(option);
+			},
+
+		},
+
+
+	}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.chart-container {
+		width: 100%;
+		height: auto;
+		position: relative;
+		padding-bottom: 10px;
+		display: flex;
+		flex-direction: column;
+	}
+</style>

src/views/bigdata/chart-eventTrend.vue

@@ -28,7 +28,7 @@
       sjqs(){
         let that = this
         getSjqs().then(resp=>{
-          that.data_sjqs_month = resp.data.mouth
+          that.data_sjqs_month = resp.data.month
           that.data_sjqs_num = resp.data.num
           that.myEcharts()
         })
@@ -43,6 +43,11 @@
         option = {
           xAxis: {
             data:that.data_sjqs_month,
+            show:true,					//---是否显示
+            position:'bottom',			//---x轴位置
+            offset:0,					//---x轴相对于默认位置的偏移
+            type:'category',			//---轴类型，默认'category'
+            name:'月份',				//---轴名称
           },
           yAxis: {
             axisLabel: {

src/views/eventdetailsdialog.vue

@@ -2145,7 +2145,7 @@ export default {
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res

src/views/firespread.vue

@@ -2093,7 +2093,7 @@
                   userName: newResponse.userName,
                   userPwd: newResponse.userPwd,
                   token: '',
-                  https: 0
+                  https: 1
                 })
                 this.ws.on('loginState', (res) => {
                   this.isLogin = res

src/views/monitor.vue

@@ -670,7 +670,7 @@ export default {
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res