From 10f92a1a8bfdf4227f4115a558486b5cf8fa2090 Mon Sep 17 00:00:00 2001 From: lijingjia Date: Fri, 16 Aug 2024 14:53:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +++--- .env.production | 12 ++++++++++-- src/views/system/permission/columns.tsx | 3 +++ src/views/system/tenant/PermissionSetStep.vue | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.env.development b/.env.development index 05d8f17..91a500e 100644 --- a/.env.development +++ b/.env.development @@ -7,14 +7,14 @@ VITE_PUBLIC_PATH = / # Cross-domain proxy, you can configure multiple # Please note that no line breaks # VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]] -VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666cxf.com/stage-api"]] # 开发 测试环境 +VITE_PROXY=[["/api","http://118.190.144.189:3008"],["/stage-api","https://www.666cxf.com/stage-api"]] # 开发 测试环境 # Delete console VITE_DROP_CONSOLE = true # 后台接口父地址(必填) -VITE_GLOB_API_URL=http://localhost:3008 -# VITE_GLOB_API_URL="/api" # 开发 测试环境 +# VITE_GLOB_API_URL=http://localhost:3008 +VITE_GLOB_API_URL="/api" # 开发 测试环境 # File upload address， optional #VITE_GLOB_UPLOAD_URL=http://localhost:8091/api/Common/UploadFile diff --git a/.env.production b/.env.production index a701f3d..8bd8524 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,11 @@ +### + # @Author: lijingjia lijj_xl@163.com + # @Date: 2024-07-03 09:12:56 + # @LastEditors: lijingjia lijj_xl@163.com + # @LastEditTime: 2024-07-27 11:44:16 + # @FilePath: \ds-admin-web\ds-wms-admin-web\.env.production + # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE +### # Whether to open mock VITE_USE_MOCK = false @@ -16,13 +24,13 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false # Basic interface address SPA -VITE_GLOB_API_URL=http://60.209.125.238:3008 +VITE_GLOB_API_URL=http://118.190.144.189:3008 # File upload address， optional VITE_GLOB_UPLOAD_URL=http://47.104.255.182:8091/api/VW_INFO_FILES/CommonUpload # 预览地址 -VITE_GLOB_VIEW_URL=http://60.209.125.238:3012 +VITE_GLOB_VIEW_URL=http://118.190.144.189:3012 # Interface prefix VITE_GLOB_API_URL_PREFIX= diff --git a/src/views/system/permission/columns.tsx b/src/views/system/permission/columns.tsx index e189b9d..bd6999a 100644 --- a/src/views/system/permission/columns.tsx +++ b/src/views/system/permission/columns.tsx @@ -104,6 +104,9 @@ export const formSchema: FormSchema[] = [ { label: '按钮/权限', value: 3 }, ], onChange: (e) => { + if (e == 1) { + formModel.parentId = 0 + } // const { updateSchema, clearValidate } = formActionType // const label = isButton(e) ? '按钮/权限' : '菜单名称' // //清除校验 diff --git a/src/views/system/tenant/PermissionSetStep.vue b/src/views/system/tenant/PermissionSetStep.vue index be710c4..2fc1b6d 100644 --- a/src/views/system/tenant/PermissionSetStep.vue +++ b/src/views/system/tenant/PermissionSetStep.vue @@ -101,7 +101,7 @@ // } checkedKeys.value.forEach((e) => { if (e == item.key) { - item.disableCheckbox = true + item.disableCheckbox = false } }) if (item.children) {