Merge branch 'master' of http://192.168.124.50:80/wuhongjian/qd-changjing

src/views/pages/area/components/ImportantAreaPopNew.vue

@@ -133,7 +133,10 @@
         </el-tree>
       </div>
       <div class="site-content-right">
-        右
+        <div><span>视频监控</span></div>
+         <video-play
+                :key="channelCode" :channel-id="[channelCode]"
+              ></video-play>
       </div>
       </div>
       <div class="site-content-people" v-show="selectedIndex == 2">
@@ -241,6 +244,7 @@
   </div>
 </template>
 <script>
+import VideoPlay from './VideoPlay'
 import bus from "@/views/layout/bus";
 import 'viewerjs/dist/viewer.css'
 import { directive as viewer } from "v-viewer"
@@ -286,13 +290,6 @@ export default {
           channelCode: returnData[0].channelCode
         })
       }
-    })
-      getCameraAllLabel().then((res) => {
-      this.tabList = res.data.data
-    });
-    getCameraAll().then((res) => {
-      this.cameraAllData = res.data
-      // this.addResourceTomap('cameraAll',res.data);
     })
        getCameraAllOrgan({parentId:'S4NbecfYB1DBH8HNULGS34'}).then((res) => {
       this.cameraTree = res.data.data
@@ -343,11 +340,12 @@ export default {
       selectedFacilitiesType:"",//设施类型
       facilitiesTypeOption:[{label:"设施类型",value:"1"}],
       facilitiesDataResource:[{facilitiesType:"设施类型1",address:"李沧",manageMan:"张山",telePhone:"1334650987"}],
-       cameraAllData:[],
       cameraTreeIsShow:true,
       cameraTreeSingle: [],
       checkStatus: '2',
       cameraTree:[],
+      channelCode:"3701222749350945",
+      
     };
   },
   methods: {

src/views/pages/civilizedCity/components/EventListDetailsPopNew.vue

@@ -150,7 +150,7 @@ export default {
       openVideo: false,
       newImageUrl: "",
       resourceType:"resource",
-      channelCode:["3701222749350945"]
+      channelCode:"3701222749350945"
 
     };
   },