diff --git a/src/components/baozuo-demo/BottomCharts.vue b/src/components/baozuo-demo/BottomCharts.vue index 3096eba..4be8a60 100644 --- a/src/components/baozuo-demo/BottomCharts.vue +++ b/src/components/baozuo-demo/BottomCharts.vue @@ -1,22 +1,21 @@ @@ -90,7 +155,7 @@ export default { position: relative; .bc-chart-item { - width: 50%; + width: 100%; height: 100%; padding-top: 20px; box-sizing: border-box; @@ -122,4 +187,37 @@ export default { left: 0%; } } +.circle-progress { + top: 50%; + transform: translateY(-50%); + width: 50px; + height: 50px; + border-radius: 50%; + position: relative; + // background: conic-gradient(from 90deg at 50% 50%, transparent 0, rgba(18, 3, 117, 0.107) 0); + transition: all 0.5s ease; + border: 6px solid; + } +.circle-content { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + font-size: 0.16rem; + color: #333; +} +.circle-img{ + width: 80%; + height: 80%; + background-image: url('./img/icon_success.png'); + background-repeat: no-repeat; + background-size:contain; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} +.ceil{ + font-size: 0.2rem; +} diff --git a/src/components/baozuo-demo/LeftChart1.vue b/src/components/baozuo-demo/LeftChart1.vue index fc7d026..ea202e1 100644 --- a/src/components/baozuo-demo/LeftChart1.vue +++ b/src/components/baozuo-demo/LeftChart1.vue @@ -51,10 +51,20 @@ export default { xAxis: { type: 'category', boundaryGap: false, + axisLine:{ + lineStyle:{ + color:'#fff' + } + }, data: ['12-06', '12-07', '12-08', '12-09', '12-10', '12-11', '12-12'] }, yAxis: { - type: 'value' + type: 'value', + axisLine:{ + lineStyle:{ + color:'#fff' + } + }, }, series: [ { diff --git a/src/components/baozuo-demo/LeftChart2.vue b/src/components/baozuo-demo/LeftChart2.vue index 73df539..6ab53da 100644 --- a/src/components/baozuo-demo/LeftChart2.vue +++ b/src/components/baozuo-demo/LeftChart2.vue @@ -30,6 +30,9 @@ export default { title: { text: '月生产情况', subtext: '完成率', + subtextStyle:{ + color:'#fff' + }, textStyle:{ color:'#fff' } @@ -46,16 +49,26 @@ export default { toolbox: { }, calculable: true, - xAxis: [ - { + xAxis:[ + { type: 'category', + axisLine:{ + lineStyle:{ + color:'#fff' + } + }, // prettier-ignore - data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'] - } + data: ['6月', '7月', '8月', '9月', '10月', '11月'], + }, ], yAxis: [ { - type: 'value' + type: 'value', + axisLine:{ + lineStyle:{ + color:'#fff' + } + }, } ], series: [ @@ -63,7 +76,7 @@ export default { name: '机芯1线', type: 'bar', data: [ - 80, 85, 98, 95, 87, 75, 65, 68, 69, 40, 82, 83 + 75, 65, 68, 69, 40, 82 ], markPoint: { data: [ diff --git a/src/components/baozuo-demo/img/icon_success.png b/src/components/baozuo-demo/img/icon_success.png new file mode 100644 index 0000000..367a381 Binary files /dev/null and b/src/components/baozuo-demo/img/icon_success.png differ