|
|
@@ -145,6 +145,7 @@ export default {
|
|
|
dialogVisible:false,
|
|
|
ccode:'',
|
|
|
dialogVisibleCk:false,
|
|
|
+ imgBg:require('../../assets/images/imgBg.jpg'),
|
|
|
imgSrc:'require(../../assets/images/icons/',
|
|
|
imgtype:'.png)',
|
|
|
imageMap:{
|
|
|
@@ -289,13 +290,25 @@ export default {
|
|
|
if (tadata.sectionId == "point") {
|
|
|
// that.addText(evt.coordinate);
|
|
|
// console.log(tadata);
|
|
|
+ $(that.element).popover('dispose');
|
|
|
that.popup.setPosition(evt.coordinate);
|
|
|
- $(that.element).popover({
|
|
|
- placement: 'top',
|
|
|
- html: true,
|
|
|
- content: tadata.data.name,
|
|
|
- });
|
|
|
- $(that.element).popover('show');
|
|
|
+ if(tadata.data.pic){
|
|
|
+ // var src = 'http://58.221.168.61:9000/api/common/download/resource?resource=/profile/bx/1.jpg'
|
|
|
+ var src = 'http://58.221.168.61:9000/api'+tadata.data.pic
|
|
|
+ $(that.element).popover({
|
|
|
+ placement: 'top',
|
|
|
+ html: true,
|
|
|
+ content: '<div><div class="imgClass" style="width:10rem;height:10rem"><img style="width:10rem;height:10rem" src="'+src+'" class="imgClass"/></div><br/><span style="text-align:center">'+tadata.data.name+'</span></div>',
|
|
|
+ });
|
|
|
+
|
|
|
+ }else{
|
|
|
+ $(that.element).popover({
|
|
|
+ placement: 'top',
|
|
|
+ html: true,
|
|
|
+ content: '<div><img src="'+that.imgBg+'" style="width:5rem;height:5rem"/><br/><span style="text-align:center">'+tadata.data.name+'</span></div>',
|
|
|
+ });
|
|
|
+ }
|
|
|
+ $(that.element).popover('show');
|
|
|
// } else {
|
|
|
// $(element).popover('dispose');
|
|
|
// }
|
|
|
@@ -307,6 +320,7 @@ export default {
|
|
|
// false);
|
|
|
// this.map.addPopup(popup);
|
|
|
}else{
|
|
|
+ // console.log(1111111);
|
|
|
$(that.element).popover('dispose');
|
|
|
}
|
|
|
//含有lnglat 参数的点标记触发事件
|
|
|
@@ -326,16 +340,25 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
loadCkplayer(){
|
|
|
+ // var videoObject = {
|
|
|
+ // container: '.video', //“#”代表容器的ID，“.”或“”代表容器的class
|
|
|
+ // variable: 'player', //播放函数名称，该属性必需设置，值等于下面的new ckplayer()的对象
|
|
|
+ // autoplay:true,
|
|
|
+ // live:true,
|
|
|
+ // overspread:true,//是否让视频铺满播放器
|
|
|
+ // plug:'flv.js',//m3u8-hls形式播放视频
|
|
|
+ // // video: 'rtmp://58.200.131.2:1935/livetv/cctv1'//视频地址
|
|
|
+ // video:'rtmp://39.104.22.45:30498/rtp/34020001001320000001_34020001001320000001'//视频地址
|
|
|
+ // // video:'http://39.104.22.45:8089/rtp/34020001001320000001_34020001001320000001/hls.m3u8'
|
|
|
+ // };
|
|
|
var videoObject = {
|
|
|
- container: '.video', //“#”代表容器的ID，“.”或“”代表容器的class
|
|
|
+ container: '.video', //容器的ID或className
|
|
|
variable: 'player', //播放函数名称，该属性必需设置，值等于下面的new ckplayer()的对象
|
|
|
autoplay:true,
|
|
|
live:true,
|
|
|
- overspread:true,//是否让视频铺满播放器
|
|
|
- html5m3u8:true,//m3u8-hls形式播放视频
|
|
|
- // video: 'rtmp://58.200.131.2:1935/livetv/cctv1'//视频地址
|
|
|
- video:'http://39.104.22.45:8089/rtp/34020001001320000001_34020001001320000001/hls.m3u8'//视频地址
|
|
|
- };
|
|
|
+ plug:'flv.js',//设置使用hls插件
|
|
|
+ video:'rtmp://39.104.22.45:30498/rtp/34020001001320000001_34020001001320000001'
|
|
|
+ };
|
|
|
window.player = new ckplayer(videoObject);
|
|
|
},
|
|
|
getResource(){
|
|
|
@@ -823,4 +846,19 @@ export default {
|
|
|
height:3rem;
|
|
|
vertical-align: middle;
|
|
|
}
|
|
|
+
|
|
|
+img{
|
|
|
+ width:10rem;
|
|
|
+ height:10rem
|
|
|
+}
|
|
|
+
|
|
|
+.popover-body{
|
|
|
+ width:100px;
|
|
|
+ height:100px;
|
|
|
+}
|
|
|
+
|
|
|
+.imgClass{
|
|
|
+ width:10rem;
|
|
|
+ height:10rem
|
|
|
+}
|
|
|
</style>
|
