From 014eeba8088979cb70175c0635992414c7f7373e Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期二, 16 八月 2022 10:13:30 +0800 Subject: [PATCH] Default Changelist --- src/views/doublePrevent/dpIndex/index.vue | 69 +++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 23 deletions(-) diff --git a/src/views/doublePrevent/dpIndex/index.vue b/src/views/doublePrevent/dpIndex/index.vue index c25b2c8..c06a0e3 100644 --- a/src/views/doublePrevent/dpIndex/index.vue +++ b/src/views/doublePrevent/dpIndex/index.vue @@ -212,7 +212,7 @@ trigger: 'item' }, legend: { - bottom: '10%', + bottom: '5%', left: 'center' }, series: [ @@ -227,8 +227,21 @@ borderWidth: 2 }, label: { - show: false, - position: 'center' + alignTo: 'labelLine', + formatter: '{name|{b}}\n{value|{c}}', + minMargin: 5, + edgeDistance: 5, + lineHeight: 15, + rich: { + name: { + fontSize: 14, + color: '#666' + } + } + }, + labelLine: { + length: 15, + maxSurfaceAngle: 80 }, emphasis: { label: { @@ -237,9 +250,6 @@ fontWeight: 'bold' } }, - labelLine: { - show: false - }, data: [ { value: 1048, name: '整改中' }, { value: 735, name: '待验收' }, @@ -247,7 +257,7 @@ { value: 484, name: '超期未整改' }, { value: 300, name: '已验收' } ], - center: ['50%','35%'] + center: ['50%','40%'] } ] }; @@ -275,7 +285,7 @@ trigger: 'item' }, legend: { - bottom: '10%', + bottom: '5%', left: 'center' }, series: [ @@ -290,8 +300,21 @@ borderWidth: 2 }, label: { - show: false, - position: 'center' + alignTo: 'labelLine', + formatter: '{name|{b}}\n{value|{c}}', + minMargin: 5, + edgeDistance: 5, + lineHeight: 15, + rich: { + name: { + fontSize: 14, + color: '#666' + } + } + }, + labelLine: { + length: 15, + maxSurfaceAngle: 80 }, emphasis: { label: { @@ -300,14 +323,11 @@ fontWeight: 'bold' } }, - labelLine: { - show: false - }, data: [ { value: 1048, name: '一般隐患' }, { value: 235, name: '重大隐患' } ], - center: ['50%','35%'] + center: ['50%','40%'] } ] }; @@ -356,9 +376,8 @@ <style scoped lang="scss"> $homeNavLengh: 8; .home-container { - /*height: calc(100vh - 144px);*/ - height: 100%; - padding: 20px; + height: calc(100vh - 144px); + /*height: 100%;*/ box-sizing: border-box; overflow: hidden; .main-cont { @@ -371,16 +390,20 @@ grid-auto-flow: row; justify-content: center; .table-item{ + height: calc(50vh - 82px); border-radius: 8px; background: #fff; - padding: 20px; + padding: 15px; .item-head{ display: flex; align-items: center; justify-content: space-between; - height: 30px; + height: 25px; margin-bottom: 20px; + line-height: 25px; + border-left: 4px solid #409eff; + padding-left: 10px; span{ font-size: 20px; color: #333; @@ -395,16 +418,16 @@ } } #riskFix{ - height: calc(50vh - 80px); + height: calc(50vh - 157px); } #riskLevel{ - height: calc(50vh - 80px); + height: calc(50vh - 157px); } .deviceTable{ - height: calc((50vh - 100px) / 3 * 2); + height: calc((50vh - 167px) / 3 * 2); } .deviceLevel{ - height: calc((50vh - 100px) / 3); + height: calc((50vh - 167px) / 3); display: grid; grid-gap: 10px; grid-template-columns: repeat(4, 1fr); -- Gitblit v1.9.2