Merge remote-tracking branch 'origin/visu_traffic' into visu_traffic

# Conflicts:
#	src/components/eventLocation.vue
#	src/views/forest.vue

src/views/forest.vue

@@ -459,15 +459,8 @@
   import TVWall from '@/components/TVWall.vue' //电视墙弹窗
   import eventdetailsdialog from '@/views/eventdetailsdialog.vue' //事件详情弹窗
   import firespread from '@/views/firespread.vue' //事件详情弹窗
-
-  /** ----------------------------------摄像头预览开始------------------------------------- */
-  import {
-    getDahuaVideoServer
-  } from '@/api/dahua/dahua'
-  // import DHWs from '@/dahua/lib/DHWs'
   import Firespread from "./firespread";
 
-  /** ----------------------------------摄像头预览结束------------------------------------- */
 
   let echarts = require('echarts')
   export default {