From 4d8c510d4df010cad5c1d67e1438d95a787e96c6 Mon Sep 17 00:00:00 2001 From: hh <292475944@qq.com> Date: Wed, 24 Mar 2021 15:58:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/firmware/firmwareupdate.js | 15 +- src/api/hardware/device.js | 33 +++ src/views/chart/index.vue | 144 +------------ src/views/fault/encrypt/index.vue | 4 + src/views/firmware/firmwareUpdate/index.vue | 51 ++++- src/views/hardware/device/list.vue | 43 +++- src/views/hardware/whiteList/index.vue | 220 ++++++++++++++++++++ src/views/system/user/index.vue | 7 +- 8 files changed, 365 insertions(+), 152 deletions(-) create mode 100644 src/views/hardware/whiteList/index.vue diff --git a/src/api/firmware/firmwareupdate.js b/src/api/firmware/firmwareupdate.js index 51dca36..b865d41 100644 --- a/src/api/firmware/firmwareupdate.js +++ b/src/api/firmware/firmwareupdate.js @@ -21,4 +21,17 @@ export function OTAUpdates(data) { method: 'post', data }) -} \ No newline at end of file +} + +export function getNodeOTAHistory(params) { + return request({ + url: '/system/device/node/getOTAHistory', + params + }); + } + + export function nodeOTAHistoryExport() { + return request({ + url: '/ota/export', + }); + } \ No newline at end of file diff --git a/src/api/hardware/device.js b/src/api/hardware/device.js index 8275fff..04ba8e4 100644 --- a/src/api/hardware/device.js +++ b/src/api/hardware/device.js @@ -65,4 +65,37 @@ export function importTemplate() { return request({ url: '/system/device/importTemplate', }) +} + + +// 获取白名单列表 +export function whiteList(params) { + return request({ + url: '/system/device/whiteList', + method: 'get', + params + }) +} +/** + * 批量添加白名单 + * @param {Array} ids + */ +export function addWhiteDevice(ids) { + return request({ + url: '/system/device/addWhiteDevice/', + method: 'post', + data: {ids} + }) +} + +/** + * 批量移除白名单 + * @param {Array} ids + */ +export function delWhiteDevice(ids) { + return request({ + url: '/system/device/delWhiteDevice', + method: 'post', + data: {ids} + }) } \ No newline at end of file diff --git a/src/views/chart/index.vue b/src/views/chart/index.vue index 4082b0a..2243237 100644 --- a/src/views/chart/index.vue +++ b/src/views/chart/index.vue @@ -64,145 +64,11 @@ export default { '3': '已回单', }, myStyleJson: [ - { - "featureType": "water", - "elementType": "all", - "stylers": { - "color": "#021019" - } - }, - { - "featureType": "highway", - "elementType": "geometry.fill", - "stylers": { - "color": "#000000" - } - }, - { - "featureType": "highway", - "elementType": "geometry.stroke", - "stylers": { - "color": "#147a92" - } - }, - { - "featureType": "arterial", - "elementType": "geometry.fill", - "stylers": { - "color": "#000000" - } - }, - { - "featureType": "arterial", - "elementType": "geometry.stroke", - "stylers": { - "color": "#0b3d51" - } - }, - { - "featureType": "local", - "elementType": "geometry", - "stylers": { - "color": "#000000" - } - }, { "featureType": "land", - "elementType": "all", - "stylers": { - "color": "#08304b" - } - }, - { - "featureType": "railway", - "elementType": "geometry.fill", - "stylers": { - "color": "#000000" - } - }, - { - "featureType": "railway", - "elementType": "geometry.stroke", - "stylers": { - "color": "#08304b" - } - }, - { - "featureType": "subway", "elementType": "geometry", "stylers": { - "lightness": -70 - } - }, - { - "featureType": "building", - "elementType": "geometry.fill", - "stylers": { - "color": "#000000" - } - }, - { - "featureType": "all", - "elementType": "labels.text.fill", - "stylers": { - "color": "#857f7f" - } - }, - { - "featureType": "all", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#000000" - } - }, - { - "featureType": "building", - "elementType": "geometry", - "stylers": { - "color": "#022338" - } - }, - { - "featureType": "green", - "elementType": "geometry", - "stylers": { - "color": "#062032" - } - }, - { - "featureType": "boundary", - "elementType": "all", - "stylers": { - "color": "#1e1c1c" - } - }, - { - "featureType": "manmade", - "elementType": "geometry", - "stylers": { - "color": "#022338" - } - }, - { - "featureType": "poi", - "elementType": "all", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "all", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "all", - "elementType": "labels.text.fill", - "stylers": { - "color": "#2da0c6", - "visibility": "on" + "color": "#f5f6f7ff" } } ] @@ -210,8 +76,8 @@ export default { }, computed: { - time() { - return parseTime(this.date,'{h} : {i} : {s}') + time () { + return parseTime(this.date, '{h} : {i} : {s}') } }, mounted () { @@ -638,7 +504,7 @@ export default { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index b5b2366..a838fbb 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -133,8 +133,8 @@ - - + + @@ -449,7 +449,8 @@ export default { this.roleOptions = response.roles; this.open = true; this.title = "添加用户"; - this.form.password = this.initPassword; + // set init password + // this.form.password = this.initPassword; }); }, /** 修改按钮操作 */