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

This commit is contained in:
duanxiaohai 2024-04-18 17:30:24 +08:00
commit c67b48b36e
10 changed files with 104 additions and 86 deletions

View File

@ -81,7 +81,7 @@ let option = {
axisLabel: {
show: true,
textStyle: {
color: "#ccc",
color: "#ffffff",
fontSize: "11",
},
},

View File

@ -65,7 +65,7 @@ let option = {
return str; //
},
textStyle: {
color: "#ccc",
color: "#ffffff",
},
rotate: 30,
},

View File

@ -65,7 +65,7 @@ let option = {
return str; //
},
textStyle: {
color: "#ccc",
color: "#ffffff",
},
rotate: 40,
},

View File

@ -65,7 +65,7 @@ let option = {
return str; //
},
textStyle: {
color: "#ccc",
color: "#ffffff",
},
rotate: 30,
},

View File

@ -146,13 +146,15 @@ const option = {
},
},
},
],
series: [
{
name: "救助金额",
data: lineData,
type: "line", //线
stack: "Total",
symbol: "emptyCircle",
symbolSize: 10,
itemStyle: {
borderColor: "#00FCFF",
borderWidth: 1,

View File

@ -152,6 +152,9 @@ const option = {
name: "救助金额",
data: lineData,
type: "line", //线
stack: "Total",
symbol: "emptyCircle",
symbolSize: 10,
itemStyle: {
borderColor: "#00FCFF",
borderWidth: 1,

View File

@ -13,7 +13,7 @@ const data = [120, 200, 50, 80, 70];
const data2 = [12, 20, 5, 8, 7];
const data3 = [20, 100, 40, 80, 70];
const lineData = [150, 230, 24, 218, 135];
const lineData2 = [15, 23, 4, 18, 15];
const lineData2 = [100, 200, 40, 180, 15];
const max = data
.concat(lineData)
.reduce((pre, cur) => (pre > cur ? pre : cur), 0); //
@ -94,21 +94,25 @@ const option = {
// },
// ],
legend: {
data: [
"特困救助金额",
"低保救助金额",
"",
"特困救助人次",
"低保救助人次",
"低边救助人次",
],
top: "8%",
legend: [
{
data: ["特困救助金额", "低保救助金额"],
top: "3%",
textStyle: {
fontSize: 12,
color: "#ffffff", //
},
},
{
data: ["特困救助人次", "低保救助人次", "低边救助人次"],
top: "13%",
textStyle: {
fontSize: 12,
color: "#ffffff", //
},
},
],
grid: {
top: "28%",
left: "6%",

View File

@ -8,6 +8,7 @@
v-if="leftchoose.first == '1'"
src="@/assets/images/hygiene/yb_1.png"
class="c"
style="width:160px;"
/>
<img
v-else
@ -19,6 +20,7 @@
v-if="leftchoose.first == '2'"
src="@/assets/images/hygiene/yb_2.png"
class="c"
style="width:160px;"
/>
<img
v-else

View File

@ -6,6 +6,7 @@
class="yd_title"
:class="zxjz ? 'left_1' : 'left_1_1'"
@click="zxjzChange()"
style="cursor: pointer"
></div>
<div class="choose">
<div
@ -28,8 +29,6 @@
</div>
</div>
<eP1></eP1>
</div>
<div class="flex1">
<div class="choose">
<div
:class="jz[1].choose == '1' ? 'choose_1' : 'choose_2'"
@ -111,7 +110,7 @@
</div>
<div class="flex1">
<div class="yd_title right_2"></div>
<div style="margin-top:20px;">
<div style="margin-top: 20px">
<div class="czr-bj">
<div class="czrBox">
<div class="situation situation1"></div>

View File

@ -8,6 +8,7 @@
v-if="leftchoose.first == '1'"
src="@/assets/images/ylbx_1.png"
class="c"
style="width: 160px"
/>
<img
v-else
@ -19,12 +20,14 @@
v-if="leftchoose.first == '2'"
src="@/assets/images/ylbx_1.png"
class="c"
style="width: 160px"
/>
<img
v-else
src="@/assets/images/ylbx_2_1.png"
class="c"
@click="change('first', '2')"
style="height:35px;width:120px;margin-right:10px;"
/>
</span>
</div>
@ -38,6 +41,7 @@
v-if="leftchoose.second == '1'"
src="@/assets/images/gllrbt_1.png"
class="c"
style="width: 160px"
/>
<img
v-else
@ -49,6 +53,7 @@
v-if="leftchoose.second == '2'"
src="@/assets/images/gllrbt_1.png"
class="c"
style="width: 160px"
/>
<img
v-else
@ -68,6 +73,7 @@
v-if="leftchoose.third == '1'"
src="@/assets/images/tkjz_1.png"
class="c"
style="width: 160px"
/>
<img
v-else
@ -79,6 +85,7 @@
v-if="leftchoose.third == '2'"
src="@/assets/images/tkjz_1.png"
class="c"
style="width: 160px"
/>
<img
v-else
@ -237,6 +244,7 @@ const change = (name, index) => {
position: absolute;
right: 5px;
top: 1px;
align-items: center;
}
.c {
width: 130px;