|
|
@@ -348,17 +348,17 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <div class="shipDiv" style="top:100rem;left:174rem" v-show="showvideos" >
|
|
|
+ <div class="shipDiv" style="top:100rem;left:174rem" v-show="showvideos">
|
|
|
<div class="shipTitle">
|
|
|
<span style="float:left">{{ pointDevice.name }}</span>
|
|
|
<i class="el-icon-close" style="font-size:9rem;margin-top:2rem;float:right" @click="closevideo"></i>
|
|
|
</div>
|
|
|
<div style="padding—left:10rem" class="shipContent">
|
|
|
<vue-aliplayer-v2
|
|
|
- :source="source"
|
|
|
- ref="VueAliplayerV2"
|
|
|
- :options="options"
|
|
|
- />
|
|
|
+ :source="source"
|
|
|
+ ref="VueAliplayerV2"
|
|
|
+ :options="options"
|
|
|
+ />
|
|
|
</div>
|
|
|
|
|
|
|
|
|
@@ -407,7 +407,7 @@ export default {
|
|
|
shipName: '',
|
|
|
deviceShow: false,
|
|
|
deviceData: '',
|
|
|
- showvideos:false,
|
|
|
+ showvideos: false,
|
|
|
checkList: [],
|
|
|
drawLayer: null,
|
|
|
draw: null,
|
|
|
@@ -419,13 +419,13 @@ export default {
|
|
|
posints: {},
|
|
|
|
|
|
options: {
|
|
|
- preload:true,
|
|
|
- autoplay:true,
|
|
|
- rePlay:true,
|
|
|
- isLive: true, //切换为直播流的时候必填
|
|
|
- format: 'm3u8', //切换为直播流的时候必填
|
|
|
- },
|
|
|
- source: "http://1252093142.vod2.myqcloud.com/4704461fvodcq1252093142/48c8a9475285890781000441992/playlist.m3u8",
|
|
|
+ preload: true,
|
|
|
+ autoplay: true,
|
|
|
+ rePlay: true,
|
|
|
+ isLive: true, //切换为直播流的时候必填
|
|
|
+ format: 'm3u8', //切换为直播流的时候必填
|
|
|
+ },
|
|
|
+ source: "",
|
|
|
pointDevice: {
|
|
|
name: '',
|
|
|
list: [],
|
|
|
@@ -442,7 +442,7 @@ export default {
|
|
|
},
|
|
|
props: ['deviceList'],
|
|
|
components: {
|
|
|
- VueAliplayerV2
|
|
|
+ VueAliplayerV2
|
|
|
},
|
|
|
mounted() {
|
|
|
that = this;
|
|
|
@@ -480,12 +480,12 @@ export default {
|
|
|
that.deviceTableShow = false
|
|
|
that.deviceData = tadata.data;
|
|
|
that.d_activeName = 'd_first';
|
|
|
- if(tadata.data.source=="heiyan_ship_recognition"){
|
|
|
+ if (tadata.data.source == "heiyan_ship_recognition") {
|
|
|
that.source = tadata.data.liveStreamUrl;
|
|
|
- setTimeout(function(){
|
|
|
- that.$refs.VueAliplayerV2.play();
|
|
|
- },1000)
|
|
|
- that.showvideos = true;
|
|
|
+ setTimeout(function () {
|
|
|
+ that.$refs.VueAliplayerV2.play();
|
|
|
+ }, 1000)
|
|
|
+ that.showvideos = true;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -512,7 +512,7 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
//[[1111,1111]]
|
|
|
- closevideo(){
|
|
|
+ closevideo() {
|
|
|
this.showvideos = false;
|
|
|
this.$refs.VueAliplayerV2.pause();
|
|
|
},
|
|
|
@@ -921,20 +921,19 @@ export default {
|
|
|
zIndex: zindex
|
|
|
});
|
|
|
var last1 = this.posints["ship_" + data["mmsi"]];
|
|
|
- if(last1!=undefined && last1!=null){
|
|
|
- last1.setSource(new SourceVec({
|
|
|
- features: [tamarker] //这里放的就是之前的那个点，如果要放置多个点直接push到这里面就行了
|
|
|
- }));
|
|
|
- }else{
|
|
|
+ if (last1 != undefined && last1 != null) {
|
|
|
+ last1.setSource(new SourceVec({
|
|
|
+ features: [tamarker] //这里放的就是之前的那个点，如果要放置多个点直接push到这里面就行了
|
|
|
+ }));
|
|
|
+ } else {
|
|
|
if (data["mmsi"] != undefined) {
|
|
|
- this.posints["ship_" + data["mmsi"]] = markerta;
|
|
|
+ this.posints["ship_" + data["mmsi"]] = markerta;
|
|
|
}
|
|
|
this.map.addLayer(markerta); //这里是执行，执行之后点就出来了
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
if (lnglats != null) {
|
|
|
var that = this;
|
|
|
var indexp = 0;
|
