diff --git a/env/.env.dev b/env/.env.dev index ea5dbee..fbd6442 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -8,9 +8,9 @@ VITE_API_URL = '/proxyApi' # VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 # VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 -VITE_proxyTarget = 'http://192.168.2.127:28080' # 梁超 +# VITE_proxyTarget = 'http://192.168.2.127:28080' # 梁超 # VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi' # 测试服务 -# VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务 +VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务 # VITE_proxyTarget = 'http://192.168.2.75:28080' # 盛旭 # VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型) diff --git a/src/components/EditorModel/index.vue b/src/components/EditorModel/index.vue index 0e7889d..9deb2a9 100644 --- a/src/components/EditorModel/index.vue +++ b/src/components/EditorModel/index.vue @@ -95,6 +95,7 @@ const init = reactive({ skin_url: '/tinymce/skins/ui/oxide', // skin路径,具体路径看自己的项目 editable_root: props.editable_root, height: 600, + z_index: 10000000000000000, branding: false, // 是否禁用“Powered by TinyMCE” promotion: false, //去掉 upgrade // toolbar_sticky: true, diff --git a/src/components/header/index.vue b/src/components/header/index.vue index dbaafa5..439fcc0 100644 --- a/src/components/header/index.vue +++ b/src/components/header/index.vue @@ -261,7 +261,7 @@ const isMyInfoPage = () => { position: sticky; top: 0; left: 0; - z-index: 999; + z-index: 88; /* 头部个人信息部分 */ .header-box { diff --git a/src/views/user/contract-manage/index.vue b/src/views/user/contract-manage/index.vue index e6bda9d..2f3491b 100644 --- a/src/views/user/contract-manage/index.vue +++ b/src/views/user/contract-manage/index.vue @@ -588,4 +588,8 @@ onMounted(() => { } } } + +:deep(.el-overlay) { + z-index: 99 !important; +}