diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue
index cd098cf..07cff9a 100644
--- a/src/views/realTimeMonitor/components/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannelDialog.vue
@@ -116,14 +116,23 @@
-
+
+
+
+
@@ -150,23 +159,23 @@
-
- (多行使用\n换行)
+
+
-
- (多行使用\n换行)
+
+
-
- (多行使用\n换行)
+
+
-
- (多行使用\n换行)
+
+
@@ -218,6 +227,7 @@ export default {
zdbgchecked: 1,
bgsj: "",
iso: "",
+ modelVal:"",
hdrchecked: "",
ywchecked: "",
roteval: "",
@@ -228,6 +238,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": "高动态范围"
+ }
+],
roteOptions: [
{
value: 0,
@@ -322,6 +424,7 @@ export default {
this.channelForm.roteval = this.roteOptions[0].value;
this.channelForm.videoSize = this.videoOptionSize[0].value;
this.channelForm.aival = this.aiOptions[0].value;
+ this.channelForm.modelVal = this.modelOptions[0].value;
},
methods: {
//获取通道
@@ -427,7 +530,7 @@ export default {
},
{
name: "configs",
- value: 21,
+ value: 20,
},
// {
// name: "resolutionCX",
@@ -498,86 +601,86 @@ export default {
// type: 0,
// value: this.channelForm.hdrchecked ? 1 : 0,
// },
- { name: "name9", value: "hdrMode" },
- { name: "value9", value: this.channelForm.hdrchecked ? 1 : 0 },
+ { name: "name9", value: "scene" },
+ { name: "value9", value: this.channelForm.modelVal },
{ name: "type9", value: 0 },
// {
// name: "nightMode",
// type: 0,
// value: this.channelForm.ywchecked ? 1 : 0,
// },
- { name: "name10", value: "nightMode" },
- { name: "value10", value: this.channelForm.ywchecked ? 1 : 0 },
- { name: "type10", value: 0 },
+ // { name: "name10", value: "nightMode" },
+ // { name: "value10", value: this.channelForm.ywchecked ? 1 : 0 },
+ // { name: "type10", value: 0 },
// {
// name: "orientation",
// type: 0,
// value: this.channelForm.roteval,
// },
- { name: "name11", value: "orientation" },
- { name: "value11", value: this.channelForm.roteval },
- { name: "type11", value: 0 },
+ { name: "name10", value: "orientation" },
+ { name: "value10", value: this.channelForm.roteval },
+ { name: "type10", value: 0 },
// {
// name: "recognization",
// type: 0,
// value: this.channelForm.aival,
// },
- { name: "name12", value: "recognization" },
- { name: "value12", value: this.channelForm.aival },
- { name: "type12", value: 0 },
+ { name: "name11", value: "recognization" },
+ { name: "value11", value: this.channelForm.aival },
+ { name: "type11", value: 0 },
// {
// name: "osd.leftTop",
// type: 1,
// value: this.channelForm.ltosd,
// },
- { name: "name13", value: "osd.leftTop" },
- { name: "value13", value: this.channelForm.ltosd },
- { name: "type13", value: 1 },
+ { name: "name12", value: "osd.leftTop" },
+ { name: "value12", value: this.channelForm.ltosd },
+ { name: "type12", value: 1 },
// {
// name: "osd.rightTop",
// type: 1,
// value: this.channelForm.rtosd,
// },
- { name: "name14", value: "osd.rightTop" },
- { name: "value14", value: this.channelForm.rtosd },
- { name: "type14", value: 1 },
+ { name: "name13", value: "osd.rightTop" },
+ { name: "value13", value: this.channelForm.rtosd },
+ { name: "type13", value: 1 },
// {
// name: "osd.rightBottom",
// type: 1,
// value: this.channelForm.lbosd,
// },
- { name: "name15", value: "osd.leftBottom" },
- { name: "value15", value: this.channelForm.lbosd },
- { name: "type15", value: 1 },
+ { name: "name14", value: "osd.leftBottom" },
+ { name: "value14", value: this.channelForm.lbosd },
+ { name: "type14", value: 1 },
// {
// name: "osd.leftBottom",
// type: 1,
// value: this.channelForm.rbosd,
// },
- { name: "name16", value: "osd.rightBottom" },
- { name: "value16", value: this.channelForm.rbosd },
- { name: "type16", value: 1 },
+ { name: "name15", value: "osd.rightBottom" },
+ { name: "value15", value: this.channelForm.rbosd },
+ { name: "type15", value: 1 },
//视频分辨率
- { name: "name17", value: "videoCX" },
- { name: "value17", value: this.channelForm.videoCX },
- { name: "type17", value: 0 },
+ { name: "name16", value: "videoCX" },
+ { name: "value16", value: this.channelForm.videoCX },
+ { name: "type16", value: 0 },
- { name: "name18", value: "videoCY" },
- { name: "value18", value: this.channelForm.videoCY },
- { name: "type18", value: 0 },
+ { name: "name17", value: "videoCY" },
+ { name: "value17", value: this.channelForm.videoCY },
+ { name: "type17", value: 0 },
//视频时长
- { name: "name19", value: "videoDuration" },
- { name: "value19", value: this.channelForm.videoDuration },
- { name: "type19", value: 0 },
+ { name: "name18", value: "videoDuration" },
+ { name: "value18", value: this.channelForm.videoDuration },
+ { name: "type18", value: 0 },
//图片放大
- { name: "name20", value: "zoom" },
- { name: "value20", value: this.channelForm.isImageZoomEnabled },
- { name: "type20", value: 0 },
+ { name: "name19", value: "zoom" },
+ { name: "value19", value: this.channelForm.isImageZoomEnabled },
+ { name: "type19", value: 0 },
//放大倍数
- { name: "name21", value: "zoomRatio" },
- { name: "value21", value: this.channelForm.zoomVal },
- { name: "type21", value: 0 },
+ { name: "name20", value: "zoomRatio" },
+ { name: "value20", value: this.channelForm.zoomVal },
+ { name: "type20", value: 0 },
];
console.log(params);
this.setTermFn(params);
@@ -731,10 +834,11 @@ export default {
resultContent.exposureTime == 0 ? "" : resultContent.exposureTime;
this.channelForm.iso =
resultContent.sensibility == 0 ? "" : resultContent.sensibility;
- this.channelForm.hdrchecked =
- resultContent.hdrMode == 1 ? true : false;
- this.channelForm.ywchecked =
- resultContent.nightMode == 1 ? true : false;
+ this.channelForm.modelVal = resultContent.scene;
+ // this.channelForm.hdrchecked =
+ // resultContent.hdrMode == 1 ? true : false;
+ // this.channelForm.ywchecked =
+ // resultContent.nightMode == 1 ? true : false;
this.channelForm.aival = resultContent.recognization;
this.channelForm.roteval = resultContent.orientation;
this.channelForm.rtosd = resultContent.osd.rightTop!="null"?resultContent.osd.rightTop:"";
@@ -824,8 +928,9 @@ export default {
this.channelForm.zdbgchecked = 1;
this.channelForm.bgsj = "";
this.channelForm.iso = "";
- this.channelForm.hdrchecked = "";
- this.channelForm.ywchecked = "";
+ this.channelForm.scene="";
+ // this.channelForm.hdrchecked = "";
+ // this.channelForm.ywchecked = "";
this.channelForm.rtosd = "";
this.channelForm.ltosd = "";
this.channelForm.lbosd = "";
@@ -946,6 +1051,9 @@ export default {
.textAreabox{
display: flex;
flex-wrap: wrap;
+ .el-textarea{
+ width: 298px;
+ }
}
.videoclass {
// .el-form-item__content {