From c30be6e10c222fc7d60995ed1cad5e12239f3cb6 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 26 Feb 2024 14:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E9=81=93=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/setChannelDialog.vue | 353 ++++++++++++------
1 file changed, 240 insertions(+), 113 deletions(-)
diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue
index 0b90c4f..2679a5b 100644
--- a/src/views/realTimeMonitor/components/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannelDialog.vue
@@ -9,7 +9,7 @@
>
装置编号：{{ areaData.cmdid }}
-
+
@@ -33,41 +33,29 @@
-
-
+
+
+
+
+ (秒)
@@ -172,6 +160,10 @@ export default {
selectChannel: "",
resolutionCX: "",
resolutionCY: "",
+ videoSize: "",
+ videoCX: "",
+ videoCY: "",
+ videoDuration: 15,
ysl: 80,
usbchecked: "",
zzdjchecked: "",
@@ -238,6 +230,33 @@ export default {
label: "2048X1536",
},
],
+ videoOptionSize: [
+ {
+ value: 0,
+ name: "默认",
+ label: "720X480",
+ },
+ {
+ value: 1,
+ name: "QVGA",
+ label: "320X240",
+ },
+ {
+ value: 2,
+ name: "VGA",
+ label: "640X480",
+ },
+ {
+ value: 3,
+ name: "720p",
+ label: "1280X720",
+ },
+ {
+ value: 4,
+ name: "1080p",
+ label: "1920X1080",
+ },
+ ],
requestid: "",
};
},
@@ -249,6 +268,7 @@ export default {
mounted() {
this.channelForm.zzbh = this.areaData.cmdid;
this.channelForm.roteval = this.roteOptions[0].value;
+ this.channelForm.videoSize = this.videoOptionSize[0].value;
this.channelForm.aival = this.aiOptions[0].value;
},
methods: {
@@ -268,10 +288,34 @@ export default {
console.log(val, "是否选中");
if (val) {
this.bgflag = true;
+ this.channelForm.bgsj = "";
+ this.channelForm.iso = "";
} else {
this.bgflag = false;
}
},
+ changevideoChannel() {
+ console.log(this.channelForm.videoSize);
+ if (this.channelForm.videoSize == 0) {
+ // this.channelForm.picSize = this.pictureSize[0].value;
+ this.channelForm.videoCX = 720;
+ this.channelForm.videoCY = 480;
+ } else if (this.channelForm.videoSize == 1) {
+ //this.channelForm.picSize = this.pictureSize[1].value;
+ this.channelForm.videoCX = 320;
+ this.channelForm.videoCY = 240;
+ } else if (this.channelForm.videoSize == 2) {
+ this.channelForm.videoCX = 640;
+ this.channelForm.videoCY = 480;
+ } else if (this.channelForm.videoSize == 3) {
+ this.channelForm.videoCX = 1280;
+ this.channelForm.videoCY = 720;
+ } else if (this.channelForm.videoSize == 4) {
+ //this.channelForm.picSize = this.pictureSize[2].value;
+ this.channelForm.videoCX = 1920;
+ this.channelForm.videoCY = 1080;
+ }
+ },
//修改通道
changeChannel() {
console.log(this.channelForm.selectChannel);
@@ -291,93 +335,13 @@ export default {
this.channelForm.resolutionCX = 2048;
this.channelForm.resolutionCY = 1536;
}
+ this.searchBtn();
},
handleConfim() {
console.log("点击了确定");
console.log(this.channelForm);
this.channelLoading = true;
- // let params = [
- // {
- // name: "resolutionCX",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "resolutionCY",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "quality",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "usbCamera",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "autoFocus",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "autoExposure",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "exposureTime",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "sensibility",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "hdrMode",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "nightMode",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "orientation",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "recognization",
- // type: 0,
- // value: "",
- // },
- // {
- // name: "osd.leftTop",
- // type: 1,
- // value: "",
- // },
- // {
- // name: "osd.rightTop",
- // type: 1,
- // value: "",
- // },
- // {
- // name: "osd.rightBottom",
- // type: 1,
- // value: "",
- // },
- // {
- // name: "osd.leftBottom",
- // type: 1,
- // value: "",
- // },
- // ];
+
//--act=cfg --udp=1 --cmdid=XY-ANDROIDSIM-002 --pathType=1 --updateType=0 --path=data/channels/1.json --configs=3 --name1=osd.leftTop --type1=1 --value1="OSD for LeftTop %%CH%%" --name2=osd.rightTop --type2=255 --value2="OSD for rIGHTTop %%CH%%" --name3=usbCamera --type3=0 --value3=1 --clientid=5 --reqid=TS
getTermStatus({ termId: this.areaData.id }).then((res) => {
console.log(res);
@@ -393,7 +357,7 @@ export default {
},
{
name: "reboot",
- value: 1,
+ value: 0,
},
{
name: "pathType",
@@ -401,7 +365,7 @@ export default {
},
{
name: "updateType",
- value: 0,
+ value: 1,
},
{
name: "path",
@@ -410,7 +374,7 @@ export default {
},
{
name: "configs",
- value: 16,
+ value: 19,
},
// {
// name: "resolutionCX",
@@ -540,6 +504,19 @@ export default {
{ name: "name16", value: "osd.rightBottom" },
{ name: "value16", value: this.channelForm.rbosd },
{ name: "type16", value: 1 },
+ //视频分辨率
+
+ { name: "name17", value: "videoCX" },
+ { name: "value17", value: this.channelForm.videoCX },
+ { name: "type17", value: 0 },
+
+ { name: "name18", value: "videoCY" },
+ { name: "value18", value: this.channelForm.videoCY },
+ { name: "type18", value: 0 },
+ //视频时长
+ { name: "name19", value: "videoDuration" },
+ { name: "value19", value: this.channelForm.videoDuration },
+ { name: "type19", value: 0 },
];
console.log(params);
this.setTermFn(params);
@@ -591,10 +568,146 @@ export default {
})
.catch((err) => {});
},
+ searchBtn() {
+ //--act=cfg --udp=1 --cmdid=XY-ANDROIDSIM-002 --pathType=1 --updateType=0 --path=data/channels/1.json --configs=3 --name1=osd.leftTop --type1=1 --value1="OSD for LeftTop %%CH%%" --name2=osd.rightTop --type2=255 --value2="OSD for rIGHTTop %%CH%%" --name3=usbCamera --type3=0 --value3=1 --clientid=5 --reqid=TS
+ getTermStatus({ termId: this.areaData.id }).then((res) => {
+ console.log(res);
+ if (res.data.isonline) {
+ let params = [
+ {
+ name: "act",
+ value: "cfg",
+ },
+ {
+ name: "udp",
+ value: 1,
+ },
+
+ {
+ name: "pathType",
+ value: 1,
+ },
+ {
+ name: "updateType",
+ value: 0,
+ },
+ {
+ name: "path",
+ value:
+ "data/channels/" + this.channelForm.selectChannel + ".json",
+ },
+ ];
+ console.log(params);
+ this.searchTermFn(params);
+ } else {
+ this.$message({
+ duration: 1500,
+ showClose: true,
+ message: "装置下线，发送指令失败",
+ type: "error",
+ });
+ }
+ });
+ },
+ searchTermFn(val) {
+ setTermCamera({
+ termId: this.areaData.id,
+ list: val,
+ })
+ .then((res) => {
+ console.log(res);
+ this.requestid = res.data.requestId;
+ this.getsearchchannelStatus();
+ })
+ .catch((err) => {});
+ },
+ getsearchchannelStatus() {
+ getTermCameraRequest({ requestid: this.requestid })
+ .then((res) => {
+ console.log(res);
+ if (res.data.success == 1) {
+ // this.isShow = false;
+ // this.channelLoading = false;
+ 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.ysl = resultContent.quality;
+ this.channelForm.usbchecked = resultContent.usbCamera;
+ this.channelForm.zzdjchecked = resultContent.autoFocus;
+ this.channelForm.zdbgchecked = resultContent.autoExposure;
+ this.channelForm.bgsj = resultContent.exposureTime;
+ this.channelForm.iso = resultContent.sensibility;
+ this.channelForm.hdrchecked = resultContent.hdrMode;
+ this.channelForm.ywchecked = resultContent.nightMode;
+ this.channelForm.aival = resultContent.recognization;
+ this.channelForm.roteval = resultContent.orientation;
+ this.channelForm.rtosd = resultContent.osd.rightTop;
+ this.channelForm.ltosd = resultContent.osd.leftTop;
+ this.channelForm.lbosd = resultContent.osd.leftBottom;
+ this.channelForm.rbosd = resultContent.osd.rightBottom;
+ // this.channelForm.videoSize = resultContent.;
+ this.channelForm.videoCX = resultContent.videoCX;
+ this.channelForm.videoCY = resultContent.videoCY;
+ 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;
+ this.$message({
+ duration: 1500,
+ showClose: true,
+ message: "通道查询成功",
+ type: "success",
+ });
+ } else {
+ // this.isShow = false;
+ // this.channelLoading = false;
+ this.$message({
+ duration: 1500,
+ showClose: true,
+ message: "通道查询失败",
+ type: "error",
+ });
+ }
+ })
+ .catch((err) => {});
+ },
display() {
this.isShow = true;
this.channelForm.zzbh = this.areaData.cmdid;
this.getChannelSelect();
+ this.changevideoChannel();
console.log(this.areaData);
},
handleclose() {
@@ -614,6 +727,10 @@ export default {
this.channelForm.ltosd = "";
this.channelForm.lbosd = "";
this.channelForm.rbosd = "";
+ this.channelForm.videoSize = "";
+ this.channelForm.videoCX = "";
+ this.channelForm.videoCY = "";
+ this.channelForm.videoDuration = 15;
},
},
};
@@ -647,11 +764,21 @@ export default {
display: flex;
//justify-content: space-between;
.el-input {
- width: 144px;
+ width: 90px;
margin-right: 12px;
}
}
}
+ .videoclass {
+ // .el-form-item__content {
+ // display: flex;
+ // //justify-content: space-between;
+ // .el-select {
+ // width: 164px;
+ // margin-right: 12px;
+ // }
+ // }
+ }
}
.dialog-footer {
.el-button--default,