diff --git a/src/views/iot/hs/electricity/index.vue b/src/views/iot/hs/electricity/index.vue
index 2d893bc..b06173b 100644
--- a/src/views/iot/hs/electricity/index.vue
+++ b/src/views/iot/hs/electricity/index.vue
@@ -26,7 +26,6 @@
-
@@ -51,8 +50,6 @@
import {list, save, deleteMeter, eleReset, eleCutOff, eleConnected, eleRead} from './electricity.api';
import { columns, searchFormSchema } from './electricity.data';
import {useModal} from "@/components/Modal";
- import ApiLogModal from "/@/views/iot/tq/electricity/apilog/ApiLogModal.vue";
-
import DrawerModal from "./components/DrawerModal.vue";
import { defHttp } from '/@/utils/http/axios';
diff --git a/src/views/iot/tplink/camera/components/CameraBlockForm.vue b/src/views/iot/tplink/camera/components/CameraBlockForm.vue
index 063494b..bbea1e4 100644
--- a/src/views/iot/tplink/camera/components/CameraBlockForm.vue
+++ b/src/views/iot/tplink/camera/components/CameraBlockForm.vue
@@ -38,16 +38,16 @@
处理方式
-
-
-
+
+
+
-
-
- 消息提醒（触发事件后，设备会上传云端信息）
-
-
-
+
+
+
+
+
+
@@ -68,29 +68,29 @@
-
-
-
- 报警声音
-
-
-
-
-
- 试听
-
-
-
-
-
-
- 播放次数
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -141,26 +141,35 @@
deviceIndex: '', //设备索引
enabled: false, //镜头遮挡
digitalSensitivity: '50', //灵敏度
- msgPushEnabled: true, //消息提醒
+ // msgPushEnabled: true, //消息提醒
lightAlarmEnabled: false, //白光告警
soundAlarmEnabled: false, //声音告警
- soundAlarmType: '', //报警声音
- soundAlarmTypeArr: [
- {value:'0',label:'报警音'},
- {value:'1',label:'提示音'},
- {value:'2',label:'警戒区域，尽快离开'},
- {value:'3',label:'危险区域，请勿靠近'},
- {value:'4',label:'此区域禁止停车'},
- {value:'5',label:'你已进入实时监控区域'},
- {value:'6',label:'您好，欢迎光临'},
- {value:'7',label:'贵重物品，请勿触摸'},
- {value:'8',label:'私人领域, 禁止入内'},
- {value:'9',label:'水深危险，注意安全'},
- {value:'10',label:'高处危险，请勿攀爬'},
- {value:'11',label:'垃圾请分类投放'},
- ], //报警声音
- soundAlarmTimes: '', //播放次数
- soundAlarmTimesArr:[{value:'1',label:'1次'},{value:'2',label:'2次'},{value:'3',label:'3次'},{value:'4',label:'4次'},{value:'5',label:'5次'}],
+ // soundAlarmType: '', //报警声音
+ // soundAlarmTypeArr: [
+ // {value:'0',label:'报警音'},
+ // {value:'1',label:'提示音'},
+ // {value:'2',label:'警戒区域，尽快离开'},
+ // {value:'3',label:'危险区域，请勿靠近'},
+ // {value:'4',label:'此区域禁止停车'},
+ // {value:'5',label:'你已进入实时监控区域'},
+ // {value:'6',label:'您好，欢迎光临'},
+ // {value:'7',label:'贵重物品，请勿触摸'},
+ // {value:'8',label:'私人领域, 禁止入内'},
+ // {value:'9',label:'水深危险，注意安全'},
+ // {value:'10',label:'高处危险，请勿攀爬'},
+ // {value:'11',label:'垃圾请分类投放'},
+ // ], //报警声音
+ // soundAlarmTimes: '', //播放次数
+ // soundAlarmTimesArr:[{value:'1',label:'1次'},{value:'2',label:'2次'},{value:'3',label:'3次'},{value:'4',label:'4次'},{value:'5',label:'5次'}],
+ sensitivity: '',
+ screenwarnEnabled: '',
+ screenshotEnabled: '',
+ buzzerEnabled: '',
+ unionEnabled: '',
+ recordUnion: '',
+ popupwinEnabled: '',
+ customizeEnabled: '',
+ spkAlarmEnabled: '',
});
const confirmLoading = ref(false);
@@ -183,30 +192,49 @@
formData.enabled = false;
}
formData.digitalSensitivity = res.digital_sensitivity;
+ formData.sensitivity = res.sensitivity;
});
//获取处理方式
getTamperNotif({
"deviceIndex": deviceIndex
}).then(res=>{
- let tamper_notif_list = res.tamper_notif_list;
- let sound_alarm_info = res.sound_alarm_info;
- if(tamper_notif_list.msg_push_enabled == "on"){
- formData.msgPushEnabled = true;
- }else{
- formData.msgPushEnabled = false;
- }
- if(tamper_notif_list.light_alarm_enabled == "on"){
+ // let tamper_notif_list = res.tamper_notif_list;
+ // let sound_alarm_info = res.sound_alarm_info;
+ // if(tamper_notif_list.msg_push_enabled == "on"){
+ // formData.msgPushEnabled = true;
+ // }else{
+ // formData.msgPushEnabled = false;
+ // }
+ // if(tamper_notif_list.light_alarm_enabled == "on"){
+ // formData.lightAlarmEnabled = true;
+ // }else{
+ // formData.lightAlarmEnabled = false;
+ // }
+ // if(tamper_notif_list.sound_alarm_enabled == "on"){
+ // formData.soundAlarmEnabled = true;
+ // }else{
+ // formData.soundAlarmEnabled = false;
+ // }
+ // formData.soundAlarmType = sound_alarm_info.sound_alarm_type;
+ // formData.soundAlarmTimes = sound_alarm_info.sound_alarm_times;
+ if(res.light_alarm_enabled == "on"){
formData.lightAlarmEnabled = true;
}else{
formData.lightAlarmEnabled = false;
}
- if(tamper_notif_list.sound_alarm_enabled == "on"){
+ if(res.sound_alarm_enabled == "on"){
formData.soundAlarmEnabled = true;
}else{
formData.soundAlarmEnabled = false;
}
- formData.soundAlarmType = sound_alarm_info.sound_alarm_type;
- formData.soundAlarmTimes = sound_alarm_info.sound_alarm_times;
+ formData.screenwarnEnabled = res.screenwarn_enabled;
+ formData.screenshotEnabled = res.screenshot_enabled;
+ formData.buzzerEnabled = res.buzzer_enabled;
+ formData.unionEnabled = res.union_enabled;
+ formData.recordUnion = res.record_union;
+ formData.popupwinEnabled = res.popupwin_enabled;
+ formData.customizeEnabled = res.customize_enabled;
+ formData.spkAlarmEnabled = res.spk_alarm_enabled;
});
}
@@ -226,15 +254,16 @@
if(formData.enabled){
params["digitalSensitivity"] = formData.digitalSensitivity;
}
+ params["sensitivity"] = formData.sensitivity;
setTamperDet(params).then(res=>{
confirmLoading.value = false;
});
if(formData.enabled){
- if(formData.msgPushEnabled){
- params["msgPushEnabled"] = "on";
- }else{
- params["msgPushEnabled"] = "off";
- }
+ // if(formData.msgPushEnabled){
+ // params["msgPushEnabled"] = "on";
+ // }else{
+ // params["msgPushEnabled"] = "off";
+ // }
if(formData.lightAlarmEnabled){
params["lightAlarmEnabled"] = "on";
}else{
@@ -245,8 +274,16 @@
}else{
params["soundAlarmEnabled"] = "off";
}
- params["soundAlarmType"] = formData.soundAlarmType;
- params["soundAlarmTimes"] = formData.soundAlarmTimes;
+ params["screenwarnEnabled"] = formData.screenwarnEnabled;
+ params["screenshotEnabled"] = formData.screenshotEnabled;
+ params["buzzerEnabled"] = formData.buzzerEnabled;
+ params["unionEnabled"] = formData.unionEnabled;
+ params["recordUnion"] = formData.recordUnion;
+ params["popupwinEnabled"] = formData.popupwinEnabled;
+ params["customizeEnabled"] = formData.customizeEnabled;
+ params["spkAlarmEnabled"] = formData.spkAlarmEnabled;
+ // params["soundAlarmType"] = formData.soundAlarmType;
+ // params["soundAlarmTimes"] = formData.soundAlarmTimes;
setTamperNotif(params).then(res=>{
confirmLoading.value = false;
});
diff --git a/src/views/iot/tplink/camera/components/CameraPictureConfig.vue b/src/views/iot/tplink/camera/components/CameraPictureConfig.vue
index 2044636..15a623a 100644
--- a/src/views/iot/tplink/camera/components/CameraPictureConfig.vue
+++ b/src/views/iot/tplink/camera/components/CameraPictureConfig.vue
@@ -64,25 +64,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-->
-
-
-
+
+
+
@@ -127,8 +127,8 @@
import CameraOsdForm from './CameraOsdForm.vue';//OSD信息
import CameraBitrateForm from './CameraBitrateForm.vue';//码流参数
import CameraBlockForm from './CameraBlockForm.vue';//镜头遮挡
- import CameraLightAlarmForm from './CameraLightAlarmForm.vue';//白光报警
- import CameraSoundAlarmForm from './CameraSoundAlarmForm.vue';//声音报警
+ // import CameraLightAlarmForm from './CameraLightAlarmForm.vue';//白光报警
+ // import CameraSoundAlarmForm from './CameraSoundAlarmForm.vue';//声音报警
import CameraRecordList from './CameraRecordList.vue';//录像列表
import CameraUploadForm from './CameraUploadForm.vue';//上传FTP
import PlanAddForm from '/@/views/iot/tplink/plan/components/PlanAddForm.vue';//录像设置