From d69889cbc10d2b71149b257ddeb8328b0ea211f4 Mon Sep 17 00:00:00 2001 From: xujingliang <3225043@qq.com> Date: Thu, 5 Dec 2024 15:57:52 +0800 Subject: [PATCH] merge --- .env.dev | 2 +- src/views/bigScreen/Monitor/index.vue | 202 +++++++++++++++++- .../bigScreen/ResponseResource/index.vue | 140 +++++++++++- src/views/bigScreen/index.vue | 2 +- src/views/responseresources/index.vue | 58 +++-- .../responseresources/widget/AddForm.vue | 37 ++-- 6 files changed, 394 insertions(+), 47 deletions(-) diff --git a/.env.dev b/.env.dev index 8363446..475a827 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ NODE_ENV = development # 正式服务器 -VUE_APP_BASE_API = http://221.2.83.254:9001/api +VUE_APP_BASE_API = http://221.2.83.254:9013/api VUE_APP_BASE_IMG_URL = http://221.2.83.254:9001 VUE_APP_WEBSOCKET_URL = ws://221.2.83.254:9002/ws VUE_APP_GEOSERVER_URL = http://221.2.83.254:9007/ diff --git a/src/views/bigScreen/Monitor/index.vue b/src/views/bigScreen/Monitor/index.vue index b584a5d..5d2090c 100644 --- a/src/views/bigScreen/Monitor/index.vue +++ b/src/views/bigScreen/Monitor/index.vue @@ -26,7 +26,7 @@
市应急局监控设备
-
+
共{{monitorInfo.total}}路
@@ -36,6 +36,19 @@
摄像头
+ +
+
+
+ {{item.jkdmckjg}} +
+
+
+ 取消 + 播放 +
+
+
-
DJ大疆巡航费县马庄镇....
-
+
无人机视频巡航
+
共{{list.length}}架
@@ -72,6 +85,15 @@
摄像头
+
+
+ {{item.model}} +
+
+ 取消 + 播放 +
+
@@ -79,6 +101,7 @@ :id="'player-container-'+item.account" width="186px" height="139px" + style="overflow:hidden;" autoplay preload="auto" playsinline @@ -103,7 +126,7 @@ export default { data() { return { - monitorSelect: '无人机', + monitorSelect: '视频监控', monitorSubSelect: '无人机巡航', // 视频监控 @@ -115,13 +138,22 @@ export default { aspect:"16:9", fluent:true }, + monitorInfoList:[], playArrays:[], - // 无人机 - list: [], + list: [ + // {"account":"17861857726","createtime":"2023-03-23 15:44:38","height":0.5,"ip":"192.168.10.102","lat":34.999999,"lng":117.878787,"model":"Mavic Air 3"}, + // {"account":"17861857729","createtime":"2023-03-23 15:44:38","height":0.5,"ip":"192.168.10.105","lat":34.73333,"lng":118.1,"model":"Mavic Air 4"}, + // {"account":"17861857725","createtime":"2023-03-23 15:44:38","height":0.5,"ip":"192.168.10.106","lat":34.63333,"lng":118.2,"model":"Mavic Air 5"}, + // {"account":"17861857724","createtime":"2023-03-23 15:44:38","height":0.5,"ip":"192.168.10.107","lat":34.53333,"lng":118.3,"model":"Mavic Air 6"}, + // {"account":"17861857723","createtime":"2023-03-23 15:44:38","height":0.5,"ip":"192.168.10.108","lat":34.83333,"lng":118.4,"model":"Mavic Air 7"} + ], + player: null, uavGraphicLayer: null, uavRandom:100, + monitorListVisible:false, + uavListVisible:false, } }, mounted(){ @@ -132,6 +164,35 @@ export default { }, methods:{ // 视频监控的 + playMonitor(info,index){ + + this.$set( + this.monitorInfoList, + index, + { ...this.monitorInfoList[index], + checked: info.checked + }); + + if(info.checked){ + let obj = this.playArrays.find((item,index)=>{ + return item == "http://221.2.83.254:7012/live/"+info.jkdgbidzlkjg+".m3u8"; + }) + + if(obj){ + return null; + }else{ + this.playArrays.push("http://221.2.83.254:7012/live/"+info.jkdgbidzlkjg+".m3u8"); + } + }else{ + this.playArrays.forEach((item,index)=>{ + if(item == "http://221.2.83.254:7012/live/"+info.jkdgbidzlkjg+".m3u8"){ + this.playArrays.splice(index,1); + } + }) + } + + console.log("playArrays",this.playArrays); + }, handlerGetMonitorList(){ let listQuery = { county:"", @@ -140,10 +201,33 @@ export default { } getMethodCommon("/YingJiJu/LoadCameraInfo",listQuery).then(res=>{ if(res.code == 200){ - this.monitorInfo.list = res.data; + this.monitorInfoList = res.data; this.monitorInfo.total = res.count - this.monitorInfo.list.forEach((item,index)=>{ + /* + 37130100181328000001 + 37130100181328000620 + 37130100181328000558 + */ + + this.monitorInfoList.forEach((item,index)=>{ + if(item.jkdgbidzlkjg == "37130100181328000558" || item.jkdgbidzlkjg == "37130100181328000001"){ + let target = this.monitorInfoList[index]; + + this.monitorInfoList.splice(index,1); + + this.monitorInfoList.unshift(target); + + } + }) + + // this.monitorInfoList.sort((item,index)=>{ + + // }) + + this.monitorInfoList.forEach((item,index)=>{ + this.monitorInfoList[index].checked = false; if(index<4){ + this.monitorInfoList[index].checked = true; this.playArrays.push("http://221.2.83.254:7012/live/"+item.jkdgbidzlkjg+".m3u8") } }) @@ -152,6 +236,34 @@ export default { }, // 无人机监测 + playUavVideo(info,index){ + + this.$set( + this.list, + index, + { ...this.list[index], + checked: info.checked + }); + + if(info.checked){ + + let obj = this.list.find((item,index)=>{ + return item.account == info.account; + }) + + if(obj){ + return null; + }else{ + + } + }else{ + this.list.forEach((item,index)=>{ + + }) + } + + console.log("playArrays",this.playArrays); + }, getSocketData(evt) { let _this = this; if (isJson(evt.detail.data)){ @@ -330,6 +442,45 @@ export default { font-size: 13px; line-height: 13px; margin-bottom: 13px; + position:relative; + .list-select-container{ + width:100%; + height:296px; + background:#3b6f6ef7; + position:absolute; + top:40px; + left:0px; + border: 1px solid #2daaa9; + z-index:9999; + .play-operation-cointainer{ + width:100%; + padding:10px 0px; + position:absolute; + bottom:0px; + left:0px; + text-align: right; + padding-right:20px; + } + .list-box{ + width:100%; + height: calc( 100% - 48px); + overflow: auto; + .select-item{ + width:100%; + padding:0px 15px; + color:#fff; + line-height:34px; + font-size:14px; + &:nth-child(2n){ + background:#014a4d4a; + } + } + &::-webkit-scrollbar{ + display: none; + } + } + + } .UAV-title{ width: 152px; height: 13px; @@ -368,6 +519,11 @@ export default { .camera-content{ display: flex; flex-wrap: wrap; + overflow-y: auto; + max-height: 306px; + &::-webkit-scrollbar{ + display:none; + } .camera-item{ width: 190px; height: 143px; @@ -380,4 +536,32 @@ export default { } } } + +::v-deep .el-checkbox__inner{ + border-color:none!important; + background-color:none!important; +} + +::v-deep .el-button--mini { + font-size: 12px; + color: #fff; + border-radius: 0px; + background: #169fa359; + border-color: #2daaa9; + cursor:pointer; +} + +::v-deep .el-checkbox__label{ + color:#fff; +} + +::v-deep .is-checked .el-checkbox__label { + color:#fff; +} + +::v-deep .is-checked .el-checkbox__inner{ + background:#007C7F; + border-color:#007C7F; + +} diff --git a/src/views/bigScreen/ResponseResource/index.vue b/src/views/bigScreen/ResponseResource/index.vue index 6ed6046..fec0200 100644 --- a/src/views/bigScreen/ResponseResource/index.vue +++ b/src/views/bigScreen/ResponseResource/index.vue @@ -9,7 +9,7 @@ >
{{item.name}}
- {{item.id}} + {{item.count}}
@@ -17,6 +17,7 @@ diff --git a/src/views/responseresources/widget/AddForm.vue b/src/views/responseresources/widget/AddForm.vue index 5ecfafe..39f6631 100644 --- a/src/views/responseresources/widget/AddForm.vue +++ b/src/views/responseresources/widget/AddForm.vue @@ -124,9 +124,11 @@ import axios from 'axios'; }, methods: { handleCheckChange(node, checked, indeterminate) { - + let selectedNodes = this.$refs.menuTree.getCheckedNodes(); - this.checkList = this.$refs.menuTree.getCheckedNodes(); + this.checkList = selectedNodes.map(node => node.id); + + console.log("checkList",this.checkList); }, getApplicationInfo() { axios.get("http://221.2.83.254:9006/applicationMars/getApplicationInfo/feixian").then(res => { @@ -182,25 +184,20 @@ import axios from 'axios'; }, submitForm() { var _this = this - this.$refs['form'].validate((valid) => { - if (valid) { - // 添加 - postMethodCommon("/FireCodePC/AddOrUpdateUserUnit", _this.addForm).then(response => { - if (response.code == 200) { - // 上传shp - this.$emit("addSuccess"); - this.$message({ - type: "success", - message: "添加成功" - }) - } - }) - } else { - console.log('error submit!!'); - return false; - } - }); + if(this.checkList.length>0){ + postMethodCommon("/FireCodePC/addLayers?ids="+_this.checkList[0], ).then(response => { + if (response.code == 200) { + // 上传shp + this.$emit("addSuccess"); + this.$message({ + type: "success", + message: "添加成功" + }) + } + }) + } + }, createForm() { var _this = this