|
|
|
@ -105,13 +105,10 @@
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="isoDiv">
|
|
|
|
|
<el-form-item label="参数设置">
|
|
|
|
|
|
|
|
|
|
<el-checkbox
|
|
|
|
|
label="自动对焦"
|
|
|
|
|
v-model="channelForm.zzdjchecked"
|
|
|
|
@ -180,29 +177,41 @@
|
|
|
|
|
</div>
|
|
|
|
|
<div class="textAreabox">
|
|
|
|
|
<el-form-item label="左上OSD">
|
|
|
|
|
<el-input type="textarea" rows="3" v-model="channelForm.ltosd"></el-input>
|
|
|
|
|
<el-input
|
|
|
|
|
type="textarea"
|
|
|
|
|
rows="3"
|
|
|
|
|
v-model="channelForm.ltosd"
|
|
|
|
|
></el-input>
|
|
|
|
|
<!-- <span class="infoSpan">(多行使用\n换行)</span> -->
|
|
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="右上OSD">
|
|
|
|
|
<el-input type="textarea" rows="3" v-model="channelForm.rtosd"></el-input>
|
|
|
|
|
<el-input
|
|
|
|
|
type="textarea"
|
|
|
|
|
rows="3"
|
|
|
|
|
v-model="channelForm.rtosd"
|
|
|
|
|
></el-input>
|
|
|
|
|
<!-- <span class="infoSpan">(多行使用\n换行)</span> -->
|
|
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="左下OSD">
|
|
|
|
|
<el-input type="textarea" rows="3" v-model="channelForm.lbosd"></el-input>
|
|
|
|
|
<el-input
|
|
|
|
|
type="textarea"
|
|
|
|
|
rows="3"
|
|
|
|
|
v-model="channelForm.lbosd"
|
|
|
|
|
></el-input>
|
|
|
|
|
<!-- <span class="infoSpan">(多行使用\n换行)</span> -->
|
|
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="右下OSD">
|
|
|
|
|
<el-input type="textarea" rows="3" v-model="channelForm.rbosd"></el-input>
|
|
|
|
|
<el-input
|
|
|
|
|
type="textarea"
|
|
|
|
|
rows="3"
|
|
|
|
|
v-model="channelForm.rbosd"
|
|
|
|
|
></el-input>
|
|
|
|
|
<!-- <span class="infoSpan">(多行使用\n换行)</span> -->
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</div>
|
|
|
|
|
</el-form>
|
|
|
|
|
</div>
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
|
|
|
|
|
<el-button @click="handleclose" :disabled="channelsetLoading"
|
|
|
|
|
>取 消</el-button
|
|
|
|
|
>
|
|
|
|
@ -210,13 +219,12 @@
|
|
|
|
|
type="primary"
|
|
|
|
|
:disabled="channelsetLoading"
|
|
|
|
|
@click="handleConfim(false)"
|
|
|
|
|
|
|
|
|
|
>确 定</el-button
|
|
|
|
|
> <el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button
|
|
|
|
|
type="primary"
|
|
|
|
|
:disabled="channelsetLoading"
|
|
|
|
|
@click="handleConfim(true)"
|
|
|
|
|
|
|
|
|
|
>保存并关闭</el-button
|
|
|
|
|
>
|
|
|
|
|
<!-- :loading="channelLoading" -->
|
|
|
|
@ -269,95 +277,95 @@ export default {
|
|
|
|
|
bgflag: false,
|
|
|
|
|
modelOptions: [
|
|
|
|
|
{
|
|
|
|
|
"name": "DISABLED",
|
|
|
|
|
"id": 0,
|
|
|
|
|
"chName": "无场景"
|
|
|
|
|
name: "DISABLED",
|
|
|
|
|
id: 0,
|
|
|
|
|
chName: "无场景",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "FACE_PRIORITY",
|
|
|
|
|
"id": 1,
|
|
|
|
|
"chName": "面部优先"
|
|
|
|
|
name: "FACE_PRIORITY",
|
|
|
|
|
id: 1,
|
|
|
|
|
chName: "面部优先",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "ACTION",
|
|
|
|
|
"id": 2,
|
|
|
|
|
"chName": "动作"
|
|
|
|
|
name: "ACTION",
|
|
|
|
|
id: 2,
|
|
|
|
|
chName: "动作",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "PORTRAIT",
|
|
|
|
|
"id": 3,
|
|
|
|
|
"chName": "肖像"
|
|
|
|
|
name: "PORTRAIT",
|
|
|
|
|
id: 3,
|
|
|
|
|
chName: "肖像",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "LANDSCAPE",
|
|
|
|
|
"id": 4,
|
|
|
|
|
"chName": "风景"
|
|
|
|
|
name: "LANDSCAPE",
|
|
|
|
|
id: 4,
|
|
|
|
|
chName: "风景",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "NIGHT",
|
|
|
|
|
"id": 5,
|
|
|
|
|
"chName": "夜晚"
|
|
|
|
|
name: "NIGHT",
|
|
|
|
|
id: 5,
|
|
|
|
|
chName: "夜晚",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "NIGHT_PORTRAIT",
|
|
|
|
|
"id": 6,
|
|
|
|
|
"chName": "夜间肖像"
|
|
|
|
|
name: "NIGHT_PORTRAIT",
|
|
|
|
|
id: 6,
|
|
|
|
|
chName: "夜间肖像",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "THEATRE",
|
|
|
|
|
"id": 7,
|
|
|
|
|
"chName": "剧院"
|
|
|
|
|
name: "THEATRE",
|
|
|
|
|
id: 7,
|
|
|
|
|
chName: "剧院",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "BEACH",
|
|
|
|
|
"id": 8,
|
|
|
|
|
"chName": "海滩"
|
|
|
|
|
name: "BEACH",
|
|
|
|
|
id: 8,
|
|
|
|
|
chName: "海滩",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "SNOW",
|
|
|
|
|
"id": 9,
|
|
|
|
|
"chName": "雪景"
|
|
|
|
|
name: "SNOW",
|
|
|
|
|
id: 9,
|
|
|
|
|
chName: "雪景",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "SUNSET",
|
|
|
|
|
"id": 10,
|
|
|
|
|
"chName": "日落"
|
|
|
|
|
name: "SUNSET",
|
|
|
|
|
id: 10,
|
|
|
|
|
chName: "日落",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "STEADYPHOTO",
|
|
|
|
|
"id": 11,
|
|
|
|
|
"chName": "稳定照片"
|
|
|
|
|
name: "STEADYPHOTO",
|
|
|
|
|
id: 11,
|
|
|
|
|
chName: "稳定照片",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "FIREWORKS",
|
|
|
|
|
"id": 12,
|
|
|
|
|
"chName": "烟花"
|
|
|
|
|
name: "FIREWORKS",
|
|
|
|
|
id: 12,
|
|
|
|
|
chName: "烟花",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "SPORTS",
|
|
|
|
|
"id": 13,
|
|
|
|
|
"chName": "运动"
|
|
|
|
|
name: "SPORTS",
|
|
|
|
|
id: 13,
|
|
|
|
|
chName: "运动",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "PARTY",
|
|
|
|
|
"id": 14,
|
|
|
|
|
"chName": "聚会"
|
|
|
|
|
name: "PARTY",
|
|
|
|
|
id: 14,
|
|
|
|
|
chName: "聚会",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "CANDLELIGHT",
|
|
|
|
|
"id": 15,
|
|
|
|
|
"chName": "烛光"
|
|
|
|
|
name: "CANDLELIGHT",
|
|
|
|
|
id: 15,
|
|
|
|
|
chName: "烛光",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "BARCODE",
|
|
|
|
|
"id": 16,
|
|
|
|
|
"chName": "条形码"
|
|
|
|
|
name: "BARCODE",
|
|
|
|
|
id: 16,
|
|
|
|
|
chName: "条形码",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "HDR",
|
|
|
|
|
"id": 18,
|
|
|
|
|
"chName": "HDR"
|
|
|
|
|
}
|
|
|
|
|
name: "HDR",
|
|
|
|
|
id: 18,
|
|
|
|
|
chName: "HDR",
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
roteOptions: [
|
|
|
|
|
{
|
|
|
|
@ -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"));
|
|
|
|
|
|
|
|
|
|
this.channelForm.selectChannel = Number(
|
|
|
|
|
localStorage.getItem("channelId")
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
//this.channelForm.selectChannel = this.channelList[0].channelid;
|
|
|
|
|
console.log(this.channelList);
|
|
|
|
@ -548,7 +553,6 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
handleConfim(flag) {
|
|
|
|
|
|
|
|
|
|
console.log("点击了确定");
|
|
|
|
|
console.log(this.channelForm);
|
|
|
|
|
this.channelLoading = true;
|
|
|
|
@ -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);
|
|
|
|
@ -888,6 +892,8 @@ export default {
|
|
|
|
|
console.log(res.data);
|
|
|
|
|
console.log(JSON.parse(res.data.data));
|
|
|
|
|
const resultData = JSON.parse(res.data.data);
|
|
|
|
|
|
|
|
|
|
if (resultData.hasOwnProperty("content")) {
|
|
|
|
|
const resultContent = JSON.parse(
|
|
|
|
|
decodeURIComponent(escape(window.atob(resultData.content)))
|
|
|
|
|
);
|
|
|
|
@ -904,7 +910,9 @@ export default {
|
|
|
|
|
this.channelForm.gmkzchecked =
|
|
|
|
|
resultContent.gmkz == 1 ? true : false;
|
|
|
|
|
this.channelForm.bgsj =
|
|
|
|
|
resultContent.exposureTime == 0 ? "" : resultContent.exposureTime;
|
|
|
|
|
resultContent.exposureTime == 0
|
|
|
|
|
? ""
|
|
|
|
|
: resultContent.exposureTime;
|
|
|
|
|
this.channelForm.iso =
|
|
|
|
|
resultContent.sensitivity == 0 ? "" : resultContent.sensitivity;
|
|
|
|
|
this.channelForm.modelVal = resultContent.sceneMode;
|
|
|
|
@ -915,10 +923,22 @@ export default {
|
|
|
|
|
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.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;
|
|
|
|
@ -959,8 +979,30 @@ export default {
|
|
|
|
|
|
|
|
|
|
this.channelForm.videoSize = 4;
|
|
|
|
|
}
|
|
|
|
|
this.channelForm.videoDuration = resultContent.videoDuration;
|
|
|
|
|
|
|
|
|
|
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 = "";
|
|
|
|
|
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.$message({
|
|
|
|
|
duration: 1500,
|
|
|
|
|
showClose: true,
|
|
|
|
@ -1043,7 +1085,7 @@ export default {
|
|
|
|
|
width: 300px;
|
|
|
|
|
}
|
|
|
|
|
.usbClass {
|
|
|
|
|
margin-left: 32px;;
|
|
|
|
|
margin-left: 32px;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.infoSpan {
|
|
|
|
|