diff --git a/web/src/api/device.js b/web/src/api/device.js index 760fec333..f3b19bb5a 100644 --- a/web/src/api/device.js +++ b/web/src/api/device.js @@ -69,6 +69,14 @@ export function resetGuard(deviceId) { }) } +export function resetAlarm(data) { + return request({ + method: 'get', + url: '/api/device/control/reset_alarm', + params: data + }) +} + export function homePosition(params) { return request({ method: 'get', @@ -316,3 +324,10 @@ export function dragZoomOut(params) { }) } +export function teleboot(deviceId) { + return request({ + method: 'get', + url: `/api/device/control/teleboot/${deviceId}` + }) +} + diff --git a/web/src/store/modules/device.js b/web/src/store/modules/device.js index 38783cfb7..46011e6ef 100644 --- a/web/src/store/modules/device.js +++ b/web/src/store/modules/device.js @@ -13,13 +13,14 @@ import { queryDeviceSyncStatus, queryDeviceTree, queryHasStreamChannels, + resetAlarm, resetGuard, setBasicParam, setGuard, setVideoParamOpt, subscribeCatalog, subscribeForAlarm, subscribeMobilePosition, - sync, + sync, teleboot, update, updateChannelStreamIdentification, updateDeviceTransport @@ -86,6 +87,16 @@ const actions = { }) }) }, + resetAlarm({ commit }, data) { + return new Promise((resolve, reject) => { + resetAlarm(data).then(response => { + const { data: result } = response + resolve(result) + }).catch(error => { + reject(error) + }) + }) + }, homePosition({ commit }, params) { return new Promise((resolve, reject) => { homePosition(params).then(response => { @@ -305,6 +316,16 @@ const actions = { reject(error) }) }) + }, + teleboot({ commit }, deviceId) { + return new Promise((resolve, reject) => { + teleboot(deviceId).then(response => { + const { data } = response + resolve(data) + }).catch(error => { + reject(error) + }) + }) } } diff --git a/web/src/views/device/channel/alarmConfig.vue b/web/src/views/device/channel/alarmConfig.vue new file mode 100644 index 000000000..290e27f74 --- /dev/null +++ b/web/src/views/device/channel/alarmConfig.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/web/src/views/device/channel/cameraConfig.vue b/web/src/views/device/channel/cameraConfig.vue index 93728ea91..4876c97d1 100644 --- a/web/src/views/device/channel/cameraConfig.vue +++ b/web/src/views/device/channel/cameraConfig.vue @@ -8,10 +8,25 @@ 基础属性 + + + 报警配置 + + + + 录像控制 + + + + 设备运维 +
+ + +
@@ -19,10 +34,13 @@ + + diff --git a/web/src/views/device/channel/upgradeConfig.vue b/web/src/views/device/channel/upgradeConfig.vue new file mode 100644 index 000000000..80fcb0350 --- /dev/null +++ b/web/src/views/device/channel/upgradeConfig.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/web/src/views/device/list.vue b/web/src/views/device/list.vue index 8ec2c5ec1..f928c0792 100755 --- a/web/src/views/device/list.vue +++ b/web/src/views/device/list.vue @@ -132,7 +132,7 @@ - + @@ -381,43 +366,7 @@ export default { this.$refs.configInfo.openDialog(data) }) }, - moreClick: function(command, itemData) { - if (command === 'setGuard') { - this.setGuard(itemData) - } else if (command === 'resetGuard') { - this.resetGuard(itemData) - } else if (command === 'delete') { - this.deleteDevice(itemData) - } - }, - setGuard: function(itemData) { - this.$store.dispatch('device/setGuard', itemData.deviceId) - .then((data) => { - this.$message.success({ - showClose: true, - message: '布防成功' - }) - }).catch((error) => { - this.$message.error({ - showClose: true, - message: error.message - }) - }) - }, - resetGuard: function(itemData) { - this.$store.dispatch('device/resetGuard', itemData.deviceId) - .then((data) => { - this.$message.success({ - showClose: true, - message: '撤防成功' - }) - }).catch((error) => { - this.$message.error({ - showClose: true, - message: error.message - }) - }) - }, + subscribeForCatalog: function(data, value) { this.$store.dispatch('device/subscribeCatalog', { id: data,