From 0f7722b69e120b37e72c599a77d83cc350ff83c5 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Wed, 17 Jan 2024 14:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=20=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/cs-system-boot/device.ts | 66 +++ src/utils/request.ts | 6 +- src/views/govern/device/disposition/index.vue | 2 +- src/views/govern/manage/factory.vue | 406 +++++++++++++++++- src/views/user/login.vue | 8 +- 5 files changed, 460 insertions(+), 28 deletions(-) create mode 100644 src/api/cs-system-boot/device.ts diff --git a/src/api/cs-system-boot/device.ts b/src/api/cs-system-boot/device.ts new file mode 100644 index 0000000..39ac8b0 --- /dev/null +++ b/src/api/cs-system-boot/device.ts @@ -0,0 +1,66 @@ +import createAxios from '@/utils/request' +// 新增出厂设备 +export const addEquipmentDelivery = (data: any) => { + return createAxios({ + url: '/cs-device-boot/EquipmentDelivery/addEquipmentDelivery', + method: 'POST', + data: data + }) +} + +// 删除出厂设备 +export const deleteEquipmentDelivery = (id: any) => { + let form = new FormData() + form.append('id', id) + return createAxios({ + url: '/cs-device-boot/EquipmentDelivery/AuditEquipmentDelivery', + method: 'POST', + data: form + }) +} + +// 恢复出厂设置 +export const resetEquipmentDelivery = (id: any) => { + let form = new FormData() + form.append('nDid', id) + return createAxios({ + url: '/access-boot/device/resetFactory', + method: 'POST', + data: form + }) +} + +// 编辑出厂设备 + +export const editEquipmentDelivery = (data: any) => { + return createAxios({ + url: '/cs-device-boot/EquipmentDelivery/updateEquipmentDelivery', + method: 'POST', + data: data + }) +} + +// 上传拓扑图 +export const uploadTopo = (file: any) => { + let form = new FormData() + form.append('file', file) + return createAxios({ + url: '/cs-device-boot/topologyTemplate/uploadImage', + method: 'POST', + headers: { + 'Content-Type': 'multipart/form-data' + }, + data: form + }) +} +// 批量导入设备 +export const batchImportDevice = (file: any) => { + let form = new FormData() + form.append('file', file) + return createAxios({ + url: '/cs-device-boot/EquipmentDelivery/importEquipment', + method: 'POST', + responseType: 'blob', + data: form + }) +} diff --git a/src/utils/request.ts b/src/utils/request.ts index deaf740..49283dc 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -87,7 +87,11 @@ function createAxios>( response => { removePending(response.config) options.loading && closeLoading(options) // 关闭loading - if (response.data.code === 'A0000') { + if ( + response.data.code === 'A0000' || + response.data.type === 'application/json' || + response.data.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + ) { return options.reductDataFormat ? response.data : response } else if (response.data.code == 'A0202') { if (!window.tokenRefreshing) { diff --git a/src/views/govern/device/disposition/index.vue b/src/views/govern/device/disposition/index.vue index fded7f9..261f23c 100644 --- a/src/views/govern/device/disposition/index.vue +++ b/src/views/govern/device/disposition/index.vue @@ -4,7 +4,7 @@
{{ user.name }} diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue index 617ba11..ba15735 100644 --- a/src/views/govern/manage/factory.vue +++ b/src/views/govern/manage/factory.vue @@ -4,7 +4,12 @@ + - +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
{{ deivce.mac }}
+ 二维码加载失败 +
+ diff --git a/src/views/user/login.vue b/src/views/user/login.vue index 599e829..caac98d 100644 --- a/src/views/user/login.vue +++ b/src/views/user/login.vue @@ -46,7 +46,6 @@ round type="info" @click="onSubmit(formRef)" - > 登录 @@ -113,7 +112,6 @@ const focusInput = () => { } onMounted(() => { - timer = window.setTimeout(() => { pageBubble.init() }, 0) @@ -139,8 +137,10 @@ const onSubmit = async (formEl: FormInstance | undefined) => { imageCode: '', verifyCode: 0 }).then(res => { - console.log('🚀 ~ file: login.vue:134 ~ gongkey ~ res:', res) - + // console.log('🚀 ~ file: login.vue:134 ~ gongkey ~ res:', res) + let DOMIN = window.location.origin + let STATIC_URL = DOMIN + '/api/system-boot/image/toStream?bgImage=' + localStorage.setItem('STATIC_URL', STATIC_URL) userInfo.setToken(res.data.token_type + ' ' + res.data.access_token, 'auth') state.submitLoading = false router.push({