Commit 3911c170 authored by 郭铭瑶's avatar 郭铭瑶 🤘

调整

parent b5acf296
...@@ -17,8 +17,11 @@ export default { ...@@ -17,8 +17,11 @@ export default {
return (path === '/quality-safety' || path === '/seedling') return (path === '/quality-safety' || path === '/seedling')
? ({ ? ({
'background': `url(${require('./assets/images/bg.jpeg')})`, 'background': `url(${require('./assets/images/bg.jpeg')})`,
'background-size': 'cover', 'background-size': '120%',
'background-position': 'center', 'background-position': '30% 80%',
// 'background': `url(${require('./assets/images/bg.jpeg')})`,
// 'background-size': 'cover',
// 'background-position': 'center',
}) })
: ({}) : ({})
} }
...@@ -30,8 +33,8 @@ export default { ...@@ -30,8 +33,8 @@ export default {
#app #app
background url('./assets/images/bg.png') background url('./assets/images/bg.png')
background-repeat no-repeat background-repeat no-repeat
background-size 110% background-size 120%
background-position 90% -50% background-position 40% -80%
.router-view .router-view
height calc(100% - 4rem) height calc(100% - 4rem)
</style> </style>
......
...@@ -104,7 +104,7 @@ export default { ...@@ -104,7 +104,7 @@ export default {
}, },
axisLabel: { axisLabel: {
textStyle: { textStyle: {
color: 'red', color: '#00d2ff',
}, },
fontSize: this.fontSize, fontSize: this.fontSize,
}, },
...@@ -158,7 +158,7 @@ export default { ...@@ -158,7 +158,7 @@ export default {
const list = mock.filter(item => item.disease === disease).reverse() const list = mock.filter(item => item.disease === disease).reverse()
this.option.series = [ this.option.series = [
{name: '阳性监测点数量', itemStyle: {color: 'gold'}, type: 'line', data: list.map(item => item.data1)}, {name: '阳性监测点数量', itemStyle: {color: 'gold'}, type: 'line', data: list.map(item => item.data1)},
{name: '阳性样品数量', itemStyle: {color: 'red'}, yAxisIndex: 1, type: 'line', data: list.map(item => item.data2)}, {name: '阳性样品数量', itemStyle: {color: '#00d2ff'}, yAxisIndex: 1, type: 'line', data: list.map(item => item.data2)},
] ]
const max = Math.max(...list.map(item => item.data1), ...list.map(item => item.data2)) const max = Math.max(...list.map(item => item.data1), ...list.map(item => item.data2))
this.option.yAxis[0].max = max this.option.yAxis[0].max = max
......
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
color: '#fff', color: '#fff',
}, },
inRange: { inRange: {
color: ['green', 'yellow', 'red'] color: ['#46e016', 'gold', '#ff2424']
} }
}, },
series: [], series: [],
......
<template> <template>
<div class="mode-rate"> <div class="mode-rate">
<div class="legend"> <!-- <div class="legend">
<p v-for="(item, i) in data" :key="item.name"><span :style="`background:${config.colors[i]}`"/> {{item.name}}</p> <p v-for="(item, i) in data" :key="item.name"><span :style="`background:${config.colors[i]}`"/> {{item.name}}</p>
</div> </div> -->
<div class="chart-wrapper" v-if="showChart"> <div class="chart-wrapper" v-if="showChart">
<div> <div>
<p class="title"><span/>面积</p> <p class="title"><span/>面积</p>
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
</div> </div>
<div> <div>
<p class="title"><span/>水稻产值</p> <p class="title"><span/>水稻产值</p>
<m-chart style="z-index:99;" :config="config3" :data="data3"/> <m-chart style="z-index:99;" :config="{...config3, colors: config2.colors}" :data="data3"/>
<div class="border" /> <div class="border" />
</div> </div>
<div> <div>
<p class="title"><span/>水产品产量</p> <p class="title"><span/>水产品产量</p>
<m-chart style="z-index:99;" :config="config2" :data="data4"/> <m-chart style="z-index:99;" :config="{...config2, colors: config3.colors}" :data="data4"/>
<div class="border" /> <div class="border" />
</div> </div>
<div> <div>
...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
showChart: false, showChart: false,
config: { config: {
// colors: ['#41D9C7', '#2FC25B', '#FACC14', '#E6965C', '#223273', '#7564CC', '#5CA3E6', '#F04864', '#D598D9'], // colors: ['#41D9C7', '#2FC25B', '#FACC14', '#E6965C', '#223273', '#7564CC', '#5CA3E6', '#F04864', '#D598D9'],
colors: ['#02efd7', '#00c6c7', '#f59946', '#45dbf6', '#44b0f2', '#4777f5', '#4f45f7', '#af43f7', '#fb43f2'], colors: ['#21f4f9', '#2182f9', '#f59946', '#45dbf6', '#44b0f2', '#4777f5', '#4f45f7', '#af43f7', '#fb43f2'],
legend: { legend: {
hide: true, hide: true,
}, },
...@@ -54,8 +54,8 @@ export default { ...@@ -54,8 +54,8 @@ export default {
}, },
data: [ data: [
{name: '稻小龙虾', value: 19824}, {name: '稻小龙虾', value: 19824},
{name: '稻青虾', value: 0},
{name: '稻蟹', value: 780}, {name: '稻蟹', value: 780},
{name: '稻青虾', value: 0},
{name: '稻鲤', value: 0}, {name: '稻鲤', value: 0},
{name: '稻鳅', value: 0}, {name: '稻鳅', value: 0},
{name: '稻鳖', value: 0}, {name: '稻鳖', value: 0},
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
], ],
config2: { config2: {
// colors: ['#41D9C7', '#2FC25B', '#FACC14', '#E6965C', '#223273', '#7564CC', '#5CA3E6', '#F04864', '#D598D9'], // colors: ['#41D9C7', '#2FC25B', '#FACC14', '#E6965C', '#223273', '#7564CC', '#5CA3E6', '#F04864', '#D598D9'],
colors: ['#02efd7', '#00c6c7', '#f59946', '#45dbf6', '#44b0f2', '#4777f5', '#4f45f7', '#af43f7', '#fb43f2'], colors: ['#ffda30', '#31d7ff', '#f59946', '#45dbf6', '#44b0f2', '#4777f5', '#4f45f7', '#af43f7', '#fb43f2'],
legend: { legend: {
hide: true, hide: true,
}, },
...@@ -79,8 +79,8 @@ export default { ...@@ -79,8 +79,8 @@ export default {
}, },
data2: [ data2: [
{name: '稻小龙虾', value: 10650.02}, {name: '稻小龙虾', value: 10650.02},
{name: '稻青虾', value: 0},
{name: '稻蟹', value: 385.28}, {name: '稻蟹', value: 385.28},
{name: '稻青虾', value: 0},
{name: '稻鲤', value: 0}, {name: '稻鲤', value: 0},
{name: '稻鳅', value: 0}, {name: '稻鳅', value: 0},
{name: '稻鳖', value: 0}, {name: '稻鳖', value: 0},
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
], ],
config3: { config3: {
// colors: ['#41D9C7', '#2FC25B', '#FACC14', '#E6965C', '#223273', '#7564CC', '#5CA3E6', '#F04864', '#D598D9'], // colors: ['#41D9C7', '#2FC25B', '#FACC14', '#E6965C', '#223273', '#7564CC', '#5CA3E6', '#F04864', '#D598D9'],
colors: ['#02efd7', '#00c6c7', '#f59946', '#45dbf6', '#44b0f2', '#4777f5', '#4f45f7', '#af43f7', '#fb43f2'], colors: ['#4f7aed', '#ffa820', '#f59946', '#45dbf6', '#44b0f2', '#4777f5', '#4f45f7', '#af43f7', '#fb43f2'],
legend: { legend: {
hide: true, hide: true,
}, },
...@@ -104,8 +104,8 @@ export default { ...@@ -104,8 +104,8 @@ export default {
}, },
data3: [ data3: [
{name: '稻小龙虾', value: 3863}, {name: '稻小龙虾', value: 3863},
{name: '稻青虾', value: 0},
{name: '稻蟹', value: 316}, {name: '稻蟹', value: 316},
{name: '稻青虾', value: 0},
{name: '稻鲤', value: 0}, {name: '稻鲤', value: 0},
{name: '稻鳅', value: 0}, {name: '稻鳅', value: 0},
{name: '稻鳖', value: 0}, {name: '稻鳖', value: 0},
...@@ -115,8 +115,8 @@ export default { ...@@ -115,8 +115,8 @@ export default {
], ],
data4: [ data4: [
{name: '稻小龙虾', value: 2305.104}, {name: '稻小龙虾', value: 2305.104},
{name: '稻青虾', value: 0},
{name: '稻蟹', value: 75.546}, {name: '稻蟹', value: 75.546},
{name: '稻青虾', value: 0},
{name: '稻鲤', value: 0}, {name: '稻鲤', value: 0},
{name: '稻鳅', value: 0}, {name: '稻鳅', value: 0},
{name: '稻鳖', value: 0}, {name: '稻鳖', value: 0},
...@@ -126,8 +126,8 @@ export default { ...@@ -126,8 +126,8 @@ export default {
], ],
data5: [ data5: [
{name: '稻小龙虾', value: 8190}, {name: '稻小龙虾', value: 8190},
{name: '稻青虾', value: 0},
{name: '稻蟹', value: 334}, {name: '稻蟹', value: 334},
{name: '稻青虾', value: 0},
{name: '稻鲤', value: 0}, {name: '稻鲤', value: 0},
{name: '稻鳅', value: 0}, {name: '稻鳅', value: 0},
{name: '稻鳖', value: 0}, {name: '稻鳖', value: 0},
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
.border .border
width 8rem width 8rem
height @width height @width
border 0.2rem solid #00f2ff border 0.2rem solid transparent
position absolute position absolute
top 50% top 50%
left 50% left 50%
...@@ -179,6 +179,18 @@ export default { ...@@ -179,6 +179,18 @@ export default {
border-radius 50% border-radius 50%
box-shadow 0 0 1rem 0.2rem rgba(255,255,255,0.3), inset 0 0 1rem 0.2rem rgba(255,255,255,0.3) box-shadow 0 0 1rem 0.2rem rgba(255,255,255,0.3), inset 0 0 1rem 0.2rem rgba(255,255,255,0.3)
opacity .9 opacity .9
&:nth-of-type(2)
.border
border-color #f6d633
&:nth-of-type(3)
.border
border-color #36d4f5
&:nth-of-type(4)
.border
border-color #4b78e2
&:nth-of-type(5)
.border
border-color #e39e2c
.title .title
position absolute position absolute
left 1rem left 1rem
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment