|
@@ -32,14 +32,17 @@
|
|
<div class="mainModel" v-for="(it, index) in cupDataYearArr.section" :key="index">
|
|
<div class="mainModel" v-for="(it, index) in cupDataYearArr.section" :key="index">
|
|
<div class="mainModelTit">
|
|
<div class="mainModelTit">
|
|
<div class="mainModelTit_left">
|
|
<div class="mainModelTit_left">
|
|
- <img :src="huodianImg" alt="">
|
|
|
|
- <span>火电板块</span>
|
|
|
|
|
|
+ <img :src="huodianImg" alt="" v-if="it.nameEn === 'HD'">
|
|
|
|
+ <img :src="shuidianImg" alt="" v-else-if="it.nameEn === 'SD'">
|
|
|
|
+ <img :src="xinnengyuanImg" alt="" v-else-if="it.nameEn === 'XNYFG'">
|
|
|
|
+ <img :src="meidianImg" alt="" v-else-if="it.nameEn === 'MDYTH'">
|
|
|
|
+ <span>{{it.name}}</span>
|
|
</div>
|
|
</div>
|
|
<img :src="moreImg" alt="" class="mainModelTit_right">
|
|
<img :src="moreImg" alt="" class="mainModelTit_right">
|
|
</div>
|
|
</div>
|
|
<div class="mainModelMsg">
|
|
<div class="mainModelMsg">
|
|
<div class="mainTwo">
|
|
<div class="mainTwo">
|
|
- <div class="echartsNum" :style="it.echartsData.allNum < 10 ? 'left:56px': 'left: 65px'">{{it.echartsData.allNum}}</div>
|
|
|
|
|
|
+ <!-- <div class="echartsNum" :style="it.echartsData.allNum < 10 ? 'left:56px': 'left: 65px'">{{it.echartsData.allNum}}</div> -->
|
|
<div :id="'pieChart'+index" style="height: 100px;width: 100%"></div>
|
|
<div :id="'pieChart'+index" style="height: 100px;width: 100%"></div>
|
|
<el-row>
|
|
<el-row>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
@@ -67,7 +70,7 @@
|
|
</div>
|
|
</div>
|
|
<div class="headerNameTit_right">
|
|
<div class="headerNameTit_right">
|
|
<span>级别</span>
|
|
<span>级别</span>
|
|
- <span style="margin-left: 20px">得分</span>
|
|
|
|
|
|
+ <span>得分</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div style="display: flex" v-for="(item, index) in it.tableDatas" :key="index">
|
|
<div style="display: flex" v-for="(item, index) in it.tableDatas" :key="index">
|
|
@@ -146,7 +149,7 @@ export default {
|
|
secArr.forEach(item =>{
|
|
secArr.forEach(item =>{
|
|
for(let i in datas.data.year) {
|
|
for(let i in datas.data.year) {
|
|
let it = datas.data.year[i]
|
|
let it = datas.data.year[i]
|
|
- if (item === i && i !== 'MDYTH') {
|
|
|
|
|
|
+ if (item === i && i !== 'GJYW') {
|
|
let gradeA = 0
|
|
let gradeA = 0
|
|
let gradeB = 0
|
|
let gradeB = 0
|
|
let gradeC = 0
|
|
let gradeC = 0
|
|
@@ -234,6 +237,10 @@ export default {
|
|
},
|
|
},
|
|
|
|
|
|
getEchartsData(data, name) {
|
|
getEchartsData(data, name) {
|
|
|
|
+ let total = 0
|
|
|
|
+ data.forEach(it =>{
|
|
|
|
+ total += it.value
|
|
|
|
+ })
|
|
let option = {
|
|
let option = {
|
|
color: ['#F65177', '#50C14E', '#5093E1', '#9DA5BE'],
|
|
color: ['#F65177', '#50C14E', '#5093E1', '#9DA5BE'],
|
|
tooltip: {
|
|
tooltip: {
|
|
@@ -246,16 +253,14 @@ export default {
|
|
radius: ['50%', '70%'],
|
|
radius: ['50%', '70%'],
|
|
avoidLabelOverlap: false,
|
|
avoidLabelOverlap: false,
|
|
label: {
|
|
label: {
|
|
- show: false,
|
|
|
|
- position: 'center'
|
|
|
|
|
|
+ show: true,
|
|
|
|
+ position: 'center',
|
|
|
|
+ formatter: () =>{
|
|
|
|
+ return total
|
|
|
|
+ },
|
|
|
|
+ fontSize: 16,
|
|
|
|
+ fontWeight: 600
|
|
},
|
|
},
|
|
- // emphasis: {
|
|
|
|
- // label: {
|
|
|
|
- // show: true,
|
|
|
|
- // fontSize: 10,
|
|
|
|
- // fontWeight: 'bold'
|
|
|
|
- // }
|
|
|
|
- // },
|
|
|
|
labelLine: {
|
|
labelLine: {
|
|
show: false
|
|
show: false
|
|
},
|
|
},
|
|
@@ -303,9 +308,12 @@ export default {
|
|
width: 100%;
|
|
width: 100%;
|
|
background-color: #184FB4;
|
|
background-color: #184FB4;
|
|
color: #fff;
|
|
color: #fff;
|
|
|
|
+ position: fixed;
|
|
|
|
+ top: 0;
|
|
}
|
|
}
|
|
.mobeilVant{
|
|
.mobeilVant{
|
|
height: 100%;
|
|
height: 100%;
|
|
|
|
+ margin-top: 45px;
|
|
border-radius: 10px 10px 0 0;
|
|
border-radius: 10px 10px 0 0;
|
|
background-color: #fff;
|
|
background-color: #fff;
|
|
.mobeilTop{
|
|
.mobeilTop{
|
|
@@ -351,7 +359,7 @@ export default {
|
|
.mobeilMain{
|
|
.mobeilMain{
|
|
// height: 50px;
|
|
// height: 50px;
|
|
background-color: #ededf5;
|
|
background-color: #ededf5;
|
|
- padding: 17px 20px 0 20px;
|
|
|
|
|
|
+ padding: 17px 20px;
|
|
.rankingList{
|
|
.rankingList{
|
|
width: 100%;
|
|
width: 100%;
|
|
height: 45px;
|
|
height: 45px;
|
|
@@ -386,17 +394,17 @@ export default {
|
|
background: #fff;
|
|
background: #fff;
|
|
border-radius: 5px;
|
|
border-radius: 5px;
|
|
.mainModelTit{
|
|
.mainModelTit{
|
|
- height: 50px;
|
|
|
|
|
|
+ height: 40px;
|
|
padding: 0 15px;
|
|
padding: 0 15px;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
border-bottom: 1px solid #96A1B4;
|
|
border-bottom: 1px solid #96A1B4;
|
|
.mainModelTit_left{
|
|
.mainModelTit_left{
|
|
img{
|
|
img{
|
|
- width: 22px;
|
|
|
|
- height: 22px;
|
|
|
|
|
|
+ width: 20px;
|
|
|
|
+ height: 20px;
|
|
position: relative;
|
|
position: relative;
|
|
- top: 12px;
|
|
|
|
|
|
+ top: 10px;
|
|
right: 5px;
|
|
right: 5px;
|
|
}
|
|
}
|
|
span{
|
|
span{
|
|
@@ -407,12 +415,12 @@ export default {
|
|
color: #545960;
|
|
color: #545960;
|
|
margin-right: 5px;
|
|
margin-right: 5px;
|
|
position: relative;
|
|
position: relative;
|
|
- top: 8px;
|
|
|
|
|
|
+ top: 7px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.mainModelTit_right{
|
|
.mainModelTit_right{
|
|
- width: 18px;
|
|
|
|
- height: 18px;
|
|
|
|
|
|
+ width: 14px;
|
|
|
|
+ height: 14px;
|
|
position: relative;
|
|
position: relative;
|
|
top: 14px;
|
|
top: 14px;
|
|
right: 5px;
|
|
right: 5px;
|
|
@@ -450,24 +458,40 @@ export default {
|
|
}
|
|
}
|
|
.mainThree{
|
|
.mainThree{
|
|
width: 65%;
|
|
width: 65%;
|
|
- padding-top: 13px;
|
|
|
|
|
|
+ padding-top: 5px;
|
|
border-right: 1px solid #E1E3EA;
|
|
border-right: 1px solid #E1E3EA;
|
|
position: relative;
|
|
position: relative;
|
|
.headerNameTit{
|
|
.headerNameTit{
|
|
display: flex;
|
|
display: flex;
|
|
- justify-content: space-between;
|
|
|
|
- padding: 0px 20px;
|
|
|
|
|
|
+ // justify-content: space-between;
|
|
|
|
+ padding: 0px 15px;
|
|
|
|
+ margin-bottom: 5px;
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
color: #414141;
|
|
color: #414141;
|
|
|
|
+ .headerNameTit_left{
|
|
|
|
+ width: 65%;
|
|
|
|
+ }
|
|
|
|
+ .headerNameTit_right{
|
|
|
|
+ width: 40%;
|
|
|
|
+ span:nth-child(1){
|
|
|
|
+ display: inline-block;
|
|
|
|
+ width: 60%;
|
|
|
|
+ }
|
|
|
|
+ span:nth-child(2){
|
|
|
|
+ display: inline-block;
|
|
|
|
+ width: 40%;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
.mainThreeMsg{
|
|
.mainThreeMsg{
|
|
display: flex;
|
|
display: flex;
|
|
margin: 0 10px;
|
|
margin: 0 10px;
|
|
- width: 100%;
|
|
|
|
|
|
+ width: calc(100% - 36px);
|
|
height: 33px;
|
|
height: 33px;
|
|
background: #F6F7FA;
|
|
background: #F6F7FA;
|
|
margin-bottom: 8px;
|
|
margin-bottom: 8px;
|
|
- padding-left: 10px;
|
|
|
|
|
|
+ padding-left: 8px;
|
|
|
|
+ padding-right: 8px;
|
|
padding-top: 2px;
|
|
padding-top: 2px;
|
|
border-radius: 5px;
|
|
border-radius: 5px;
|
|
img{
|
|
img{
|
|
@@ -480,24 +504,30 @@ export default {
|
|
.msgProgress{
|
|
.msgProgress{
|
|
margin-top: 5px;
|
|
margin-top: 5px;
|
|
display: flex;
|
|
display: flex;
|
|
- width: 90%;
|
|
|
|
|
|
+ width: 100%;
|
|
span{
|
|
span{
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
font-family: Microsoft YaHei;
|
|
font-family: Microsoft YaHei;
|
|
}
|
|
}
|
|
span:nth-child(1){
|
|
span:nth-child(1){
|
|
display: inline-block;
|
|
display: inline-block;
|
|
- width: 70%;
|
|
|
|
|
|
+ width: 60%;
|
|
font-weight: 400;
|
|
font-weight: 400;
|
|
color: #666;
|
|
color: #666;
|
|
- margin-right: 10px;
|
|
|
|
|
|
+ // margin-right: 10px;
|
|
|
|
+ overflow: hidden;
|
|
|
|
+ text-overflow: ellipsis;
|
|
|
|
+ white-space: nowrap;
|
|
}
|
|
}
|
|
span:nth-child(2){
|
|
span:nth-child(2){
|
|
|
|
+ display: inline-block;
|
|
|
|
+ width: 25%;
|
|
font-weight: 600;
|
|
font-weight: 600;
|
|
- margin-right: 30px;
|
|
|
|
color: #F65177;
|
|
color: #F65177;
|
|
}
|
|
}
|
|
span:nth-child(3){
|
|
span:nth-child(3){
|
|
|
|
+ display: inline-block;
|
|
|
|
+ width: 10%;
|
|
font-weight: 600;
|
|
font-weight: 600;
|
|
color: #666;
|
|
color: #666;
|
|
}
|
|
}
|