wenhongquan 1 년 전
부모
커밋
fea8c9886d
1개의 변경된 파일23개의 추가작업 그리고 12개의 파일을 삭제
  1. 23 12
      src/components/map/index.vue

+ 23 - 12
src/components/map/index.vue

@@ -125,7 +125,8 @@
           :before-close="handleClose"
           >
             <div style="width:100%;height:60rem;position:relative">
-              <videodiv :cameracode="ccode" style="width:100%;height:100%;position:absolute;top:0;left:0"></videodiv>
+              <!-- <videodiv :cameracode="ccode" style="width:100%;height:100%;position:absolute;top:0;left:0"></videodiv> -->
+              <aliplayer ref="videoObjali" ></aliplayer>
             </div>
 
               <span slot="footer" class="dialog-footer">
@@ -199,6 +200,8 @@ import { getSingleElectricLocation } from "@/api/qdtl/electri";
 // import {Icon, Stroke, Style} from "ol/style";
 // import {Vector as LayerVec} from "ol/layer";
 
+import aliplayer from "../../components/AliVideo/index.vue";
+
 
 export default {
   props: {
@@ -259,7 +262,8 @@ export default {
     };
   },
    components:{
-      videodiv
+     videodiv,
+     aliplayer
     },
    watch:{
       iconSelect(val, oldVal){//普通的watch监听
@@ -283,6 +287,8 @@ export default {
     this.addQdStation();
     window.videosize = "1x1";
     // this.addpoint(point);
+
+    //  this.$refs.videoObj.getHlsUrl(data)
     var that = this
     if(this.isLine){
             this.getResource();
@@ -326,13 +332,18 @@ export default {
                                 that.isShowCar = true
                          }
 
-                         if(tadata.type == 'video'){
-                                that.ccode = tadata.data.cameraIndexCode
-                                window.cameraid = that.ccode;
-                                that.dialogVisible = true
-                                setTimeout(() => {
-                                  that.handleOpen()
-                                }, 1000);
+                      if (tadata.type == 'video') {
+
+
+
+                                // that.ccode = tadata.data.cameraIndexCode
+                          //  window.cameraid = that.ccode;
+                           that.dialogVisible = true
+                        setTimeout(() => {
+
+                            that.$refs.videoObjali.getHlsUrl(tadata.data);
+                             that.handleOpen()
+                           }, 1000);
                          }
                           if(tadata.type == 'wrj'){
                               //  that.ccode = tadata.data.cameraIndexCode
@@ -1103,15 +1114,15 @@ export default {
               }
         },
         handleClose(){
-            closevideo();
+            // closevideo();
             this.dialogVisible = false
         },
         handleCloseCk(){
              this.dialogVisibleCk = false
         },
         handleOpen(){
-          window.cameraid = this.ccode;
-          startPreview(window.cameraid,-1);
+          // window.cameraid = this.ccode;
+          // startPreview(window.cameraid,-1);
         },
         handleChange(value){
             for(var key in this.mapHashMap){