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: { axisLabel: {
show: true, show: true,
textStyle: { textStyle: {
color: "#ccc", color: "#ffffff",
fontSize: "11", fontSize: "11",
}, },
}, },

View File

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

View File

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

View File

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

View File

@ -88,7 +88,7 @@ const option = {
}, },
], ],
yAxis: [ yAxis: [
{ {
type: "value", type: "value",
scale: true, scale: true,
name: "救助人数", name: "救助人数",
@ -146,13 +146,15 @@ const option = {
}, },
}, },
}, },
], ],
series: [ series: [
{ {
name: "救助金额", name: "救助金额",
data: lineData, data: lineData,
type: "line", //线 type: "line", //线
stack: "Total",
symbol: "emptyCircle",
symbolSize: 10,
itemStyle: { itemStyle: {
borderColor: "#00FCFF", borderColor: "#00FCFF",
borderWidth: 1, borderWidth: 1,
@ -164,7 +166,7 @@ const option = {
data: data, data: data,
barWidth: 20, barWidth: 20,
type: "bar", type: "bar",
itemStyle: { itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ {
offset: 0, offset: 0,

View File

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

View File

@ -13,7 +13,7 @@ const data = [120, 200, 50, 80, 70];
const data2 = [12, 20, 5, 8, 7]; const data2 = [12, 20, 5, 8, 7];
const data3 = [20, 100, 40, 80, 70]; const data3 = [20, 100, 40, 80, 70];
const lineData = [150, 230, 24, 218, 135]; const lineData = [150, 230, 24, 218, 135];
const lineData2 = [15, 23, 4, 18, 15]; const lineData2 = [100, 200, 40, 180, 15];
const max = data const max = data
.concat(lineData) .concat(lineData)
.reduce((pre, cur) => (pre > cur ? pre : cur), 0); // .reduce((pre, cur) => (pre > cur ? pre : cur), 0); //
@ -38,77 +38,81 @@ const option = {
}, },
}, },
}, },
// legend: [ // legend: [
// { // {
// orient: "horizontal", // orient: "horizontal",
// icon: "circle", // icon: "circle",
// align: "left", // align: "left",
// bottom: "0", // bottom: "0",
// itemWidth: 8, // itemWidth: 8,
// itemHeight: 8, // itemHeight: 8,
// y: "20", // y: "20",
// x: "center", // x: "center",
// data: ["", ""], // data: ["", ""],
// formatter: (name) => { // formatter: (name) => {
// return `{b|${name}} `; // return `{b|${name}} `;
// }, // },
// textStyle: { // textStyle: {
// color: "#999999", // color: "#999999",
// fontSize: 12, // fontSize: 12,
// align: "left", // align: "left",
// // // //
// backgroundColor: "transparent", // backgroundColor: "transparent",
// rich: { // rich: {
// b: { // b: {
// width: 200, // width: 200,
// }, // },
// }, // },
// }, // },
// }, // },
// { // {
// orient: "horizontal", // orient: "horizontal",
// icon: "circle", // icon: "circle",
// align: "left", // align: "left",
// bottom: "0", // bottom: "0",
// itemWidth: 8, // itemWidth: 8,
// itemHeight: 8, // itemHeight: 8,
// y: "40", // y: "40",
// x: "center", // x: "center",
// data: ["", "", "/"], // data: ["", "", "/"],
// formatter: (name) => { // formatter: (name) => {
// return `{a|${name}} `; // return `{a|${name}} `;
// }, // },
// textStyle: { // textStyle: {
// color: "#999999", // color: "#999999",
// fontSize: 12, // fontSize: 12,
// align: "left", // align: "left",
// // // //
// backgroundColor: "transparent", // backgroundColor: "transparent",
// rich: { // rich: {
// a: { // a: {
// width: 200, // width: 200,
// }, // },
// }, // },
// }, // },
// }, // },
// ], // ],
legend: { legend: [
data: [ {
"特困救助金额", data: ["特困救助金额", "低保救助金额"],
"低保救助金额", top: "3%",
"", textStyle: {
"特困救助人次", fontSize: 12,
"低保救助人次", color: "#ffffff", //
"低边救助人次", },
],
top: "8%",
textStyle: {
fontSize: 12,
color: "#ffffff", //
}, },
}, {
data: ["特困救助人次", "低保救助人次", "低边救助人次"],
top: "13%",
textStyle: {
fontSize: 12,
color: "#ffffff", //
},
},
],
grid: { grid: {
top: "28%", top: "28%",
left: "6%", left: "6%",

View File

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

View File

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

View File

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