Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/qdtlui

public/index.html

@@ -20,14 +20,14 @@
             padding: 0px;
             font-size: 10px;
         }
-        
+
         .chromeframe {
             margin: 0.2em 0;
             background: #ccc;
             color: #000;
             padding: 0.2em 0;
         }
-        
+
         #loader-wrapper {
             position: fixed;
             top: 0;
@@ -36,7 +36,7 @@
             height: 100%;
             z-index: 999999;
         }
-        
+
         #loader {
             display: block;
             position: relative;
@@ -55,7 +55,7 @@
             animation: spin 2s linear infinite;
             z-index: 1001;
         }
-        
+
         #loader:before {
             content: "";
             position: absolute;
@@ -72,7 +72,7 @@
             -ms-animation: spin 3s linear infinite;
             animation: spin 3s linear infinite;
         }
-        
+
         #loader:after {
             content: "";
             position: absolute;
@@ -89,7 +89,7 @@
             -webkit-animation: spin 1.5s linear infinite;
             animation: spin 1.5s linear infinite;
         }
-        
+
         @-webkit-keyframes spin {
             0% {
                 -webkit-transform: rotate(0deg);
@@ -102,7 +102,7 @@
                 transform: rotate(360deg);
             }
         }
-        
+
         @keyframes spin {
             0% {
                 -webkit-transform: rotate(0deg);
@@ -115,7 +115,7 @@
                 transform: rotate(360deg);
             }
         }
-        
+
         #loader-wrapper .loader-section {
             position: fixed;
             top: 0;
@@ -127,15 +127,15 @@
             -ms-transform: translateX(0);
             transform: translateX(0);
         }
-        
+
         #loader-wrapper .loader-section.section-left {
             left: 0;
         }
-        
+
         #loader-wrapper .loader-section.section-right {
             right: 0;
         }
-        
+
         .loaded #loader-wrapper .loader-section.section-left {
             -webkit-transform: translateX(-100%);
             -ms-transform: translateX(-100%);
@@ -143,7 +143,7 @@
             -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
             transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
         }
-        
+
         .loaded #loader-wrapper .loader-section.section-right {
             -webkit-transform: translateX(100%);
             -ms-transform: translateX(100%);
@@ -151,13 +151,13 @@
             -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
             transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
         }
-        
+
         .loaded #loader {
             opacity: 0;
             -webkit-transition: all 0.3s ease-out;
             transition: all 0.3s ease-out;
         }
-        
+
         .loaded #loader-wrapper {
             visibility: hidden;
             -webkit-transform: translateY(-100%);
@@ -166,15 +166,15 @@
             -webkit-transition: all 0.3s 1s ease-out;
             transition: all 0.3s 1s ease-out;
         }
-        
+
         .no-js #loader-wrapper {
             display: none;
         }
-        
+
         .no-js h1 {
             color: #222222;
         }
-        
+
         #loader-wrapper .load_title {
             font-family: 'Open Sans';
             color: #FFF;
@@ -187,7 +187,7 @@
             opacity: 1;
             line-height: 30px;
         }
-        
+
         #loader-wrapper .load_title span {
             font-weight: normal;
             font-style: italic;
@@ -484,13 +484,13 @@
         }
 
 
-        function startPreview(cameraIndexCode=window.cameraid,index=-1) {
-        
+        function startPreview(cameraIndexCode = window.cameraid, index = -1) {
+
             var cameraIndexCode = cameraIndexCode; //获取输入的监控点编号值，必填
             var streamMode = 0; //主子码流标识：0-主码流，1-子码流
             var transMode = 1; //传输协议：0-UDP，1-TCP
             var gpuMode = 0; //是否启用GPU硬解，0-不启用，1-启用
-            var wndId = -1; //播放窗口序号（在2x2以上布局下可指定播放窗口）
+            var wndId = index; //播放窗口序号（在2x2以上布局下可指定播放窗口）
 
             cameraIndexCode = (cameraIndexCode + "").replace(/(^\s*)/g, "");
             cameraIndexCode = (cameraIndexCode + "").replace(/(\s*$)/g, "");
@@ -529,4 +529,4 @@
     </div>
 </body>
 
-</html>
+</html>

src/components/map/index.vue

@@ -22,11 +22,12 @@
       v-if="dialogVisible"
       width="50%"
       :before-close="handleClose"
+      @before-appear="handleOpen"
       >
          <div style="width:100%;height:60rem;position:relative">
            <videodiv :cameracode="ccode" style="width:100%;height:100%;position:absolute;top:0;left:0"></videodiv>
          </div>
-         
+
           <span slot="footer" class="dialog-footer">
     <el-button @click="handleClose()">关闭</el-button>
     <!-- <el-button type="primary" @click="dialogVisible = false">确 定</el-button> -->
@@ -128,9 +129,9 @@ export default {
                     }
                     if (tadata.sectionId == "point") {
                          console.log(tadata.data)
-                         this.ccode = tadata.data.cameraIndexCode
-                         console.log(this.ccode);
-                         window.cameraid = this.ccode;
+                         that.ccode = tadata.data.cameraIndexCode
+                         console.log(that.ccode);
+                         window.cameraid = that.ccode;
                          that.dialogVisible = true
                     }
                     //含有lnglat 参数的点标记触发事件
@@ -150,7 +151,7 @@ export default {
     this.map.on('moveend', function (e) {
 
     });
-  
+
   },
   methods: {
     initdev: function () {
@@ -250,7 +251,7 @@ const vector = new LayerVec({
     layers: [ // 图层放置（类似有卫星图层，街道图层等）
       satellite,
       street,
-      vector 
+      vector
     ],
     view: new View({
       zoom: 11, // 当前缩放
@@ -274,7 +275,7 @@ const vector = new LayerVec({
            this.addInteractions();
       }
       var that = this;
-  
+
       //  map.getView().setCenter(
       //     [118.642876, 31.970445]
       // );
@@ -345,7 +346,7 @@ const vector = new LayerVec({
             });
             this.pointArry.set(id,markerta);
             this.map.addLayer(markerta); //这里是执行，执行之后点就出来了
-      }, 
+      },
         addline: function() {
 
             var points = [
@@ -385,7 +386,7 @@ const vector = new LayerVec({
                     this.addMarker(pointObj.locations.split(','),'专家站点.png',0.2,'marker');
                   }
 
-                
+
               }
         },
         transpoints: function(points, type) {
@@ -408,9 +409,12 @@ const vector = new LayerVec({
             }
         },
         handleClose(){
-          
             closevideo();
             this.dialogVisible = false
+        },
+        handleOpen(){
+          window.cameraid = this.ccode;
+          startPreview(window.cameraid,-1);
         }
   }
 };