Commit b5acf296 authored by 郭铭瑶's avatar 郭铭瑶 🤘

按UI建议修改

parent a64b43cb
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
itemStyle: { itemStyle: {
color: 'gold' color: 'gold'
}, },
symbolSize: 20 * this.sizeRate, symbolSize: 14 * this.sizeRate,
symbol: 'pin', symbol: 'pin',
}] }]
this.map && this.map.setOption(this.config) this.map && this.map.setOption(this.config)
......
...@@ -88,7 +88,7 @@ export default { ...@@ -88,7 +88,7 @@ export default {
color: '#fff', color: '#fff',
}, },
inRange: { inRange: {
color: ['green', 'yellow', 'red'] color: ['#46e016', 'gold', '#ff2424']
} }
}, },
series: [], series: [],
......
...@@ -247,7 +247,7 @@ export default { ...@@ -247,7 +247,7 @@ export default {
itemStyle: { itemStyle: {
color: 'gold' color: 'gold'
}, },
symbolSize: 20 * this.sizeRate, symbolSize: 15 * this.sizeRate,
symbol: 'pin', symbol: 'pin',
geoIndex: 0, geoIndex: 0,
}) })
......
...@@ -59,12 +59,13 @@ export default { ...@@ -59,12 +59,13 @@ export default {
return { return {
showChart: false, showChart: false,
config: { config: {
colors: ['#38fd8d', '#8c7eee', '#f3ff33', '#ffb529', '#ff4747', '#47B3FF'], // colors: ['#38fd8d', '#8c7eee', '#f3ff33', '#ffb529', '#ff4747', '#47B3FF'],
colors: ['#19d6ff', '#ffec47', '#ffae00', '#8c7eee', '#2f60ff', '#2f8cff'],
legend: { legend: {
hide: true, hide: true,
}, },
shape: [ shape: [
{type: 'pie', radius: [35 * Number((screen.height / 800).toFixed(1)), 55 * Number((screen.height / 800).toFixed(1))], startAngle: 0, label: {show: true, fontSize: 12 * Number((screen.height / 800).toFixed(1)), formatter: '{b}: {c}万吨'}} {type: 'pie', radius: [35 * Number((screen.height / 800).toFixed(1)), 55 * Number((screen.height / 800).toFixed(1))], startAngle: 0, label: {show: true, fontSize: 12 * Number((screen.height / 800).toFixed(1)), formatter: '{b} ({d}%)\n{c}万吨'}}
] ]
}, },
data: [], data: [],
......
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
return { return {
showChart: false, showChart: false,
config: { config: {
colors: ['#feec40', '#05bbfd', '#fe4949'], colors: ['#00c0ff', '#644fff', '#ff4a4a'],
tooltip: { tooltip: {
confine: true, confine: true,
trigger: 'item', trigger: 'item',
......
...@@ -11,7 +11,8 @@ export default { ...@@ -11,7 +11,8 @@ export default {
return { return {
showChart: false, showChart: false,
config: { config: {
colors: ['#0f4aff', '#ff9e45', '#edfe63', '#8f45ee', '#05f8e8'], // colors: ['#0f4aff', '#ff9e45', '#edfe63', '#8f45ee', '#05f8e8'],
colors: ['#01a6ff', '#fff440', '#ffac40', '#406dff', '#6a42ff'],
tooltip: { tooltip: {
formatter: '{b}:{c}家 ({d}%)', formatter: '{b}:{c}家 ({d}%)',
confine: true, confine: true,
...@@ -28,8 +29,8 @@ export default { ...@@ -28,8 +29,8 @@ export default {
{name: '江苏', value: 1241}, {name: '江苏', value: 1241},
{name: '湖北', value: 807}, {name: '湖北', value: 807},
{name: '江西', value: 450}, {name: '江西', value: 450},
{name: '海南', value: 14},
{name: '河南', value: 178}, {name: '河南', value: 178},
{name: '海南', value: 14},
], ],
} }
}, },
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<div> <div>
<p class="title"><span/>面积</p> <p class="title"><span/>面积</p>
<div> <div>
<m-chart :config="{...config, colors: ['#41D9C7', 'gray']}" :data="data[0]"/> <m-chart :config="{...config, colors: ['#02efd7', 'gray']}" :data="data[0]"/>
<m-chart :config="{...config, colors: ['#2FC25B', '#FACC14', '#E6965C', '#223273', '#7564CC', '#5CA3E6', '#F04864', '#D598D9']}" :data="data[1]"/> <m-chart :config="{...config, colors: ['#00c6c7', '#f59946', '#45dbf6', '#44b0f2', '#4777f5', '#4f45f7', '#af43f7', '#fb43f2'],}" :data="data[1]"/>
<span class="pointer"/> <span class="pointer"/>
<span class="pointer"/> <span class="pointer"/>
</div> </div>
...@@ -121,7 +121,8 @@ export default { ...@@ -121,7 +121,8 @@ export default {
type: '水稻', type: '水稻',
options: ['水稻', '水产品'], options: ['水稻', '水产品'],
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'],
legend: { legend: {
hide: true, hide: true,
}, },
...@@ -135,7 +136,8 @@ export default { ...@@ -135,7 +136,8 @@ export default {
}, },
data: mock[0].data1, data: mock[0].data1,
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'],
legend: { legend: {
hide: true, hide: true,
}, },
...@@ -149,7 +151,8 @@ export default { ...@@ -149,7 +151,8 @@ export default {
}, },
data2: mock[0].data2, data2: mock[0].data2,
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'],
legend: { legend: {
hide: true, hide: true,
}, },
......
...@@ -39,12 +39,13 @@ export default { ...@@ -39,12 +39,13 @@ export default {
return { return {
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'],
legend: { legend: {
hide: true, hide: true,
}, },
tooltip: { tooltip: {
formatter: '{b}:{c}亩', formatter: '{b}<br/>{c}亩 ({d}%)',
confine: true, confine: true,
}, },
shape: [ shape: [
...@@ -63,12 +64,13 @@ export default { ...@@ -63,12 +64,13 @@ export default {
{name: '其他', value: 0}, {name: '其他', value: 0},
], ],
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'],
legend: { legend: {
hide: true, hide: true,
}, },
tooltip: { tooltip: {
formatter: '{b}:{c}吨', formatter: '{b}<br/>{c}吨 ({d}%)',
confine: true, confine: true,
}, },
shape: [ shape: [
...@@ -87,12 +89,13 @@ export default { ...@@ -87,12 +89,13 @@ export default {
{name: '其他', value: 0}, {name: '其他', value: 0},
], ],
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'],
legend: { legend: {
hide: true, hide: true,
}, },
tooltip: { tooltip: {
formatter: '{b}:{c}万元', formatter: '{b}<br/>{c}万元 ({d}%)',
confine: true, confine: true,
}, },
shape: [ shape: [
......
...@@ -249,7 +249,7 @@ export default { ...@@ -249,7 +249,7 @@ export default {
itemStyle: { itemStyle: {
color: 'gold' color: 'gold'
}, },
symbolSize: 20 * this.sizeRate, symbolSize: 15 * this.sizeRate,
symbol: 'pin', symbol: 'pin',
geoIndex: 0, geoIndex: 0,
}] }]
...@@ -323,7 +323,7 @@ export default { ...@@ -323,7 +323,7 @@ export default {
itemStyle: { itemStyle: {
color: 'gold' color: 'gold'
}, },
symbolSize: 20 * this.sizeRate, symbolSize: 15 * this.sizeRate,
symbol: 'pin', symbol: 'pin',
geoIndex: 0, geoIndex: 0,
}], }],
......
...@@ -275,7 +275,7 @@ export default { ...@@ -275,7 +275,7 @@ export default {
itemStyle: { itemStyle: {
color: 'gold' color: 'gold'
}, },
symbolSize: 20 * this.sizeRate, symbolSize: 15 * this.sizeRate,
symbol: 'pin', symbol: 'pin',
geoIndex: 0, geoIndex: 0,
}] }]
...@@ -348,7 +348,7 @@ export default { ...@@ -348,7 +348,7 @@ export default {
itemStyle: { itemStyle: {
color: 'gold' color: 'gold'
}, },
symbolSize: 20 * this.sizeRate, symbolSize: 15 * this.sizeRate,
symbol: 'pin', symbol: 'pin',
geoIndex: 0, geoIndex: 0,
}], }],
......
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