Merge branch 'main' of git.zdool.com:xs/ggfwjsc

This commit is contained in:
姚宇浩 2024-06-19 11:45:46 +08:00
commit 21d0db8760
6 changed files with 27 additions and 27 deletions

View File

@ -73,7 +73,6 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-else v-else
:key="item.label"
:property="item.property" :property="item.property"
:label="item.label" :label="item.label"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"

View File

@ -139,7 +139,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list[1], data: data.list[1],
symbol: "diamond", symbol: "diamond",
symbolOffset: ["-25%", "-50%"], symbolOffset: ["-60%", "-50%"],
symbolSize: [19, 10], symbolSize: [19, 10],
itemStyle: { itemStyle: {
borderColor: "#2fffa4", borderColor: "#2fffa4",
@ -148,7 +148,7 @@ const getOption = () => {
}, },
{ {
z: 1, z: 1,
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
name: "县镇", name: "县镇",
type: "bar", type: "bar",
data: data.list[1], data: data.list[1],
@ -184,7 +184,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list[0], data: data.list[0],
symbol: "diamond", symbol: "diamond",
symbolOffset: [5, "-50%"], symbolOffset: ["62%", "-50%"],
symbolSize: [19, 10], symbolSize: [19, 10],
itemStyle: { itemStyle: {
borderColor: "#32ffee", borderColor: "#32ffee",
@ -195,7 +195,7 @@ const getOption = () => {
z: 2, z: 2,
name: "农村", name: "农村",
type: "bar", type: "bar",
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
data: data.list[0], data: data.list[0],
barWidth: "25%", barWidth: "25%",
label: { label: {

View File

@ -125,7 +125,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.zgffrc, data: data.zgffrc,
symbol: "diamond", symbol: "diamond",
symbolOffset: ["-20%", "-50%"], symbolOffset: ["-60%", "-50%"],
symbolSize: [17, 10], symbolSize: [17, 10],
itemStyle: { itemStyle: {
borderColor: "#2fffa4", borderColor: "#2fffa4",
@ -136,7 +136,7 @@ const getOption = () => {
z: 1, z: 1,
name: "职工医疗保险发放人次", name: "职工医疗保险发放人次",
type: "bar", type: "bar",
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
data: data.zgffrc, data: data.zgffrc,
barWidth: "18%", barWidth: "18%",
label: { label: {
@ -182,7 +182,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.cxffrc, data: data.cxffrc,
symbol: "diamond", symbol: "diamond",
symbolOffset: [4, "-50%"], symbolOffset: ["62%", "-50%"],
symbolSize: [17, 10], symbolSize: [17, 10],
itemStyle: { itemStyle: {
borderColor: "#32ffee", borderColor: "#32ffee",
@ -193,7 +193,7 @@ const getOption = () => {
z: 2, z: 2,
name: "城乡医疗保险发放人次", name: "城乡医疗保险发放人次",
type: "bar", type: "bar",
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
data: data.cxffrc, data: data.cxffrc,
barWidth: "18%", barWidth: "18%",
label: { label: {

View File

@ -241,7 +241,7 @@ const getOption = () => {
}, },
{ {
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
z: 1, z: 1,
yAxisIndex: 0, yAxisIndex: 0,
name: "特困救助人次", name: "特困救助人次",
@ -277,7 +277,7 @@ const getOption = () => {
}, },
}, },
{ {
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
z: 2, z: 2,
yAxisIndex: 0, yAxisIndex: 0,
name: "低保救助人次", name: "低保救助人次",
@ -313,7 +313,7 @@ const getOption = () => {
// }, // },
}, },
{ {
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
z: 3, z: 3,
yAxisIndex: 0, yAxisIndex: 0,
name: "低边救助人次", name: "低边救助人次",
@ -386,7 +386,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list1, data: data.list1,
symbol: "diamond", symbol: "diamond",
symbolOffset: ["-50%", "-50%"], symbolOffset: ["-140%", "-50%"],
symbolSize: [14, 8], symbolSize: [14, 8],
itemStyle: { itemStyle: {
borderColor: "#2fffa4", borderColor: "#2fffa4",
@ -400,7 +400,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list2, data: data.list2,
symbol: "diamond", symbol: "diamond",
symbolOffset: ["0", "-50%"], symbolOffset: ["0%", "-50%"],
symbolSize: [14, 8], symbolSize: [14, 8],
itemStyle: { itemStyle: {
borderColor: "#2fffa4", borderColor: "#2fffa4",
@ -414,7 +414,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list3, data: data.list3,
symbol: "diamond", symbol: "diamond",
symbolOffset: [8, "-50%"], symbolOffset: ["140%", "-50%"],
symbolSize: [14, 8], symbolSize: [14, 8],
itemStyle: { itemStyle: {
borderColor: "#32ffee", borderColor: "#32ffee",

View File

@ -209,7 +209,7 @@ const getOption = () => {
name: "困难残疾人生活补贴人数", name: "困难残疾人生活补贴人数",
data: data.list1, data: data.list1,
barWidth: 18, barWidth: 18,
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
type: "bar", type: "bar",
itemStyle: { itemStyle: {
color: { color: {
@ -234,7 +234,7 @@ const getOption = () => {
name: "护理补贴人数", name: "护理补贴人数",
data: data.list2, data: data.list2,
barWidth: 18, barWidth: 18,
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
type: "bar", type: "bar",
itemStyle: { itemStyle: {
color: { color: {
@ -312,7 +312,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list1, data: data.list1,
symbol: "diamond", symbol: "diamond",
symbolOffset: ["-25%", "-50%"], symbolOffset: ["-64%", "-50%"],
symbolSize: [18, 12], symbolSize: [18, 12],
itemStyle: { itemStyle: {
borderColor: "#2fffa4", borderColor: "#2fffa4",
@ -326,7 +326,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list2, data: data.list2,
symbol: "diamond", symbol: "diamond",
symbolOffset: [4, "-50%"], symbolOffset: ["64%", "-50%"],
symbolSize: [18, 12], symbolSize: [18, 12],
itemStyle: { itemStyle: {
borderColor: "#32ffee", borderColor: "#32ffee",

View File

@ -130,7 +130,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list1, data: data.list1,
symbol: "diamond", symbol: "diamond",
symbolOffset: ["-20%", "-50%"], symbolOffset: ["-60%", "-50%"],
symbolSize: [19, 10], symbolSize: [19, 10],
itemStyle: { itemStyle: {
borderColor: "#2fffa4", borderColor: "#2fffa4",
@ -141,7 +141,7 @@ const getOption = () => {
z: 1, z: 1,
name: "职工养老保险发放人次", name: "职工养老保险发放人次",
type: "bar", type: "bar",
barGap: "-50%", barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
data: data.list1, data: data.list1,
barWidth: "18%", barWidth: "18%",
itemStyle: { itemStyle: {
@ -187,7 +187,7 @@ const getOption = () => {
symbolPosition: "end", symbolPosition: "end",
data: data.list2, data: data.list2,
symbol: "diamond", symbol: "diamond",
symbolOffset: [4, "-50%"], symbolOffset: ["62%", "-50%"],
symbolSize: [19, 10], symbolSize: [19, 10],
itemStyle: { itemStyle: {
borderColor: "#32ffee", borderColor: "#32ffee",
@ -198,7 +198,8 @@ const getOption = () => {
name: "城乡养老保险发放人次", name: "城乡养老保险发放人次",
type: "bar", type: "bar",
data: data.list2, data: data.list2,
barGap: "-50%", // barGap: "-50%",
barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
barWidth: "18%", barWidth: "18%",
itemStyle: { itemStyle: {
color: { color: {