From 9b7032666d105dc6abde1b8c7f1cfb2b5f1c989e Mon Sep 17 00:00:00 2001 From: odc.xiaohui <xiaohui@Q1> Date: 星期五, 17 二月 2023 11:28:11 +0800 Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0 --- src/views/systemSetting/platform/otherInterface/index.vue | 2 +- src/views/systemSetting/platform/portalSetting/index.vue | 4 ++-- src/views/layout/components/Menu/index.vue | 5 +++-- src/views/systemSetting/platform/mySetting/index.vue | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/views/layout/components/Menu/index.vue b/src/views/layout/components/Menu/index.vue index 130e9f4..fed08ae 100644 --- a/src/views/layout/components/Menu/index.vue +++ b/src/views/layout/components/Menu/index.vue @@ -90,7 +90,8 @@ const userName = sessionStorage.getItem('name'); users.getMenu({ name: userName }) .then(res => { - console.log(res) + // console.log(res) + // debugger this.menuList = res.menus; sessionStorage.setItem('user', JSON.stringify(res)); }) @@ -172,7 +173,7 @@ color: #e9eef3; background-color: #313350; font-size: 16px; - border-bottom: 1px solid #ccc; + // border-bottom: 0.5px solid #7c7979; } .el-menu-item:hover { background-color: #409EFF; diff --git a/src/views/systemSetting/platform/mySetting/index.vue b/src/views/systemSetting/platform/mySetting/index.vue index 635a85c..88b2c61 100644 --- a/src/views/systemSetting/platform/mySetting/index.vue +++ b/src/views/systemSetting/platform/mySetting/index.vue @@ -1,9 +1,9 @@ <template> <div class="mySetting"> <!-- header 椤甸潰鏍囬鎻愮ず --> - <header> + <!-- <header> <div class="header-title">绯荤粺璁剧疆 >> 闂ㄦ埛绠$悊 > 鑷畾涔夎彍鍗曡缃�</div> - </header> + </header> --> <main> <div class="main-content"> <!-- 鏁版嵁灞曠ず --> diff --git a/src/views/systemSetting/platform/otherInterface/index.vue b/src/views/systemSetting/platform/otherInterface/index.vue index b264a12..d7a18c3 100644 --- a/src/views/systemSetting/platform/otherInterface/index.vue +++ b/src/views/systemSetting/platform/otherInterface/index.vue @@ -1,7 +1,7 @@ <template> <div class="otherInterface"> <header> - <div class="headerTitle">绯荤粺璁剧疆 >> 闂ㄦ埛绠$悊 > 绗笁鏂瑰簲鐢ㄦ帴鍙g鐞�</div> + <!-- <div class="headerTitle">绯荤粺璁剧疆 >> 闂ㄦ埛绠$悊 > 绗笁鏂瑰簲鐢ㄦ帴鍙g鐞�</div> --> <div class="addInterface"> <el-button class="add button-addition" @click="handleAdd">娣诲姞绗笁鏂规帴鍙�</el-button> </div> diff --git a/src/views/systemSetting/platform/portalSetting/index.vue b/src/views/systemSetting/platform/portalSetting/index.vue index 51d08ad..bb1c11d 100644 --- a/src/views/systemSetting/platform/portalSetting/index.vue +++ b/src/views/systemSetting/platform/portalSetting/index.vue @@ -1,9 +1,9 @@ <template> <div class="log"> <header> - <div class="headerTitle"> + <!-- <div class="headerTitle"> 绯荤粺璁剧疆 >> 闂ㄦ埛绠$悊 > logo绠$悊 - </div> + </div> --> </header> <main> <div class="mainTitle">LOGO</div> -- Gitblit v1.8.0