hy

dsk-operate-ui/src/views/radar/components/Bidding/index.vue

@@ -155,14 +155,14 @@
 	  				 <router-link  :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"  ></router-link>
 	  				 <!-- <div  v-else-if="item.projectName" v-html="item.projectName"></div> -->
 	  			</p>
-	  			<div class="content-label" v-if="(item.province||item.city||item.city)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
+	  			<div class="content-label" v-if="(item.province||item.city||item.area)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
 	  				<span class="list-label" v-if="item.domicile">
 						{{item.province}}
 						<template v-if="item.city">
 							 -{{item.city}}
 						</template>
-						<template v-if="item.city">
-							  -{{item.city}}
+						<template v-if="item.area">
+							  -{{item.area}}
 						</template>
 					</span>
 					<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>

dsk-operate-ui/src/views/radar/components/Establishment/index.vue

@@ -228,14 +228,12 @@
 						
 						
 					</div>
-					<div  class="list-content" v-if="item.buildScale">
-						<p class="list-content-text" >
-							<span>建设规模：</span>
-							<span>{{item.buildScale}}</span>
+					<div  class="list-content"  v-if="item.buildScale">
+						<p class="list-content-text">
+							<span class="content-text-gc">建设规模：</span>
+							<span class="content-text-p">{{item.buildScale||'--'}}</span>
 						</p>
 						
-						
-						
 					</div>
 				
 					
@@ -1309,6 +1307,12 @@
 						color: rgba(35,35,35,0.8);
 						line-height: 15px
 					}
+					.content-text-gc{
+						width: 72px;
+					}
+					.content-text-p{
+						width: 1200px;
+					}
 					.blue{
 						color: #0081FF !important;
 						cursor: pointer;
@@ -1323,7 +1327,7 @@
 				width: auto;
 				background: #F3F4F5;
 				display: inline-flex;
-				margin-top: 7px;
+				margin-top: 12px;
 				.list-content-text{
 					margin-top: 0px;
 					span{