diff --git a/public/assets/map.png b/public/assets/map.png
index 9ab787b..a90aa85 100644
Binary files a/public/assets/map.png and b/public/assets/map.png differ
diff --git a/src/components/DashboardLayout/index.tsx b/src/components/DashboardLayout/index.tsx
index 71a3788..205accb 100644
--- a/src/components/DashboardLayout/index.tsx
+++ b/src/components/DashboardLayout/index.tsx
@@ -62,7 +62,7 @@ const DashboardLayout: React.FC = () => {
/*useEffect(() => {
if (leafMenu) {
- document.title = '小玉潭水库 · ' + leafMenu.title
+ document.title = leafMenu.title
}
}, [leafMenu]);*/
diff --git a/src/views/Zhsy/index.less b/src/views/Zhsy/index.less
index 7ff3e7a..367f020 100644
--- a/src/views/Zhsy/index.less
+++ b/src/views/Zhsy/index.less
@@ -40,20 +40,16 @@
.title-items {
margin-right: 20px;
- color:#999;
+ color: #999;
}
-.items-active{
- color:#fff;
+.items-active {
+ color: #fff;
border-bottom: 2px solid yellow;
}
-
-
-
-
-.box1,.box4{
+.box1, .box4 {
height: 85%;
padding: 10px;
background: url("../../../public/assets/box_bg3.png") 0 0 no-repeat;
@@ -62,11 +58,11 @@
align-items: center;
}
-.box1-bian,.box4-bian {
+.box1-bian, .box4-bian {
height: 100%;
}
-.box1-content,.box4-content {
+.box1-content, .box4-content {
margin: 0 10px;
}
@@ -170,52 +166,55 @@
width: 15px;
}
-.box4-content-item{
+.box4-content-item {
text-indent: 2em;
margin: 20px 0;
}
-.box4-content-item span{
+.box4-content-item span {
color: yellow;
}
-.box5{
+.box5 {
height: 90%;
padding: 10px;
overflow: auto;
}
-.box5-title{
+.box5-title {
display: flex;
background: url("../../../public/assets/box5_title.png") 0 0 no-repeat;
background-size: 100% 100%;
padding: 6px 10px;
}
-.box5-title-item{
+.box5-title-item {
text-align: center;
}
-.color-green{
- color:#00FFAA;
+.color-green {
+ color: #00FFAA;
}
-
-
-.box5-list{
+.box5-list {
display: flex;
padding: 6px 10px;
}
-.box5-li{
+.box5-li {
text-align: center;
display: flex;
align-items: center;
justify-content: center;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+
+ width: 30%;
}
-.box5-li-num{
+.box5-li-num {
width: 12px;
height: 12px;
line-height: 12px;
@@ -224,22 +223,34 @@
background-size: 100% 100%;
}
-.width-10{
+.width-10 {
width: 10%;
}
-.width-20{
+.width-20 {
width: 20%;
}
-.width-30{
+.width-30 {
width: 30%;
}
-.box5 .box5-list:nth-child(even){
- background: rgba(0,88,188,0.2);
+.box5 .box5-list:nth-child(even) {
+ background: rgba(0, 88, 188, 0.2);
}
-.box5 .box5-list:nth-child(odd){
- background: rgba(0,88,188,0.6);
+.box5 .box5-list:nth-child(odd) {
+ background: rgba(0, 88, 188, 0.6);
}
+
+.map{
+ position: absolute;
+ top: 10vh;
+ left: 27vw;
+ width: 40vw;
+ height: 30vw;
+ img{
+ width: 100%;
+ }
+}
+
diff --git a/src/views/Zhsy/index.tsx b/src/views/Zhsy/index.tsx
index 11e4f93..c725ea4 100644
--- a/src/views/Zhsy/index.tsx
+++ b/src/views/Zhsy/index.tsx
@@ -34,11 +34,11 @@ const SyglPage: React.FC = () => {
xAxis: {
type: "category",
data: [
+ "2015",
+ "2016",
+ "2017",
"2018",
"2019",
- "2020",
- "2021",
- "2022",
],
axisLine: {
show: true,
@@ -62,7 +62,7 @@ const SyglPage: React.FC = () => {
},
yAxis: {
name: "(万元)",
- max: 600,
+ max: 12000,
min: 0,
nameTextStyle: {
color: '#fff',
@@ -93,7 +93,7 @@ const SyglPage: React.FC = () => {
series: [
{
type: "bar",
- data: [360, 340, 300, 360, 500],
+ data: [1796, 717, 2500, 9445, 11345],
barMaxWidth: "auto",
barWidth: 30,
itemStyle: {
@@ -128,7 +128,7 @@ const SyglPage: React.FC = () => {
zlevel: 2,
},
{//一蓝盖
- data: [360, 340, 300, 360, 500],
+ data: [1796, 717, 2500, 9445, 11345],
type: "pictorialBar",
barMaxWidth: "20",
symbol: "diamond",
@@ -205,18 +205,18 @@ const SyglPage: React.FC = () => {
+