From 572cdc60b3d782ba87ff68b43ec3a8281985a7c8 Mon Sep 17 00:00:00 2001 From: duyufeng Date: Mon, 2 Sep 2024 13:41:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=98=B2=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemManage/systemMenu/editSystemMenu.vue | 34 +++++++++++++++------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue b/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue index bf2f96e..96ad62a 100644 --- a/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue +++ b/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue @@ -107,6 +107,7 @@ const redirectIsshow = ref(true);//重定向路由是否显示 const keepAliveIsshow = ref(false);//缓存是否显示 const hideChildrenIsshow = ref(true);//是否隐藏子级是否显示 + let isClicked = ref(true);//增加防重复点击 interface FormState { menuName: string; previousMenu:string; @@ -161,6 +162,7 @@ const onClose = () => { visible.value = false; formRef.value.resetFields(); + isClicked.value = true; }; //菜单类型按钮切换 const chanageMenuType = (e:any,typeMenu:any)=>{ @@ -247,21 +249,33 @@ params.hideChildren = formState.value.hideChildren;//是否隐藏子级 } if(addOrEditType.value==1){//新增 - http.post(menuS.queryMenuPageAdd, params).then(() => { - NsMessage.success('操作成功'); - visible.value = !visible.value; - emit("editObject",formState) - }); + if(isClicked.value){ + isClicked.value = false; + http.post(menuS.queryMenuPageAdd, params).then(() => { + visible.value = !visible.value; + emit("editObject",formState); + NsMessage.success('操作成功'); + setTimeout(() => { + isClicked.value = !visible.value; + }, 500); + }); + } }else{ params.permissionId = currentLineData.value.permissionId; params.createTime = currentLineData.value.createTime; params.updateTime = currentLineData.value.updateTime; params.isDelete = currentLineData.value.isDelete; - http.post(menuS.queryMenuPageEdit, params).then(() => { - NsMessage.success('操作成功'); - visible.value = !visible.value; - emit("editObject",formState) - }); + if(isClicked.value){ + isClicked.value = false; + http.post(menuS.queryMenuPageEdit, params).then(() => { + visible.value = !visible.value; + emit("editObject",formState); + NsMessage.success('操作成功'); + setTimeout(() => { + isClicked.value = !visible.value; + }, 500); + }); + } } }) } From 01745cea4294f193931abfbb4ba24004879b3b1f Mon Sep 17 00:00:00 2001 From: duyufeng Date: Mon, 2 Sep 2024 13:57:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue b/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue index 96ad62a..59de87d 100644 --- a/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue +++ b/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue @@ -349,7 +349,8 @@ formState.value.perissionBtn = record.label; formState.value.menuJumpUrl = record.component; formState.value.menuRedirect = record.redirect.name; - + formState.value.keepAlive = record.keepAlive; + formState.value.hideChildren = record.hideChildren; } } From 228f13d0377e925bae6df83e0462e93263de2afe Mon Sep 17 00:00:00 2001 From: duyufeng Date: Mon, 2 Sep 2024 14:26:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/saas/view/system/login.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/saas/view/system/login.vue b/lib/saas/view/system/login.vue index ab55372..9140d6d 100644 --- a/lib/saas/view/system/login.vue +++ b/lib/saas/view/system/login.vue @@ -80,7 +80,7 @@ import { storeToRefs } from 'pinia'; import { NsMessage } from '/nerv-lib/component'; import { replyDynamRoutesPath } from '/nerv-lib/util/dynamicRoutesss'; - import { Enobscure, Deobscure } from '/nerv-lib/util/crypto'; + // import { Enobscure, Deobscure } from '/nerv-lib/util/crypto'; export default defineComponent({ name: 'UserLogin', @@ -127,7 +127,8 @@ const submit = (value): void => { let data = JSON.stringify({ accountNo: userName.value.trim(), - password: Enobscure(password.value.trim()), + password: password.value.trim() + // password: Enobscure(password.value.trim()),//登录密码加密处理，待前后端代码合并一致后再放开 }); validator(null, value?.code) .then(() => {