Commit 6ad19ddf by 潘建波

【BUG】修改28181无法下发任务问题

1 parent cf3ae4a5
{"commit":"a03847f885ec625778c76c07f9d062f6220bb759","commitDate":"2021-7-15 14:41","buildDate":"2021-7-15 19:3","version":"2.1.0","info":"【NEW】20181手动拉取"}
\ No newline at end of file \ No newline at end of file
{"commit":"cf3ae4a5b19c6eb0b2689a9834d66b36b7bc3519","commitDate":"2021-7-16 14:21","buildDate":"2021-7-20 19:20","version":"2.1.0","info":"临时提交"}
\ No newline at end of file \ No newline at end of file
...@@ -11,8 +11,8 @@ import log from "./api/log"; ...@@ -11,8 +11,8 @@ import log from "./api/log";
import "./assets/css/public.css"; import "./assets/css/public.css";
import echarts from "echarts"; import echarts from "echarts";
import "./assets/icon/icon/iconfont.css"; import "./assets/icon/icon/iconfont.css";
import "./assets/icon/icon3/iconfont.css";
import "./assets/icon/icon4/iconfont.css"; import "./assets/icon/icon4/iconfont.css";
import "./assets/icon/icon3/iconfont.css";
import "../src/assets/js/vporto"; import "../src/assets/js/vporto";
import { buildCode } from "../src/assets/js/buildcodes"; import { buildCode } from "../src/assets/js/buildcodes";
import particles from "particles.js"; import particles from "particles.js";
......
...@@ -40,7 +40,6 @@ export default { ...@@ -40,7 +40,6 @@ export default {
// this.flv_destroy(); // this.flv_destroy();
// } // }
// } // }
debugger
if(this.player) { if(this.player) {
this.destoryVideo(this.player); this.destoryVideo(this.player);
} }
...@@ -58,12 +57,12 @@ export default { ...@@ -58,12 +57,12 @@ export default {
}); });
this.player.attachMediaElement(playerel); this.player.attachMediaElement(playerel);
this.player.load(); this.player.load();
this.player.play(); setTimeout(() => {
this.player.play();
}, 500);
this.player.on(flvjs.Events.ERROR, (errType, errDetail) => { this.player.on(flvjs.Events.ERROR, (errType, errDetail) => {
// alert("网络波动,正在尝试连接中..."); // alert("网络波动,正在尝试连接中...");
console.log("==============",errType)
debugger
if (this.player) { if (this.player) {
this.reloadVideo(this.player); this.reloadVideo(this.player);
} }
...@@ -95,11 +94,13 @@ export default { ...@@ -95,11 +94,13 @@ export default {
this.startFunc(this.cururl); this.startFunc(this.cururl);
}, },
destoryVideo(flvPlayer) { destoryVideo(flvPlayer) {
flvPlayer.pause(); flvPlayer.pause();
flvPlayer.unload(); flvPlayer.unload();
flvPlayer.detachMediaElement(); flvPlayer.detachMediaElement();
flvPlayer.destroy(); flvPlayer.destroy();
flvPlayer = null; flvPlayer = null;
this.player = null;
}, },
flv_pause() { flv_pause() {
this.player.pause(); this.player.pause();
......
...@@ -165,9 +165,20 @@ export default { ...@@ -165,9 +165,20 @@ export default {
}, },
subset() { subset() {
let vrefid = this.vchan.refid || this.vchan.vchan_refid; let vrefid = this.vchan.refid || this.vchan.vchan_refid;
document try {
.getElementById("VionVideo") document
.VionPTZControl(String(vrefid), Number(18), Number(this.presetindex)); .getElementById("VionVideo")
.VionPTZControl(String(vrefid), Number(18), Number(this.presetindex));
} catch (error) {
console.log(error)
}
if(!this.presetindex || this.presetindex == null||''){
this.$message({
message: "预置位编号不能为空",
type: "warning"
});
return
}
this.$emit("subpostion", this.presetindex); this.$emit("subpostion", this.presetindex);
}, },
deleteytconfig() { deleteytconfig() {
......
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
is_dome: false, is_dome: false,
subtask_name: vchan.name, subtask_name: vchan.name,
vchan: { vchan: {
vchan_refid: vchan.refid || vchan.vchan_refid, vchan_refid: vchan.refid || vchan.vchan_refid || vchan.DeviceID,
vchan_duid: vchan.duid || vchan.vchan_duid, vchan_duid: vchan.duid || vchan.vchan_duid,
vdev_unid: this.dev_unid, vdev_unid: this.dev_unid,
vchan_name: vchan.name vchan_name: vchan.name
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!