|
@@ -176,15 +176,17 @@
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
grid: {
|
|
grid: {
|
|
|
- left: "1%",
|
|
|
|
|
- right: "1%",
|
|
|
|
|
|
|
+ left: "4%",
|
|
|
|
|
+ right: "4%",
|
|
|
top: "5%",
|
|
top: "5%",
|
|
|
bottom: "2%",
|
|
bottom: "2%",
|
|
|
containLabel: true,
|
|
containLabel: true,
|
|
|
},
|
|
},
|
|
|
xAxis: {
|
|
xAxis: {
|
|
|
type: "category",
|
|
type: "category",
|
|
|
- data: this.electricState.monthStatisticsList.map((item) => item.staData),
|
|
|
|
|
|
|
+ data: this.electricState.monthStatisticsList.map(
|
|
|
|
|
+ (item) => item.staData
|
|
|
|
|
+ ),
|
|
|
axisLine: {
|
|
axisLine: {
|
|
|
lineStyle: {
|
|
lineStyle: {
|
|
|
color: "rgba(160, 179, 214, 0.3)",
|
|
color: "rgba(160, 179, 214, 0.3)",
|
|
@@ -234,7 +236,9 @@
|
|
|
{
|
|
{
|
|
|
name: "用电量",
|
|
name: "用电量",
|
|
|
type: "bar",
|
|
type: "bar",
|
|
|
- data: this.electricState.monthStatisticsList.map((item) => item.count),
|
|
|
|
|
|
|
+ data: this.electricState.monthStatisticsList.map(
|
|
|
|
|
+ (item) => item.count
|
|
|
|
|
+ ),
|
|
|
barWidth: "30%",
|
|
barWidth: "30%",
|
|
|
itemStyle: {
|
|
itemStyle: {
|
|
|
color: new echarts.graphic.LinearGradient(1, 1, 0, 0, [
|
|
color: new echarts.graphic.LinearGradient(1, 1, 0, 0, [
|
|
@@ -284,15 +288,17 @@
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
grid: {
|
|
grid: {
|
|
|
- left: "1%",
|
|
|
|
|
- right: "1%",
|
|
|
|
|
|
|
+ left: "4%",
|
|
|
|
|
+ right: "4%",
|
|
|
top: "2%",
|
|
top: "2%",
|
|
|
bottom: "5%",
|
|
bottom: "5%",
|
|
|
containLabel: true,
|
|
containLabel: true,
|
|
|
},
|
|
},
|
|
|
xAxis: {
|
|
xAxis: {
|
|
|
type: "category",
|
|
type: "category",
|
|
|
- data: this.waterState.monthStatisticsList.map((item) => item.staData),
|
|
|
|
|
|
|
+ data: this.waterState.monthStatisticsList.map(
|
|
|
|
|
+ (item) => item.staData
|
|
|
|
|
+ ),
|
|
|
axisLine: {
|
|
axisLine: {
|
|
|
lineStyle: {
|
|
lineStyle: {
|
|
|
color: "rgba(160, 179, 214, 0.3)",
|
|
color: "rgba(160, 179, 214, 0.3)",
|
|
@@ -344,7 +350,9 @@
|
|
|
{
|
|
{
|
|
|
name: "用水量",
|
|
name: "用水量",
|
|
|
type: "bar",
|
|
type: "bar",
|
|
|
- data: this.waterState.monthStatisticsList.map((item) => item.count),
|
|
|
|
|
|
|
+ data: this.waterState.monthStatisticsList.map(
|
|
|
|
|
+ (item) => item.count
|
|
|
|
|
+ ),
|
|
|
barWidth: "30%",
|
|
barWidth: "30%",
|
|
|
itemStyle: {
|
|
itemStyle: {
|
|
|
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
|
|
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
|
|
@@ -420,7 +428,7 @@
|
|
|
gap: halfW(20);
|
|
gap: halfW(20);
|
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
|
border: 1px solid rgba(64, 158, 255, 0.1);
|
|
border: 1px solid rgba(64, 158, 255, 0.1);
|
|
|
- border-radius: halfW(6);
|
|
|
|
|
|
|
+ border-radius: var(--radius);
|
|
|
padding: halfH(16) halfW(10);
|
|
padding: halfH(16) halfW(10);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -444,13 +452,15 @@
|
|
|
|
|
|
|
|
.data-cards {
|
|
.data-cards {
|
|
|
flex: 1;
|
|
flex: 1;
|
|
|
- display: flex;
|
|
|
|
|
|
|
+ display: grid;
|
|
|
|
|
+ grid-template-columns: repeat(2, 1fr);
|
|
|
|
|
+ grid-template-rows: repeat(2, 1fr);
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
|
flex-wrap: wrap;
|
|
flex-wrap: wrap;
|
|
|
background: var(--title-bg);
|
|
background: var(--title-bg);
|
|
|
border: 1px solid rgba(64, 158, 255, 0.1);
|
|
border: 1px solid rgba(64, 158, 255, 0.1);
|
|
|
- border-radius: halfW(4);
|
|
|
|
|
|
|
+ border-radius: var(--radius);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.data-card {
|
|
.data-card {
|
|
@@ -458,11 +468,10 @@
|
|
|
display: flex;
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
- border-right: 1px solid rgba(64, 158, 255, 0.3);
|
|
|
|
|
text-align: right;
|
|
text-align: right;
|
|
|
padding: halfH(10) halfW(10);
|
|
padding: halfH(10) halfW(10);
|
|
|
- &:last-child {
|
|
|
|
|
- border-right: none;
|
|
|
|
|
|
|
+ &:nth-child(odd) {
|
|
|
|
|
+ border-right: 1px solid rgba(64, 158, 255, 0.3);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|