diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 9c7ab8ef..21223ce1 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -237,6 +237,8 @@ export default {
that.initData();
}, 1000)
+ }else{
+ that.$message.error(res.data.msg);
}
}).catch(function (e) {
that.isLoging = false;
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 921e4136..43a929c5 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -33,10 +33,100 @@
资源地址：
-
-
-
+
+
+
+ 更多地址
+
+
+
+ FLV:
+ {{ streamInfo.flv }}
+
+
+ FLV(https):
+ {{ streamInfo.https_flv }}
+
+
+ FLV(ws):
+ {{ streamInfo.ws_flv }}
+
+
+ FLV(wss):
+ {{ streamInfo.wss_flv }}
+
+
+ FMP4:
+ {{ streamInfo.fmp4 }}
+
+
+ FMP4(https):
+ {{ streamInfo.https_fmp4 }}
+
+
+ FMP4(ws):
+ {{ streamInfo.ws_fmp4 }}
+
+
+ FMP4(wss):
+ {{ streamInfo.wss_fmp4 }}
+
+
+ HLS:
+ {{ streamInfo.hls }}
+
+
+ HLS(https):
+ {{ streamInfo.https_hls }}
+
+
+ HLS(ws):
+ {{ streamInfo.ws_hls }}
+
+
+ HLS(wss):
+ {{ streamInfo.wss_hls }}
+
+
+ TS:
+ {{ streamInfo.ts }}
+
+
+ TS(https):
+ {{ streamInfo.https_ts }}
+
+
+ TS(ws):
+ {{ streamInfo.ws_ts }}
+
+
+ TS(wss):
+ {{ streamInfo.wss_ts }}
+
+
+ RTC:
+ {{ streamInfo.rtc }}
+
+
+ RTMP:
+ {{ streamInfo.rtmp }}
+
+
+ RTMPS:
+ {{ streamInfo.rtmps }}
+
+
+ RTSP:
+ {{ streamInfo.rtsp }}
+
+
+ RTSPS:
+ {{ streamInfo.rtsps }}
+
+
+
+
@@ -117,27 +207,27 @@
- 预置位编号
+ 预置位编号
设置
调用
删除
- 巡航速度
+ 巡航速度
设置
- 停留时间
+ 停留时间
设置
- 巡航组编号
+ 巡航组编号
添加点
删除点
删除组
巡航
- 扫描速度
+ 扫描速度
设置
- 扫描组编号
+ 扫描组编号
左边界
右边界
@@ -174,6 +264,7 @@
+
@@ -244,6 +335,7 @@ export default {
seekTime: 0,
recordStartTime: 0,
showTimeText: "00:00:00",
+ streamInfo: null,
};
},
methods: {
@@ -306,6 +398,7 @@ export default {
console.log(val)
},
play: function (streamInfo, hasAudio) {
+ this.streamInfo = streamInfo;
this.hasAudio = hasAudio;
this.isLoging = false;
// this.videoUrl = streamInfo.rtc;
@@ -646,6 +739,14 @@ export default {
console.log(resultArray)
return resultArray;
},
+ copyUrl: function (dropdownItem){
+ console.log(dropdownItem)
+ this.$copyText(dropdownItem).then((e)=> {
+ this.$message.success("成功拷贝到粘贴板");
+ }, (e)=> {
+
+ })
+ },
gbPlay(){
console.log('前端控制：播放');
this.$axios({
@@ -686,7 +787,8 @@ export default {
this.$refs.videoPlayer.play(this.videoUrl)
}, 600)
});
- }
+ },
+
}
};