diff --git a/src/api/wirelessintrusion/wirelessintrusion.js b/src/api/wirelessintrusion/wirelessintrusion.js index 19e5e73..319c878 100644 --- a/src/api/wirelessintrusion/wirelessintrusion.js +++ b/src/api/wirelessintrusion/wirelessintrusion.js @@ -70,7 +70,12 @@ export const cornJobList = (params) => { }; //定时任务新增 export const cornJobSave = (data) => { - data.executeTime = data.executeTime + ":00"; + if (data.isRegular == 1) { + console.log(); + if (data.executeTime.length == 5) { + data.executeTime = data.executeTime + ":00"; + } + } return request({ url: "/api/cornJob/save", method: "post", @@ -79,7 +84,25 @@ export const cornJobSave = (data) => { }; //定时任务编辑 export const cornJobUpdate = (data) => { - data.executeTime = data.executeTime + ":00"; + if (data.isRegular == 1) { + data.executeTime = data.executeTime + ":00"; + } + return request({ + url: "/api/cornJob/update", + method: "post", + data: data, + }); +}; +//任务新增 +export const save = (data) => { + return request({ + url: "/api/cornJob/save", + method: "post", + data: data, + }); +}; +//任务编辑 +export const deviceUpdate = (data) => { return request({ url: "/api/cornJob/update", method: "post", @@ -220,3 +243,21 @@ export const getCameraCode = (params) => { params: params, }); }; + +// 进行布防 +export const setUpDecive = (data) => { + return request({ + url: "/api/appData/setup", + method: "post", + params: data, + }); +}; + +// 进行撤防 +export const closeDecive = (data) => { + return request({ + url: "/api/appData/close", + method: "post", + params: data, + }); +}; diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 61da73c..1fe7804 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -187,6 +187,7 @@ getSocketData(res) { console.log(res) this.cameraCode = [] + this.videoData = [] // this.times++; let dom = document.querySelector('#play_audio') // console.log('dom ===>',dom) diff --git a/src/views/components/h5Player/player.vue b/src/views/components/h5Player/player.vue index a0a7263..c94595a 100644 --- a/src/views/components/h5Player/player.vue +++ b/src/views/components/h5Player/player.vue @@ -348,22 +348,34 @@ export default { queryLive() { console.log("视频流查询", this.cameraList); let playUrlList = []; - this.cameraList.map((code, index) => { - // console.log('code ===>',code.tags ? JSON.parse(code.tags).cameraIndexCode : code.code) - queryLivePreview({ cameraIndexCode: code.code }).then((res) => { - console.log('res ====>',res) - if (res.data.code === 0 || res.data.code == 200) { - playUrlList.push({name:code.name ? code.name : '', code: code.tags ? JSON.parse(code.tags).cameraIndexCode : code.code, url: res.data.data }); - this.playUrlList = playUrlList; - this.realplay(index, res.data.data); - } - // else{ - // playUrlList.push({name:code.name ? code.name : '', code: code.tags ? JSON.parse(code.tags).cameraIndexCode : code.code, url: 'ws://171.16.8.60:559/openUrl/QKCBP32' }); - // this.playUrlList = playUrlList; - // this.realplay(index, 'ws://171.16.8.60:559/openUrl/QKCBP32'); - // } - }); - }); + console.log('player ====>',this.player) + this.player.JS_StopRealPlayAll().then( + () => { + console.info('停止播放成功====>,JS_StopRealPlayAll success'); + // do you want... + this.cameraList.map((code, index) => { + // console.log('code ===>',code.tags ? JSON.parse(code.tags).cameraIndexCode : code.code) + queryLivePreview({ cameraIndexCode: code.code }).then((res) => { + console.log('res ====>',res) + if (res.data.code === 0 || res.data.code == 200) { + playUrlList.push({name:code.name ? code.name : '', code: code.tags ? JSON.parse(code.tags).cameraIndexCode : code.code, url: res.data.data }); + this.playUrlList = playUrlList; + this.realplay(index, res.data.data); + } + // else{ + // playUrlList.push({name:code.name ? code.name : '', code: code.tags ? JSON.parse(code.tags).cameraIndexCode : code.code, url: 'ws://171.16.8.60:559/openUrl/QKCBP32' }); + // this.playUrlList = playUrlList; + // this.realplay(index, 'ws://171.16.8.60:559/openUrl/QKCBP32'); + // } + }); + }); + }, + (err) => { + console.info('JS_StopRealPlayAll failed'); + // do you want... + } + ); + }, /* 回放 */ diff --git a/src/views/h5Player/player.vue b/src/views/h5Player/player.vue index a555e88..7f873c0 100644 --- a/src/views/h5Player/player.vue +++ b/src/views/h5Player/player.vue @@ -80,6 +80,20 @@ >抓取BMP +
+
排序
+
+
+ 摄像头名称:{{item.name}} +
+
+ +
+
+ 排序 + +
+ @@ -146,7 +160,7 @@ export default { }, created() { // this.qrcodeData1 = this.$route.query.category - console.log('list ===============>',JSON.parse(this.$route.query.list), this.$route.query.showLeft) + // console.log('list ===============>',JSON.parse(this.$route.query.list), this.$route.query.showLeft) // console.log('list ===>',this.list) this.list = JSON.parse(this.$route.query.list); this.showLeft = this.$route.query.showLeft @@ -156,13 +170,16 @@ export default { this.list.map(item =>{ console.log('code ====>',JSON.parse(item.tags).cameraIndexCode) if(JSON.parse(item.tags).cameraCode){ - if(JSON.parse(item.tags).cameraCode.indexOf('-') != -1){ + if(JSON.parse(item.tags).cameraCode.indexOf('-') > -1){ JSON.parse(item.tags).cameraCode.split('-').map(item1=>{ this.cameraList.push({name:item.name,code:item1}) }) }else{ this.cameraList.push({name:item.name,code:item.cameraCode}) } + }else{ + this.cameraList.push({name:item.name,code:JSON.parse(item.tags).cameraIndexCode}) + } }) }else{ @@ -174,10 +191,90 @@ export default { setTimeout(() => { this.init(); this.createPlayer(); + // this.orderBy() // this.arrangeWindow(); + // let list = document.querySelector('.sub-wnd') + // let currentLi + // document.getElementsByClassName('sub-wnd').forEach((item,index) =>{ + // item.setAttribute("draggable", true); + // }) + // list.addEventListener('dragstart',(e)=>{ + // e.dataTransfer.effectAllowed = 'move' // 拖动样式改为 "move" + // currentLi = e.target + // currentLi.classList.add('moving') + // }) + // list.addEventListener('dragenter',(e)=>{ + // console.log('e===========>',e) + + // e.preventDefault() + // if(e.target === currentLi||e.target === list){ + // return + // } + // let liArray = Array.from(list.childNodes) + // let currentIndex = liArray.indexOf(currentLi) + // let targetindex = liArray.indexOf(e.target) + + // if(currentIndex{ + // e.preventDefault() + // }) + // list.addEventListener('dragend',(e)=>{ + // currentLi.classList.remove('moving') + // }) }); + }, + mounted(){ + }, methods: { + isRepeat(arr, key) { + for (let i = 0; i < arr.length; i ++) { + for (let j = i + 1; j < arr.length; j ++) { + if (arr[i][key] == arr[j][key]) { + return true; + } + } + } + return false; + }, + orderBy(){ + if(this.isRepeat(this.playUrlList,'num')){ + this.$message.error('顺序不能存在相同数') + }else{ + console.log('split ===>',this.splitNum) + this.playUrlList = this.playUrlList.sort((a,b) => a.num - b.num) + console.log(this.playUrlList) + if(this.playUrlList[this.playUrlList.length - 1].num > this.splitNum * this.splitNum){ + this.$message.error('顺序数不可大于当前窗口数') + }else{ + this.player.JS_StopRealPlayAll().then( + () => { + console.info('停止播放成功====>,JS_StopRealPlayAll success'); + // do you want... + this.playUrlList.map(item =>{ + this.realplay(parseInt(item.num) - 1,item.url) + }) + }, + (err) => { + console.info('JS_StopRealPlayAll failed'); + // do you want... + } + ); + } + + + } + + + + }, getYestDayOrNextDay() { // 获取当前日期 const today = new Date(); @@ -360,12 +457,15 @@ export default { queryLivePreview({ cameraIndexCode: code.code }).then((res) => { console.log('res ====>',res) if (res.data.code === 0 || res.data.code == 200) { - playUrlList.push({name:code.name ? code.name : '', code: code.tags ? JSON.parse(code.tags).cameraIndexCode : code.code, url: res.data.data }); + playUrlList.push({name:code.name ? code.name : '', code: code.tags ? JSON.parse(code.tags).cameraIndexCode : code.code, url: res.data.data,num:parseInt(index) + 1 }); this.playUrlList = playUrlList; this.realplay(index, res.data.data); } // else{ - // playUrlList.push({name:code.name ? code.name : '', code: code.tags ? JSON.parse(code.tags).cameraIndexCode : code.code, url: 'ws://171.16.8.60:559/openUrl/QKCBP32' }); + // playUrlList = [ + // {name:'hk02', code: "748d84750e3a4a5bbad3cd4af9ed5101", url: 'ws://171.16.8.60:559/openUrl/QKCBP32',num:1 }, + // {name:'hk01', code: "748d84750e3a4a5bbad3cd4af9ed5101", url: 'ws://171.16.8.60:559/openUrl/QKCBP31',num:2} + // ] // this.playUrlList = playUrlList; // this.realplay(index, 'ws://171.16.8.60:559/openUrl/QKCBP32'); // } diff --git a/src/views/wirelessintrusion/deployment/list.vue b/src/views/wirelessintrusion/deployment/list.vue index 2a71557..64e5934 100644 --- a/src/views/wirelessintrusion/deployment/list.vue +++ b/src/views/wirelessintrusion/deployment/list.vue @@ -1,4 +1,5 @@