|
@@ -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);
|
|
|
}
|
|
|
}
|
|
|
};
|