diff --git a/frontend/src/views/system/manage/index.vue b/frontend/src/views/system/manage/index.vue index a785124..7b37300 100644 --- a/frontend/src/views/system/manage/index.vue +++ b/frontend/src/views/system/manage/index.vue @@ -120,17 +120,19 @@ function menuclick(name:any){ color: #383838; } :deep(.ed-button){ - border-color: #dcdfe6; + border-color: #dcdfe6 !important; + background-color:#ffffff !important; + color: #1f2329 !important; } :deep(.ed-button--primary){ - background-color:#409eff; - color: #ffffff; - border-color: #409eff; + background-color:#409eff !important; + color: #ffffff !important; + border-color: #409eff !important; } :deep(.ed-button.is-disabled){ - background: #ffffff; - color:#C9C9C9; - border-color: #f2f2f2; + background: #ffffff !important; + color:#C9C9C9 !important; + border-color: #f2f2f2 !important; } :deep(.ed-button.is-disabled, .ed-button.is-disabled:focus, .ed-button.is-disabled:hover){ background: #ffffff; diff --git a/frontend/src/views/system/userlogin/appframe_container.vue b/frontend/src/views/system/userlogin/appframe_container.vue index 4e3dd02..63ac548 100644 --- a/frontend/src/views/system/userlogin/appframe_container.vue +++ b/frontend/src/views/system/userlogin/appframe_container.vue @@ -21,9 +21,6 @@ const router = useRouter() const sfcCode = ref(defaultTemplate) const previewContainer:any = ref(null) let prevApp:any = null -const projectName:any = ref('') -const applicationId:any = ref('') -const menuList:any= ref([]) // 增强的Base64转换函数 const convertToBase64 = async (imagePath:any) => { try { @@ -119,8 +116,6 @@ const runCode = async () => { const componentModule:any = await loadModule('dynamic.vue', options) const component = componentModule.default || componentModule const dynamicProps = Vue.reactive({ - menuList: menuList.value, - applicationId: applicationId.value, }) // 修改createApp方式 prevApp = Vue.createApp({ @@ -147,40 +142,9 @@ const runCode = async () => { } } onMounted(() => { - const appInfo:any = JSON.parse(localStorage.getItem('userInfo')) - if (appInfo.id) { - applicationId.value = appInfo.id - getmenuinfo() - } -}) -function gettreeData(orglist:any) { - const res:any = {}; - for (const row of orglist) { - // 处理 parentid 并解构需要字段 - const parentid = row.parentid || "0"; - const { id, name,code, isdisplay, appId, type,module_id,module_type } = row; - // 统一节点数据对象 - const nodeData = { parentid, id, name,code, isdisplay, appId, type,module_id,module_type } - // 更新或创建节点 - if (res[id]) { - Object.assign(res[id], nodeData); - } else { - res[id] = { ...nodeData, children: [] }; - } - // 处理父子关系 - if (res[parentid]) { - res[parentid].children.push(res[id]); - } else { - res[parentid] = { children: [res[id]] }; - } - } - return res[0].children; -} -function getmenuinfo() { - const permissions:any = JSON.parse(localStorage.getItem('permissions')) - menuList.value = gettreeData(permissions) runCode() -} +}) +