From 44e22bc78cc60180e57c5c1cde31b90013082e7f Mon Sep 17 00:00:00 2001
From: liyan <1593821058@qq.com>
Date: Tue, 29 Dec 2020 14:30:55 +0800
Subject: [PATCH] forxunhuan

---
 .../src/assets/scss/c/function.scss           |  7 +++----
 .../scss/modules/wx-mini/index-set.scss       |  6 +++---
 .../src/components/wx-index/cpt-item.vue      | 19 ++++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/epmet-oper-web/src/assets/scss/c/function.scss b/epmet-oper-web/src/assets/scss/c/function.scss
index b4893e2..90fb9da 100644
--- a/epmet-oper-web/src/assets/scss/c/function.scss
+++ b/epmet-oper-web/src/assets/scss/c/function.scss
@@ -239,11 +239,11 @@
 @mixin list_12 {
 	text-align: left;
 	color: #b9b9b9;
-	font-size: 13px;
+	font-size: 12px;
 }
 @mixin name_123 {
 	position: absolute;
-	width: 40px;
+	width: 50px;
 	font-size: 16px;
 	color: black;
 	display: block;
@@ -263,7 +263,6 @@
 @mixin list {
 	list-style-type: none;
 	position: absolute;
-	
-	
+	padding: 0px;
 }
 
diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss
index 96fd20b..3a3b63d 100644
--- a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss
+++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss
@@ -1245,7 +1245,7 @@
 						width: 310px;
 						border-bottom: 1px solid #e7eeee;
 						margin-left: 15px;
-						margin-top: 22px;
+						margin-top: 25px;
 						position: relative;
 				}
 				.list6{
@@ -1335,7 +1335,7 @@
 												margin-left: 48px;
 											}
 											.rank_3{
-												margin-left: 42px;
+												margin-left: 43px;
 												@include shuzi_123;
 											}
 										}
@@ -1352,7 +1352,7 @@
 											@include name_123;
 										}
 										.name_3{
-											margin-left: 35px;
+											margin-left: 28px;
 											@include name_123;
 										}
 									}
diff --git a/epmet-oper-web/src/components/wx-index/cpt-item.vue b/epmet-oper-web/src/components/wx-index/cpt-item.vue
index 7c37b12..0d206e5 100644
--- a/epmet-oper-web/src/components/wx-index/cpt-item.vue
+++ b/epmet-oper-web/src/components/wx-index/cpt-item.vue
@@ -397,16 +397,18 @@
 	    		</div>
 	    		
 	    	    <div class="d-group-score">
-	    			<span v-if="subindex===0" class="score_1">776</span>
-	    			<span v-if="subindex===1" class="score_2">886</span>
-	    			<span v-if="subindex===2" class="score_3">996</span>
+	    			<span v-if="subindex===0" class="score_1">{{subitem.title1}}</span>
+	    			<span v-if="subindex===1" class="score_2">{{subitem.title2}}</span>
+	    			<span v-if="subindex===2" class="score_3">{{subitem.title3}}</span>
 	    		</div>
-	    	   <div class="d-group-name">
-	    	   	<span v-if="subindex===0" class="name_1">某某</span>
-	    	   	<span v-if="subindex===1" class="name_2">某某</span>
-	    	   	<span v-if="subindex===2" class="name_3">某某</span>    
+	    	   <div class="d-group-name"> 
+				   
+				   
+	    	   	<span v-if="subindex===0" class="name_1">{{subitem.info1}}</span>
+	    	   	<span v-if="subindex===1" class="name_2">{{subitem.info2}}</span>
+	    	   	<span v-if="subindex===2" class="name_3">{{subitem.info3}}</span>   
+				 
 	    	   </div>
-			   
 	    	  </div>
 	    	</div>	
 	    </div>
@@ -427,7 +429,6 @@
 				<div class="item"
 				:key="subindex"
 				v-for="(subitem,subindex) in item.demoData.list2">
-	
 				<div class="d-group-rank">
 					<span>{{subitem.rank}}</span>
 				</div>