Compare commits

..

No commits in common. "bb2799282c9a6d9af7b4762179a7c8bcce9584c2" and "d0dc1f2085b0b2a937cda3a5982e5c2ccf6e0fc2" have entirely different histories.

4 changed files with 823 additions and 1121 deletions

View File

@ -2,7 +2,7 @@ import request from '@/utils/request'
const listView=(deptId,projectId)=> { const listView=(deptId,projectId)=> {
return request({ return request({
url: `/bgscreen/aiBoxVideo/listView?deptId=${deptId||0}&projectId=${projectId||0}&pageSize=20&pageNum=1`, url: `/bgscreen/aiBoxVideo/listView?deptId=${deptId||0}&projectId=${projectId||0}`,
method: 'get' method: 'get'
}) })
} }

View File

@ -242,7 +242,7 @@ export default {
fontSize: "12px", fontSize: "12px",
height: "32px", height: "32px",
}, },
warningInterval: undefined, warningInterval: "",
warningTableData: [], warningTableData: [],
// //
@ -306,19 +306,20 @@ export default {
parentVM: { vd01Flag: true, vd02Flag: true, vd03Flag: true, vd04Flag: true }, parentVM: { vd01Flag: true, vd02Flag: true, vd03Flag: true, vd04Flag: true },
}; };
}, },
beforeDestroy() { beforeDestroy(){
console.log("-----beforeDestroy------>"); console.log("-----beforeDestroy------>")
this.players.forEach((p) => { this.players.forEach(p=>{
if (p) { if(p){
try { try{
p.stop(); p.stop();
} catch (e) {} }catch(e){
} }
}); }
clearInterval(this.warningInterval); })
}, },
mounted() { mounted() {
window.xapp = this; window.xapp=this;
this.$bus.$on( this.$bus.$on(
"projectChange", "projectChange",
debounce((res) => { debounce((res) => {
@ -958,6 +959,7 @@ export default {
onMonitoringVideo(n) { onMonitoringVideo(n) {
this.mvNav = n; this.mvNav = n;
}, },
// --------- // ---------
warningScroll() { warningScroll() {
let maxHeight = this.$refs.warning.$el.querySelectorAll(".el-table__body")[0] let maxHeight = this.$refs.warning.$el.querySelectorAll(".el-table__body")[0]
@ -1529,9 +1531,9 @@ export default {
}); });
}, },
// //
// beforeDestroy() { beforeDestroy() {
clearInterval(this.warningInterval);
// }, },
handlePlay(it, idx) { handlePlay(it, idx) {
this.videoReturnData = it; this.videoReturnData = it;
this.currentIndex = idx; this.currentIndex = idx;
@ -1553,37 +1555,39 @@ export default {
// //
initVideo(videoDvrNumber, url) { initVideo(videoDvrNumber, url) {
let that = this; let that = this;
that.players.forEach((p) => { that.players.forEach(p=>{
if (p) { if(p){
try { try{
p.stop(); p.stop();
} catch (e) {} }catch(e){
} }
}); }
})
that.players = []; that.players = [];
that.parentVM.vd01Flag = false; that.parentVM.vd01Flag=false;
that.parentVM.vd02Flag = false; that.parentVM.vd02Flag=false;
that.parentVM.vd03Flag = false; that.parentVM.vd03Flag=false;
that.parentVM.vd04Flag = false; that.parentVM.vd04Flag=false;
this.$api.video.getVideoPassage(videoDvrNumber).then((response) => { this.$api.video.getVideoPassage(videoDvrNumber).then((response) => {
let data = response.data; let data = response.data;
this.videoPassageList = data; this.videoPassageList = data;
that.showVideo = true; that.showVideo = true;
that.parentVM.vd01Flag = true; that.parentVM.vd01Flag=true;
that.parentVM.vd02Flag = true; that.parentVM.vd02Flag=true;
that.parentVM.vd03Flag = true; that.parentVM.vd03Flag=true;
that.parentVM.vd04Flag = true; that.parentVM.vd04Flag=true;
setTimeout(() => { setTimeout(()=>{
data.forEach((it, idx) => { data.forEach((it, idx) => {
let player = new WasmPlayer(null, "vd0" + (idx + 1), null, { let player = new WasmPlayer(null, "vd0" + (idx+1), null, {
Height: true, Height: true,
}); });
that.players.push(player); that.players.push(player);
if (idx == 0) { if (idx == 0) {
//that.url0 = url.replace("{{passage}}", it.passageValue); //that.url0 = url.replace("{{passage}}", it.passageValue);
that.url0 = that.url0 =
"https://szgc.jhncidg.com/video/live/cameraid/" + "http://111.21.209.230:7086/live/cameraid/" +
videoDvrNumber + videoDvrNumber +
"$" + "$" +
it.passageValue + it.passageValue +
@ -1593,7 +1597,7 @@ export default {
if (idx == 1) { if (idx == 1) {
//that.url1 = url.replace("{{passage}}", it.passageValue); //that.url1 = url.replace("{{passage}}", it.passageValue);
that.url1 = that.url1 =
"https://szgc.jhncidg.com/video/live/cameraid/" + "http://111.21.209.230:7086/live/cameraid/" +
videoDvrNumber + videoDvrNumber +
"$" + "$" +
it.passageValue + it.passageValue +
@ -1603,7 +1607,7 @@ export default {
if (idx == 2) { if (idx == 2) {
//that.url2 = url.replace("{{passage}}", it.passageValue); //that.url2 = url.replace("{{passage}}", it.passageValue);
that.url2 = that.url2 =
"https://szgc.jhncidg.com/video/live/cameraid/" + "http://111.21.209.230:7086/live/cameraid/" +
videoDvrNumber + videoDvrNumber +
"$" + "$" +
it.passageValue + it.passageValue +
@ -1613,7 +1617,7 @@ export default {
if (idx == 3) { if (idx == 3) {
//that.url3 = url.replace("{{passage}}", it.passageValue); //that.url3 = url.replace("{{passage}}", it.passageValue);
that.url3 = that.url3 =
"https://szgc.jhncidg.com/video/live/cameraid/" + "http://111.21.209.230:7086/live/cameraid/" +
videoDvrNumber + videoDvrNumber +
"$" + "$" +
it.passageValue + it.passageValue +
@ -1621,7 +1625,7 @@ export default {
that.players[3].play(that.url3, 1); that.players[3].play(that.url3, 1);
} }
}); });
}, 400); },400);
}); });
}, },
handleOnError0(error) { handleOnError0(error) {

File diff suppressed because it is too large Load Diff

View File

@ -8,13 +8,13 @@ module.exports = defineConfig({
port: 3000, port: 3000,
open: true, open: true,
proxy: { proxy: {
// '/jhapi/profile':{ '/jhapi/profile':{
// target: `http://62.234.3.186/jhapi/profile/`, target: `http://62.234.3.186/jhapi/profile/`,
// changeOrigin: true, changeOrigin: true,
// pathRewrite: { pathRewrite: {
// '^/jhapi/profile':'/' '^/jhapi/profile':'/'
// } }
// }, },
'/jhapp':{ '/jhapp':{
target: `http://62.234.3.186/`, target: `http://62.234.3.186/`,
changeOrigin: true, changeOrigin: true,
@ -46,7 +46,7 @@ module.exports = defineConfig({
} }
}, },
'/profile':{ '/profile':{
target: `http://szgc.jhncidg.com/jhapi/profile`, target: `http://62.234.3.186/profile/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/profile':'/' '^/profile':'/'