diff --git a/src/views/realTimeMonitor/components/setAppDialog.vue b/src/views/realTimeMonitor/components/setAppDialog.vue index 1a88394..780fce8 100644 --- a/src/views/realTimeMonitor/components/setAppDialog.vue +++ b/src/views/realTimeMonitor/components/setAppDialog.vue @@ -509,31 +509,52 @@ export default { console.log(res.data); console.log(JSON.parse(res.data.data)); const resultData = JSON.parse(res.data.data); - const resultContent = JSON.parse( - decodeURIComponent(escape(window.atob(resultData.content))) - ); - console.log(resultContent); + if (resultData.hasOwnProperty("content")) { + const resultContent = JSON.parse( + decodeURIComponent(escape(window.atob(resultData.content))) + ); + console.log(resultContent); - this.appForm.channels = resultContent.channels; //装置通道数,程序默认值为4 - this.appForm.packetSize = resultContent.packetSize; //图像数据分包大小 - this.appForm.timeForKeepingLogs = - resultContent.timeForKeepingLogs / 86400; //效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400 - this.appForm.timeForKeepingPhotos = - resultContent.timeForKeepingPhotos / 86400; //有效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400 - this.appForm.imgQuality = resultContent.imgQuality; //图像质量 - this.appForm.heartbeat = resultContent.heartbeat; //心跳周期 - this.appForm.upgradePacketBase = resultContent.upgradePacketBase; //升级报文中，子包起始号 一般可设置的值是 0或者1 - this.appForm.protocol = resultContent.protocol; // 规约（湖南、浙江 ...） 修改后需重启 - this.appForm.networkProtocol = resultContent.networkProtocol; // 网络协议 0: tcp 1 udp 修改后需重启 - // this.appForm.network = resultContent.network; // 使用的网络， 暂时不做配置 - this.appForm.CMDID = resultContent.CMDID; // 装置编号 修改后需重启 - this.appForm.server = resultContent.server; // CMA 服务器ip 修改后需重启 - this.appForm.port = resultContent.port; // CMA服务器端口 1025-65535 修改后需重启 - this.appForm.model = resultContent.model; // 装置型号 - this.appForm.equipName = resultContent.equipName; // 装置名称 - this.appForm.bsManufacturer = resultContent.bsManufacturer; // 生产厂家 - this.appForm.productionDate = resultContent.productionDate * 1000; // 生产日期 - this.appForm.workStatusTimes = resultContent.workStatusTimes; // 生产日期 + this.appForm.channels = resultContent.channels; //装置通道数,程序默认值为4 + this.appForm.packetSize = resultContent.packetSize; //图像数据分包大小 + this.appForm.timeForKeepingLogs = + resultContent.timeForKeepingLogs / 86400; //效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400 + this.appForm.timeForKeepingPhotos = + resultContent.timeForKeepingPhotos / 86400; //有效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400 + this.appForm.imgQuality = resultContent.imgQuality; //图像质量 + this.appForm.heartbeat = resultContent.heartbeat; //心跳周期 + this.appForm.upgradePacketBase = resultContent.upgradePacketBase; //升级报文中，子包起始号 一般可设置的值是 0或者1 + this.appForm.protocol = resultContent.protocol; // 规约（湖南、浙江 ...） 修改后需重启 + this.appForm.networkProtocol = resultContent.networkProtocol; // 网络协议 0: tcp 1 udp 修改后需重启 + // this.appForm.network = resultContent.network; // 使用的网络， 暂时不做配置 + this.appForm.CMDID = resultContent.CMDID; // 装置编号 修改后需重启 + this.appForm.server = resultContent.server; // CMA 服务器ip 修改后需重启 + this.appForm.port = resultContent.port; // CMA服务器端口 1025-65535 修改后需重启 + this.appForm.model = resultContent.model; // 装置型号 + this.appForm.equipName = resultContent.equipName; // 装置名称 + this.appForm.bsManufacturer = resultContent.bsManufacturer; // 生产厂家 + this.appForm.productionDate = resultContent.productionDate * 1000; // 生产日期 + this.appForm.workStatusTimes = resultContent.workStatusTimes; // 生产日期 + } else { + this.appForm.channels = 4; //装置通道数,程序默认值为4 + this.appForm.packetSize = 2048; //图像数据分包大小 + this.appForm.timeForKeepingLogs = 15; //效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400 + this.appForm.timeForKeepingPhotos = 15; //有效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400 + this.appForm.imgQuality = ""; //图像质量 + this.appForm.heartbeat = 10; //心跳周期 + this.appForm.upgradePacketBase = 0; //升级报文中，子包起始号 一般可设置的值是 0或者1 + this.appForm.protocol = this.areaData.protocol; // 规约（湖南、浙江 ...） 修改后需重启 + this.appForm.networkProtocol = 0; // 网络协议 0: tcp 1 udp 修改后需重启 + // this.appForm.network = resultContent.network; // 使用的网络， 暂时不做配置 + this.appForm.CMDID = this.areaData.cmdid; // 装置编号 修改后需重启 + this.appForm.server = ""; // CMA 服务器ip 修改后需重启 + this.appForm.port = ""; // CMA服务器端口 1025-65535 修改后需重启 + this.appForm.model = ""; // 装置型号 + this.appForm.equipName = ""; // 装置名称 + this.appForm.bsManufacturer = ""; // 生产厂家 + this.appForm.productionDate = ""; // 生产日期 + this.appForm.productionDate = 3; // 工作状态报周期 + } this.$message({ duration: 1500, diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue index 64e4ec8..f0c1fc3 100644 --- a/src/views/realTimeMonitor/components/setChannelDialog.vue +++ b/src/views/realTimeMonitor/components/setChannelDialog.vue @@ -37,7 +37,7 @@ > @@ -99,33 +99,30 @@ - -
- - - - - + + + + (毫秒) @@ -134,7 +131,7 @@
- +
@@ -146,7 +143,7 @@ > - - +
- - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + +
- 取 消 @@ -210,13 +219,12 @@ type="primary" :disabled="channelsetLoading" @click="handleConfim(false)" - >确 定 + 保存并关闭 @@ -253,10 +261,10 @@ export default { usbchecked: "", zzdjchecked: 1, zdbgchecked: 1, - gmkzchecked:0, + gmkzchecked: 0, bgsj: "", iso: "", - modelVal:"", + modelVal: "", hdrchecked: "", ywchecked: "", roteval: "", @@ -267,98 +275,98 @@ export default { rbosd: "", }, bgflag: false, - modelOptions:[ - { - "name": "DISABLED", - "id": 0, - "chName": "无场景" - }, - { - "name": "FACE_PRIORITY", - "id": 1, - "chName": "面部优先" - }, - { - "name": "ACTION", - "id": 2, - "chName": "动作" - }, - { - "name": "PORTRAIT", - "id": 3, - "chName": "肖像" - }, - { - "name": "LANDSCAPE", - "id": 4, - "chName": "风景" - }, - { - "name": "NIGHT", - "id": 5, - "chName": "夜晚" - }, - { - "name": "NIGHT_PORTRAIT", - "id": 6, - "chName": "夜间肖像" - }, - { - "name": "THEATRE", - "id": 7, - "chName": "剧院" - }, - { - "name": "BEACH", - "id": 8, - "chName": "海滩" - }, - { - "name": "SNOW", - "id": 9, - "chName": "雪景" - }, - { - "name": "SUNSET", - "id": 10, - "chName": "日落" - }, - { - "name": "STEADYPHOTO", - "id": 11, - "chName": "稳定照片" - }, - { - "name": "FIREWORKS", - "id": 12, - "chName": "烟花" - }, - { - "name": "SPORTS", - "id": 13, - "chName": "运动" - }, - { - "name": "PARTY", - "id": 14, - "chName": "聚会" - }, - { - "name": "CANDLELIGHT", - "id": 15, - "chName": "烛光" - }, - { - "name": "BARCODE", - "id": 16, - "chName": "条形码" - }, - { - "name": "HDR", - "id": 18, - "chName": "HDR" - } -], + modelOptions: [ + { + name: "DISABLED", + id: 0, + chName: "无场景", + }, + { + name: "FACE_PRIORITY", + id: 1, + chName: "面部优先", + }, + { + name: "ACTION", + id: 2, + chName: "动作", + }, + { + name: "PORTRAIT", + id: 3, + chName: "肖像", + }, + { + name: "LANDSCAPE", + id: 4, + chName: "风景", + }, + { + name: "NIGHT", + id: 5, + chName: "夜晚", + }, + { + name: "NIGHT_PORTRAIT", + id: 6, + chName: "夜间肖像", + }, + { + name: "THEATRE", + id: 7, + chName: "剧院", + }, + { + name: "BEACH", + id: 8, + chName: "海滩", + }, + { + name: "SNOW", + id: 9, + chName: "雪景", + }, + { + name: "SUNSET", + id: 10, + chName: "日落", + }, + { + name: "STEADYPHOTO", + id: 11, + chName: "稳定照片", + }, + { + name: "FIREWORKS", + id: 12, + chName: "烟花", + }, + { + name: "SPORTS", + id: 13, + chName: "运动", + }, + { + name: "PARTY", + id: 14, + chName: "聚会", + }, + { + name: "CANDLELIGHT", + id: 15, + chName: "烛光", + }, + { + name: "BARCODE", + id: 16, + chName: "条形码", + }, + { + name: "HDR", + id: 18, + chName: "HDR", + }, + ], roteOptions: [ { value: 0, @@ -436,24 +444,16 @@ export default { label: "1920X1080", }, ], - compensationOptions:[{ name:-4, - value:-4}, - { name:-3, - value:-3}, - { name:-2, - value:-2}, - { name:-1, - value:-1}, - { name:0, - value:0}, - { name:1, - value:1}, - { name:2, - value:2}, - { name:3, - value:3}, - { name:4, - value:4}, + compensationOptions: [ + { name: -4, value: -4 }, + { name: -3, value: -3 }, + { name: -2, value: -2 }, + { name: -1, value: -1 }, + { name: 0, value: 0 }, + { name: 1, value: 1 }, + { name: 2, value: 2 }, + { name: 3, value: 3 }, + { name: 4, value: 4 }, ], requestid: "", searchNum: 0, @@ -480,11 +480,16 @@ export default { getChannelListJoggle({ termid: this.areaData.id }) .then((res) => { this.channelList = res.data.list; - if(Number(localStorage.getItem("channelId"))==1||Number(localStorage.getItem("channelId"))==-1||Number(localStorage.getItem("channelId"))==0){ + if ( + Number(localStorage.getItem("channelId")) == 1 || + Number(localStorage.getItem("channelId")) == -1 || + Number(localStorage.getItem("channelId")) == 0 + ) { this.channelForm.selectChannel = this.channelList[0].channelid; - }else{ - this.channelForm.selectChannel = Number(localStorage.getItem("channelId")); - + } else { + this.channelForm.selectChannel = Number( + localStorage.getItem("channelId") + ); } //this.channelForm.selectChannel = this.channelList[0].channelid; console.log(this.channelList); @@ -546,9 +551,8 @@ export default { } this.searchBtn(); }, - + handleConfim(flag) { - console.log("点击了确定"); console.log(this.channelForm); this.channelLoading = true; @@ -736,17 +740,17 @@ export default { { name: "name20", value: "zoomRatio" }, { name: "value20", value: this.channelForm.zoomVal }, { name: "type20", value: 0 }, - //compensation - { name: "name21", value: "compensation" }, + //compensation + { name: "name21", value: "compensation" }, { name: "value21", value: this.channelForm.compensationVal }, { name: "type21", value: 0 }, - //光敏控制 + //光敏控制 { name: "name22", value: "gmkz" }, { name: "value22", value: this.channelForm.gmkzchecked ? 1 : 0 }, { name: "type22", value: 0 }, ]; console.log(params); - this.setTermFn(params,flag); + this.setTermFn(params, flag); } else { this.$message({ duration: 1500, @@ -757,7 +761,7 @@ export default { } }); }, - setTermFn(val,flag) { + setTermFn(val, flag) { setTermCamera({ termId: this.areaData.id, list: val, @@ -776,7 +780,7 @@ export default { .catch((err) => {}); }, getTakechannelStatus(flag) { - console.log("aaaaaaaaaaaaaaaaaaaaaa",flag) + console.log("aaaaaaaaaaaaaaaaaaaaaa", flag); getTermCameraRequest({ requestid: this.requestid }) .then((res) => { console.log(res); @@ -784,8 +788,8 @@ export default { window.clearInterval(this.setTimer); this.setTimer = null; this.setNum = 0; - - if(flag){ + + if (flag) { this.isShow = false; } //this.isShow = false; @@ -798,7 +802,7 @@ export default { }); } else if (this.setNum > 3) { // this.isShow = false; - if(flag){ + if (flag) { this.isShow = false; } window.clearInterval(this.setTimer); @@ -888,79 +892,117 @@ export default { console.log(res.data); console.log(JSON.parse(res.data.data)); const resultData = JSON.parse(res.data.data); - const resultContent = JSON.parse( - decodeURIComponent(escape(window.atob(resultData.content))) - ); - console.log(resultContent); - this.channelForm.resolutionCX = resultContent.resolutionCX; - this.channelForm.resolutionCY = resultContent.resolutionCY; - this.channelForm.ysl = resultContent.quality; - this.channelForm.usbchecked = - resultContent.usbCamera == 1 ? true : false; - this.channelForm.zzdjchecked = - resultContent.autoFocus == 1 ? true : false; - this.channelForm.zdbgchecked = - resultContent.autoExposure == 1 ? true : false; - this.channelForm.gmkzchecked = - resultContent.gmkz == 1 ? true : false; - this.channelForm.bgsj = - resultContent.exposureTime == 0 ? "" : resultContent.exposureTime; - this.channelForm.iso = - resultContent.sensitivity == 0 ? "" : resultContent.sensitivity; + + if (resultData.hasOwnProperty("content")) { + const resultContent = JSON.parse( + decodeURIComponent(escape(window.atob(resultData.content))) + ); + console.log(resultContent); + this.channelForm.resolutionCX = resultContent.resolutionCX; + this.channelForm.resolutionCY = resultContent.resolutionCY; + this.channelForm.ysl = resultContent.quality; + this.channelForm.usbchecked = + resultContent.usbCamera == 1 ? true : false; + this.channelForm.zzdjchecked = + resultContent.autoFocus == 1 ? true : false; + this.channelForm.zdbgchecked = + resultContent.autoExposure == 1 ? true : false; + this.channelForm.gmkzchecked = + resultContent.gmkz == 1 ? true : false; + this.channelForm.bgsj = + resultContent.exposureTime == 0 + ? "" + : resultContent.exposureTime; + this.channelForm.iso = + resultContent.sensitivity == 0 ? "" : resultContent.sensitivity; this.channelForm.modelVal = resultContent.sceneMode; - // this.channelForm.hdrchecked = - // resultContent.hdrMode == 1 ? true : false; - // this.channelForm.ywchecked = - // resultContent.nightMode == 1 ? true : false; - this.channelForm.compensationVal = resultContent.compensation; - this.channelForm.aival = resultContent.recognization; - this.channelForm.roteval = resultContent.orientation; - this.channelForm.rtosd = resultContent.osd.rightTop!="null"?resultContent.osd.rightTop:""; - this.channelForm.ltosd = resultContent.osd.leftTop!="null"?resultContent.osd.leftTop:""; - this.channelForm.lbosd = resultContent.osd.leftBottom!="null"?resultContent.osd.leftBottom:""; - this.channelForm.rbosd = resultContent.osd.rightBottom!="null"?resultContent.osd.rightBottom:""; - // this.channelForm.videoSize = resultContent.; - this.channelForm.videoCX = resultContent.videoCX; - this.channelForm.videoCY = resultContent.videoCY; - if (this.channelForm.zdbgchecked) { - this.bgflag = true; + // this.channelForm.hdrchecked = + // resultContent.hdrMode == 1 ? true : false; + // this.channelForm.ywchecked = + // resultContent.nightMode == 1 ? true : false; + this.channelForm.compensationVal = resultContent.compensation; + this.channelForm.aival = resultContent.recognization; + this.channelForm.roteval = resultContent.orientation; + this.channelForm.rtosd = + resultContent.osd.rightTop != "null" + ? resultContent.osd.rightTop + : ""; + this.channelForm.ltosd = + resultContent.osd.leftTop != "null" + ? resultContent.osd.leftTop + : ""; + this.channelForm.lbosd = + resultContent.osd.leftBottom != "null" + ? resultContent.osd.leftBottom + : ""; + this.channelForm.rbosd = + resultContent.osd.rightBottom != "null" + ? resultContent.osd.rightBottom + : ""; + // this.channelForm.videoSize = resultContent.; + this.channelForm.videoCX = resultContent.videoCX; + this.channelForm.videoCY = resultContent.videoCY; + if (this.channelForm.zdbgchecked) { + this.bgflag = true; + this.channelForm.bgsj = ""; + this.channelForm.iso = ""; + } else { + this.bgflag = false; + } + if ( + this.channelForm.videoCX == 720 && + this.channelForm.videoCY == 480 + ) { + // this.channelForm.picSize = this.pictureSize[0].value; + this.channelForm.videoSize = 0; + } else if ( + this.channelForm.videoCX == 320 && + this.channelForm.videoCY == 240 + ) { + //this.channelForm.picSize = this.pictureSize[1].value; + this.channelForm.videoSize = 1; + } else if ( + this.channelForm.videoCX == 640 && + this.channelForm.videoCY == 480 + ) { + this.channelForm.videoSize = 2; + } else if ( + this.channelForm.videoCX == 1280 && + this.channelForm.videoCY == 720 + ) { + this.channelForm.videoSize = 3; + } else if ( + this.channelForm.videoCX == 1920 && + this.channelForm.videoCY == 1080 + ) { + //this.channelForm.picSize = this.pictureSize[2].value; + + this.channelForm.videoSize = 4; + } + + this.channelForm.videoDuration = resultContent.videoDuration; + } else { + this.channelForm.zzbh = ""; + this.channelForm.ysl = 80; + this.channelForm.usbchecked = ""; + this.channelForm.zzdjchecked = 1; + this.channelForm.zdbgchecked = 1; + this.channelForm.gmkzchecked = 0; this.channelForm.bgsj = ""; this.channelForm.iso = ""; - } else { - this.bgflag = false; - } - if ( - this.channelForm.videoCX == 720 && - this.channelForm.videoCY == 480 - ) { - // this.channelForm.picSize = this.pictureSize[0].value; - this.channelForm.videoSize = 0; - } else if ( - this.channelForm.videoCX == 320 && - this.channelForm.videoCY == 240 - ) { - //this.channelForm.picSize = this.pictureSize[1].value; - this.channelForm.videoSize = 1; - } else if ( - this.channelForm.videoCX == 640 && - this.channelForm.videoCY == 480 - ) { - this.channelForm.videoSize = 2; - } else if ( - this.channelForm.videoCX == 1280 && - this.channelForm.videoCY == 720 - ) { - this.channelForm.videoSize = 3; - } else if ( - this.channelForm.videoCX == 1920 && - this.channelForm.videoCY == 1080 - ) { - //this.channelForm.picSize = this.pictureSize[2].value; - - this.channelForm.videoSize = 4; + this.channelForm.modelVal = ""; + this.channelForm.compensationVal = ""; + // this.channelForm.hdrchecked = ""; + // this.channelForm.ywchecked = ""; + this.channelForm.rtosd = ""; + this.channelForm.ltosd = ""; + this.channelForm.lbosd = ""; + this.channelForm.rbosd = ""; + this.channelForm.videoSize = ""; + this.channelForm.videoCX = ""; + this.channelForm.videoCY = ""; + this.channelForm.videoDuration = 15; } - this.channelForm.videoDuration = resultContent.videoDuration; - this.$message({ duration: 1500, showClose: true, @@ -1000,11 +1042,11 @@ export default { this.channelForm.usbchecked = ""; this.channelForm.zzdjchecked = 1; this.channelForm.zdbgchecked = 1; - this.channelForm.gmkzchecked =0; + this.channelForm.gmkzchecked = 0; this.channelForm.bgsj = ""; this.channelForm.iso = ""; - this.channelForm.modelVal=""; - this.channelForm.compensationVal=""; + this.channelForm.modelVal = ""; + this.channelForm.compensationVal = ""; // this.channelForm.hdrchecked = ""; // this.channelForm.ywchecked = ""; this.channelForm.rtosd = ""; @@ -1042,8 +1084,8 @@ export default { .el-input { width: 300px; } - .usbClass{ - margin-left: 32px;; + .usbClass { + margin-left: 32px; } } .infoSpan { @@ -1117,21 +1159,21 @@ export default { .el-input { width: 90px; } - .el-form-item{ - &:last-child{ - .el-form-item__label{ - width: 60px!important; + .el-form-item { + &:last-child { + .el-form-item__label { + width: 60px !important; } - .el-form-item__content{ - margin-left: 60px!important; + .el-form-item__content { + margin-left: 60px !important; } } } } - .textAreabox{ + .textAreabox { display: flex; flex-wrap: wrap; - .el-textarea{ + .el-textarea { width: 298px; } } @@ -1145,7 +1187,7 @@ export default { // } // } } - .comclass{ + .comclass { margin-left: 8px; } } diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 960e6dc..4e27b0c 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -885,7 +885,33 @@ export default { getTermStatus({ termId: this.areaData.id }).then((res) => { console.log(res); if (res.data.isonline) { + let params = [ + { + name: "act", + value: "schedule", + }, + { + name: "flag", + value: 1, + }, + { + name: "channel", + value: this.selectChannel, + }, + { + name: "group", + value: 0, + }, + ]; + console.log(params); + this.setTermFnRule(params); } else { + this.$message({ + duration: 1500, + showClose: true, + message: "装置下线，发送指令失败", + type: "error", + }); } }); },