|
|
@@ -3,7 +3,7 @@
|
|
|
* @Autor: lin
|
|
|
* @Date: 2024-04-09 14:26:07
|
|
|
* @LastEditors: lin
|
|
|
- * @LastEditTime: 2024-04-24 16:34:04
|
|
|
+ * @LastEditTime: 2024-04-28 16:07:10
|
|
|
-->
|
|
|
<template>
|
|
|
<div class="box">
|
|
|
@@ -61,17 +61,17 @@
|
|
|
:key="item.category"
|
|
|
indicator-position="outside"
|
|
|
>
|
|
|
+ <div class="infoTitle">{{ item.category }}</div>
|
|
|
<div class="small">{{ item.warning }}</div>
|
|
|
<div class="charInfo">
|
|
|
- <div class="infoTitle">{{ item.category }}</div>
|
|
|
- <div class="detailInfo" v-if="item.category != '杂草'">
|
|
|
- <div>有害生物总数</div>
|
|
|
- <div>{{ item.sum }}</div>
|
|
|
- </div>
|
|
|
<div class="detailInfo">
|
|
|
<div>有害生物种类</div>
|
|
|
<div>{{ item.count }}</div>
|
|
|
</div>
|
|
|
+ <div class="detailInfo" v-if="item.category != '杂草'">
|
|
|
+ <div>有害生物总数</div>
|
|
|
+ <div>{{ item.sum }}</div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</el-carousel-item>
|
|
|
</el-carousel>
|
|
|
@@ -321,13 +321,13 @@
|
|
|
</div>
|
|
|
<div class="info">
|
|
|
<div>
|
|
|
- 总数：
|
|
|
- <span>{{ bannerData.count }}</span>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
种类：
|
|
|
<span>{{ bannerData.cg_count }}</span>
|
|
|
</div>
|
|
|
+ <div>
|
|
|
+ 总数：
|
|
|
+ <span>{{ bannerData.count }}</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -730,16 +730,16 @@ export default {
|
|
|
yAxisIndex: index < 2 ? 0 : 1,
|
|
|
});
|
|
|
if (!type) return;
|
|
|
- if (index == 0 || index == 2) {
|
|
|
- series.push({
|
|
|
- data: data,
|
|
|
- type: 'line',
|
|
|
- smooth: true,
|
|
|
- name: nameList[index],
|
|
|
- color: colorList[index],
|
|
|
- yAxisIndex: index == 0 ? 0 : 1,
|
|
|
- });
|
|
|
- }
|
|
|
+ // if (index == 0 || index == 2) {
|
|
|
+ // series.push({
|
|
|
+ // data: data,
|
|
|
+ // type: 'line',
|
|
|
+ // smooth: true,
|
|
|
+ // name: nameList[index],
|
|
|
+ // color: colorList[index],
|
|
|
+ // yAxisIndex: index == 0 ? 0 : 1,
|
|
|
+ // });
|
|
|
+ // }
|
|
|
});
|
|
|
console.log(yAxis, series);
|
|
|
let optionsPestLine = {
|
|
|
@@ -1196,7 +1196,7 @@ export default {
|
|
|
|
|
|
.el-input__inner {
|
|
|
background: #ffffff1a;
|
|
|
- color: #ffffffcc;
|
|
|
+ color: #fff;
|
|
|
border: none;
|
|
|
}
|
|
|
}
|
|
|
@@ -1266,9 +1266,9 @@ export default {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
- color: #ffffffcc;
|
|
|
+ color: #fff;
|
|
|
font-size: 1.4rem;
|
|
|
- height: 3.3vh;
|
|
|
+ height: 3.8vh;
|
|
|
border-bottom: 1px solid #ffffff4d;
|
|
|
font-weight: 400;
|
|
|
|
|
|
@@ -1285,7 +1285,7 @@ export default {
|
|
|
|
|
|
span {
|
|
|
cursor: pointer;
|
|
|
- color: #3acd9c;
|
|
|
+ color: yellow;
|
|
|
margin-right: 0.8rem;
|
|
|
}
|
|
|
|
|
|
@@ -1296,8 +1296,8 @@ export default {
|
|
|
}
|
|
|
|
|
|
.el-carousel {
|
|
|
- height: 19.8vh;
|
|
|
- color: #ffffffcc;
|
|
|
+ height: 22.8vh;
|
|
|
+ color: #fff;
|
|
|
font-size: 1.4rem;
|
|
|
|
|
|
/deep/ .el-carousel__container {
|
|
|
@@ -1310,36 +1310,37 @@ export default {
|
|
|
line-height: 2rem;
|
|
|
}
|
|
|
|
|
|
+ .infoTitle {
|
|
|
+ font-size: 2rem;
|
|
|
+ // writing-mode: vertical-rl;
|
|
|
+ color: yellow;
|
|
|
+ margin-bottom: 1rem;
|
|
|
+ }
|
|
|
.charInfo {
|
|
|
width: 90%;
|
|
|
margin: 0 auto;
|
|
|
display: flex;
|
|
|
justify-content: space-around;
|
|
|
align-items: center;
|
|
|
- height: calc(100% - 2rem);
|
|
|
+ height: calc(100% - 5rem);
|
|
|
|
|
|
- .infoTitle {
|
|
|
- font-size: 1.6rem;
|
|
|
- writing-mode: vertical-rl;
|
|
|
- color: #aaf0d2;
|
|
|
- }
|
|
|
|
|
|
.detailInfo {
|
|
|
width: 40%;
|
|
|
- height: 16vh;
|
|
|
+ height: 12vh;
|
|
|
box-sizing: border-box;
|
|
|
text-align: center;
|
|
|
- background: url(../../../assets/images/newHome/all.png) top center
|
|
|
+ background: url(../../../assets/images/newHome/all.png) bottom center
|
|
|
no-repeat;
|
|
|
background-size: cover;
|
|
|
|
|
|
:first-child {
|
|
|
- margin-top: 3rem;
|
|
|
+ margin-top: 1rem;
|
|
|
}
|
|
|
|
|
|
:last-child {
|
|
|
color: #fff;
|
|
|
- font-size: 4rem;
|
|
|
+ font-size: 3rem;
|
|
|
font-weight: 400;
|
|
|
text-shadow: 0px 0px 0.4rem #fff;
|
|
|
}
|
|
|
@@ -1440,7 +1441,7 @@ export default {
|
|
|
align-items: center;
|
|
|
height: 3.7vh;
|
|
|
width: 21vw;
|
|
|
- color: #ffffffcc;
|
|
|
+ color: #fff;
|
|
|
font-size: 1.4rem;
|
|
|
border-bottom: 1px solid #ffffff4d;
|
|
|
|
|
|
@@ -1468,6 +1469,7 @@ export default {
|
|
|
|
|
|
.infoContent {
|
|
|
width: 18.38vw;
|
|
|
+ color: yellow;
|
|
|
|
|
|
.marginBtn {
|
|
|
margin-top: 2.3vh;
|
|
|
@@ -1555,10 +1557,10 @@ export default {
|
|
|
border-radius: 2px;
|
|
|
background: #ffffff1a;
|
|
|
box-sizing: border-box;
|
|
|
- padding-top: 5vh;
|
|
|
+ padding-top: 1vh;
|
|
|
|
|
|
.table {
|
|
|
- height: 42.5vh;
|
|
|
+ height: 52.5vh;
|
|
|
overflow: auto;
|
|
|
width: 95%;
|
|
|
margin: 0 auto;
|
|
|
@@ -1599,7 +1601,7 @@ export default {
|
|
|
padding-right: 2.5%;
|
|
|
|
|
|
div {
|
|
|
- color: #ffffff80;
|
|
|
+ color: #ffffff;
|
|
|
margin-left: 1rem;
|
|
|
|
|
|
span {
|
|
|
@@ -1652,14 +1654,14 @@ export default {
|
|
|
|
|
|
.warningBox {
|
|
|
position: absolute;
|
|
|
- top: 8.4vh;
|
|
|
+ top: 7.4vh;
|
|
|
left: 50%;
|
|
|
z-index: 190;
|
|
|
transform: translateX(-50%);
|
|
|
- width: 18.8vw;
|
|
|
+ width: 19.8vw;
|
|
|
height: 3.7vh;
|
|
|
cursor: pointer;
|
|
|
- color: #ffffff;
|
|
|
+ color: yellow;
|
|
|
font-size: 1.4rem;
|
|
|
white-space: nowrap;
|
|
|
/* 禁止文本换行 */
|
