From c430478319aec19b7d317bb9e1b9eeadc6b5844e Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Mon, 3 Apr 2023 17:00:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E8=81=94=E5=8A=A8-=E6=89=A7=E8=A1=8C=E5=8A=A8=E4=BD=9C-?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=A7=E5=93=81=EF=BC=9B=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83=E6=97=A0=E6=B3=95=E8=A7=A3?= =?UTF-8?q?=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/account/center.ts | 1 + src/utils/request.ts | 2 +- .../Scene/Save/action/Device/device/index.vue | 15 +++++++++++++++ src/views/system/Apply/index.vue | 2 +- vite.config.ts | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/api/account/center.ts b/src/api/account/center.ts index 2a6eacc7..8faebadd 100644 --- a/src/api/account/center.ts +++ b/src/api/account/center.ts @@ -1,4 +1,5 @@ import server from '@/utils/request' +import { BASE_API_PATH } from '@/utils/variable' export const getSsoBinds_api = (): any =>server.get(`/application/sso/me/bindings`) diff --git a/src/utils/request.ts b/src/utils/request.ts index b2c72b21..2174df10 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -203,7 +203,7 @@ request.interceptors.response.use(response => { }, errorHandler) export default { - request: axios, + request, post, get, patch, diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue index b5a1f4c1..1a04129c 100644 --- a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue +++ b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue @@ -258,6 +258,10 @@ const onSelectorChange = (val: string) => { modelRef.selector = val; }; +/** + * 切换设备 + * @param _detail + */ const onDeviceChange = (_detail: any) => { if (_detail) { if (_detail.id) { @@ -269,10 +273,16 @@ const onDeviceChange = (_detail: any) => { modelRef.deviceId = ''; modelRef.selectorValues = [] as any; } + modelRef.upperKey = '' emits('save', unref(modelRef), { name: _detail.name }); } }; +/** + * 变量选择 + * @param val + * @param options + */ const onRelationChange = (val: any, options: any) => { modelRef.deviceId = 'deviceId'; modelRef.source = 'upper'; @@ -281,6 +291,11 @@ const onRelationChange = (val: any, options: any) => { emits('save', unref(modelRef), { relationName: options.label }); }; +/** + * + * @param val + * @param arr + */ const onTagChange = (val: any[], arr: any[]) => { if (val) { modelRef.deviceId = 'deviceId'; diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue index cba40b5d..62fa0745 100644 --- a/src/views/system/Apply/index.vue +++ b/src/views/system/Apply/index.vue @@ -49,7 +49,7 @@ >