diff --git a/src/assets/images/侧边栏2.png b/src/assets/images/侧边栏2.png new file mode 100644 index 0000000..89f8419 Binary files /dev/null and b/src/assets/images/侧边栏2.png differ diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index e27a12f..902f180 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -186,7 +186,7 @@ export default { float: left; height: 50px !important; line-height: 50px !important; - color: #999093 !important; + color: #fff !important; padding: 0 5px !important; margin: 0 10px !important; } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 41060ef..6728b41 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -127,11 +127,10 @@ export default { height: 50px; overflow: hidden; position: relative; - background: #fff; .logoimg{ display: flex; align-items: center; - gap: .5rem; + gap: .8rem; } .logoimg img{ width: 3.69rem; @@ -149,6 +148,7 @@ export default { text-align: left; font-style: normal; text-transform: none; + } .navbarleft{ display: flex; diff --git a/src/layout/index.vue b/src/layout/index.vue index 631a16b..4293057 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -89,13 +89,15 @@ export default { .header-container { width: 100%; height: $base-header-height; - background-color: #fff; - box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08); + background-image: url("../../src/assets/images/top@1x.png"); + background-size: 100% 100%; + background-repeat: no-repeat; z-index: 1000; } .main-container { display: flex; + border-radius: 1rem; flex: 1; overflow: hidden; background-color: #FAFAFA; @@ -111,7 +113,8 @@ export default { } .breadword-container{ - border-radius: 5rem; + background-color: #fff; + border-radius: 1rem 1rem 0 0; } .content-container { diff --git a/src/views/components/all.vue b/src/views/components/all.vue index f38c83b..b6ec89d 100644 --- a/src/views/components/all.vue +++ b/src/views/components/all.vue @@ -72,7 +72,7 @@ export default { .container { display: flex; flex-direction: column; - gap: 2rem; + gap: 1.5rem; } table { diff --git a/src/views/components/function.vue b/src/views/components/function.vue index 720d065..59498ce 100644 --- a/src/views/components/function.vue +++ b/src/views/components/function.vue @@ -42,7 +42,7 @@ export default { { name: '项目分布', type: 'pie', - radius: ['40%', '70%'], + radius: ['40%', '60%'], center: ['30%', '50%'], data: [ { value: 54, name: '高贸区' , itemStyle:{color:'#36C3FB'}}, diff --git a/src/views/components/invest.vue b/src/views/components/invest.vue index dcaab4b..23184e9 100644 --- a/src/views/components/invest.vue +++ b/src/views/components/invest.vue @@ -35,19 +35,19 @@ ]; // 文本标签 const item = data.find(item => item.name === name); - return `${name} ${item.value}个 ${((item.value / 384) * 100).toFixed(1)}%`; + return `${name} ${item.value}个`; } }, series: [ { name: '项目分布', type: 'pie', - radius: ['40%', '70%'], + radius: ['40%', '60%'], center: ['30%', '50%'], data: [ { value: 54, name: '国企' , itemStyle:{color:'#36C3FB'}}, { value: 65, name: '民企' , itemStyle:{color:'#5B76F9'} }, - { value: 32, name: '外企' , itemStyle:{color:'#F08445'} }, + { value: 32, name: '外企' , itemStyle:{color:'#FAC858'} }, ], label: { show: false // 隐藏饼图内部的标签 diff --git a/src/views/components/message.vue b/src/views/components/message.vue index c753474..d1d9e29 100644 --- a/src/views/components/message.vue +++ b/src/views/components/message.vue @@ -61,6 +61,6 @@ export default { \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index a692e99..040ea95 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -174,7 +174,7 @@ export default { .allarea { width: 100%; - height: 15.5rem; + height: 14.5rem; padding: 1rem 1.5rem; }