样式修改

dsk-operate-ui/src/assets/styles/public.scss

@@ -441,14 +441,15 @@ select {
 
 
 .toolbar-right-download {
-	padding: 6px 18px;
+	padding: 6px 16px;
+	position: relative;
+	top: 1px;
 	margin: 0px;
 	cursor: pointer;
 	font-weight: 400;
 	color: #232323;
 	background: #FFFFFF;
 	border-radius: 2px;
-	border: 1px solid #D9D9D9;
 	text-align: center;
 	font-size: 14px;
 	font-weight: 400;

dsk-operate-ui/src/layout/index.vue

@@ -2,7 +2,7 @@
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar" id="sidebar"/>
-    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='Group',width1350:$route.name=='Radar',width1240:$route.name=='Overview'}" class="main-container">
+    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,width1350:$route.name=='Radar'||$route.name=='Group',width1240:$route.name=='Overview'}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}" style="position: relative;z-index: 1000;">
         <navbar :offsetWidth="offsetWidth"/>
       </div>
@@ -133,9 +133,6 @@ export default {
   .mobile .fixed-header {
     width: 100%;
   }
-  .EnterpriseData{
-    min-width: 1710px;
-  }
   .width1350{
     min-width: 1350px;
   }

dsk-operate-ui/src/views/detail/party-a/component/Header.vue

@@ -9,7 +9,7 @@
         <el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '&#45;&#45;'}}</el-breadcrumb-item>
       </el-breadcrumb>
     </div>-->
-    <div class="flex-box part-header">
+    <div class="flex-box part-header" style="min-width:1248px;">
       <img class="header-logo" :src="companyInfo && companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')">
       {{companyInfo && companyInfo.companyName || '--'}}
     </div>

dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue

@@ -23,7 +23,7 @@
                                 <div>
                                     <span style="font-size: 14px;color: #0384FA;"  v-html="item.combineName" ></span>
                                     <div style="height:22px;line-height: 22px;"><span class="infinite-label">集团成员：</span>{{ item.combineMemberNum }}</div>
-                                    <div ><span class="infinite-label">集团本身：</span>{{ item.combineMemberName }}</div>
+                                    <div ><span class="infinite-label">集团本身：</span><el-tooltip class="item" effect="dark" :content="item.combineMemberName" placement="bottom-start"><span>{{ item.combineMemberName }}</span></el-tooltip></div>
                                 </div>
                             </div>
                         </div>
@@ -45,7 +45,7 @@
                                     <div style="float: left;">
                                         <span class="name"  v-html="item.combineName" ></span>
                                         <div style="height:28px;line-height: 28px;"><span class="infinite-label">集团成员：</span>{{ item.combineMemberNum }}</div>
-                                        <div class="name1"><span class="infinite-label">集团本身：</span>{{ item.combineMemberName }}</div>
+                                        <div class="name1"><span class="infinite-label">集团本身：</span><el-tooltip class="item" effect="dark" :content="item.combineMemberName" placement="bottom-start"><span>{{ item.combineMemberName }}</span></el-tooltip></div>
                                     </div>
                                 </div>
                             </div>
@@ -57,7 +57,7 @@
                                     <div style="float: left;">
                                         <span class="name"  v-html="item.combineName" ></span>
                                         <div style="height:28px;line-height: 28px;"><span class="infinite-label">集团成员：</span>{{ item.combineMemberNum }}</div>
-                                        <div class="name1"><span class="infinite-label">集团本身：</span>{{ item.combineMemberName }}</div>
+                                        <div class="name1"><span class="infinite-label">集团本身：</span><el-tooltip class="item" effect="dark" :content="item.combineMemberName" placement="bottom-start"><span>{{ item.combineMemberName }}</span></el-tooltip></div>
                                     </div>
                                 </div>
                             </div>
@@ -101,7 +101,7 @@
                                         <div style="float: left;">
                                             <span class="name"  v-html="item.combineName" ></span>
                                             <div style="height:28px;line-height: 28px;"><span class="infinite-label">集团成员：</span>{{ item.combineMemberNum }}</div>
-                                            <div class="name1"><span class="infinite-label">集团本身：</span>{{ item.combineMemberName }}</div>
+                                            <div class="name1"><span class="infinite-label">集团本身：</span><el-tooltip class="item" effect="dark" :content="item.combineMemberName" placement="bottom-start"><span>{{ item.combineMemberName }}</span></el-tooltip></div>
                                         </div>
                                     </div>
                                 </template>
@@ -395,7 +395,7 @@ export default {
         border-radius: 4px 4px 4px 4px;
 	    background: #FFFFFF;
         font-size: 14px;
-        min-width: 1580px;
+        min-width: 1280px;
 
 	   .content_item{
 	       .content_right{
@@ -506,11 +506,11 @@ export default {
     }
     .contetn_wrap{
         position: relative;
-        min-width: 1668px;
+        min-width: 1280px;
 
         .wrap{
             margin-top: 12px;
-            min-width: 1628px;
+            min-width: 1228px;
             overflow: auto;
             background: #FFFFFF;
             border-radius: 4px 4px 4px 4px;
@@ -532,7 +532,7 @@ export default {
             .infinite-list-item{
                 margin-right: 16px;
                 margin-top: 16px;
-                width: 383px;
+                width: 283px;
                 height: 90px;
                 background: #FFFFFF;
                 border-radius: 0px 0px 0px 0px;
@@ -555,7 +555,7 @@ export default {
                     float: left;
                 }
                 .name{
-                    width: 283px;
+                    width: 178px;
                     overflow: hidden;
                     text-overflow: ellipsis;
                     white-space: nowrap;
@@ -566,7 +566,7 @@ export default {
                     display: inline-block;
                 }
                 .name1{
-                    width: 283px;
+                    width: 178px;
                     overflow: hidden;
                     text-overflow: ellipsis;
                     white-space: nowrap;

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -113,7 +113,7 @@
 			<div class="bottomlist-title">
 			  <div class="bottomlist-title-left" >
 				  <p class="title-left">
-					  查询结果列表
+					<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
 				  </p>
 				  <el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
 					  popper-class="viewlist-el-popover">
@@ -132,7 +132,6 @@
 
 
 				<div class="title-right">
-					<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
 					<p>
 						<img src="@/assets/images/EXCEL.png" alt="">
 						<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
@@ -1159,12 +1158,6 @@
 			  .title-right{
 				  display: flex;
 				  align-items: center;
-				  p:first-child{
-					  font-size: 12px;
-					  font-weight: 400;
-					  color: #3D3D3D;
-					  margin-right: 10px;
-				  }
 				  p:last-child{
 					  display: flex;
 					  align-items: center;
@@ -1186,14 +1179,11 @@
 			  display: inline-flex;;
 			  align-items: center;
 			  .title-left{
-				  border-left:2px solid #445781;
-				  padding-left:8px;
-				  padding-right:32px;
-				  font-size: 16px;
 				  height:16px;
 				  line-height: 16px;
-				  font-weight: bold;
-				  color: #232323;
+				  font-size: 12px;
+				  font-weight: 400;
+				  color: #3D3D3D;
 			   }
 		  }
 		  .bottomlist-content{

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -432,6 +432,9 @@
         <div class="bottomlist">
         	<div class="bottomlist-title">
         		<div class="bottomlist-title-left">
+					<p class="title-left">
+						<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
+					</p>
 					<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
 						popper-class="viewlist-el-popover">
 						<ul class="pup_list">
@@ -452,7 +455,6 @@
 					</div>
 				</div>
         		<div class="title-right">
-        			<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
         			<p>
         				<img src="@/assets/images/EXCEL.png" alt="">
         				<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
@@ -2989,16 +2991,16 @@
 			margin-top: 12px;
 			padding: 16px 0px ;
 			border-bottom: 1px solid #EFEFEF;
-			 
-			.title-right{
-				display: flex;
-				align-items: center;
-				p:first-child{
+			.title-left{
+				  height:16px;
+				  line-height: 16px;
 				  font-size: 12px;
 				  font-weight: 400;
 				  color: #3D3D3D;
-					margin-right: 10px;
 			   }
+			.title-right{
+				display: flex;
+				align-items: center;
 				p:last-child{
 					display: flex;
 					align-items: center;

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

@@ -121,11 +121,10 @@
 	  	<div class="bottomlist-title">
 	  		<div class="bottomlist-title-left" >
 					<p class="title-left">
-						查询结果
+						<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
 					</p>
 				</div>
 	  		<div class="title-right">
-	  			<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
 	  			<p>
 	  				<img src="@/assets/images/EXCEL.png" alt="">
 	  				<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
@@ -964,12 +963,7 @@ export default {
 			.title-right{
 				display: flex;
 				align-items: center;
-				p:first-child{
-					font-size: 12px;
-					font-weight: 400;
-					color: #3D3D3D;
-					margin-right: 10px;
-				}
+				
 				p:last-child{
 					display: flex;
 					align-items: center;
@@ -989,14 +983,11 @@ export default {
 				display: inline-flex;;
 				align-items: center;
 				.title-left{
-					border-left:2px solid #445781;
-					padding-left:8px;
-					padding-right:32px;
-					font-size: 16px;
 				  height:16px;
 				  line-height: 16px;
-					font-weight: bold;
-					color: #232323;
+				  font-size: 12px;
+				  font-weight: 400;
+				  color: #3D3D3D;
 			   }
 			}
 		}

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

@@ -206,11 +206,10 @@
 	  	<div class="bottomlist-title">
 			<div class="bottomlist-title-left" >
 					<p class="title-left">
-						查询结果
+						<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
 					</p>
 				</div>
 	  		<div class="title-right">
-	  			<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
 	  			<p>
 	  				<img src="@/assets/images/EXCEL.png" alt="">
 	  				<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
@@ -1163,25 +1162,16 @@ export default {
 				display: inline-flex;;
 				align-items: center;
 				.title-left{
-					border-left:2px solid #445781;
-					padding-left:8px;
-					padding-right:32px;
-					font-size: 16px;
 				  height:16px;
 				  line-height: 16px;
-					font-weight: bold;
-					color: #232323;
+				  font-size: 12px;
+				  font-weight: 400;
+				  color: #3D3D3D;
 			   }
 			}
 			.title-right{
 				display: flex;
 				align-items: center;
-				p:first-child{
-					font-size: 12px;
-					font-weight: 400;
-					color: #3D3D3D;
-					margin-right: 10px;
-				}
 				p:last-child{
 					display: flex;
 					align-items: center;

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

@@ -177,11 +177,10 @@
 			<div class="bottomlist-title">
 				<div class="bottomlist-title-left" >
 					<p class="title-left">
-						查询结果
+						<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
 					</p>
 				</div>
 				<div class="title-right">
-					<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
 					<p>
 						<img src="@/assets/images/EXCEL.png" alt="">
 						<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
@@ -1256,12 +1255,7 @@
 			.title-right{
 				display: flex;
 				align-items: center;
-				p:first-child{
-					font-size: 12px;
-					font-weight: 400;
-					color: #3D3D3D;
-					margin-right: 10px;
-				}
+				
 				p:last-child{
 					display: flex;
 					align-items: center;
@@ -1281,14 +1275,11 @@
 				display: inline-flex;;
 				align-items: center;
 				.title-left{
-					border-left:2px solid #445781;
-					padding-left:8px;
-					padding-right:32px;
-					font-size: 16px;
 				  height:16px;
 				  line-height: 16px;
-					font-weight: bold;
-					color: #232323;
+				  font-size: 12px;
+				  font-weight: 400;
+				  color: #3D3D3D;
 			   }
 			}
 		}

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

@@ -204,7 +204,7 @@
 				<div class="bottomlist-title">
 					<div class="bottomlist-title-left" >
 						<p class="title-left">
-							查询结果
+							<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
 						</p>
 						<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
 							popper-class="viewlist-el-popover">
@@ -221,7 +221,6 @@
 						</el-popover>
 					</div>
 					<div class="title-right">
-						<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
 							<p>
 							<img src="@/assets/images/EXCEL.png" alt="">
 							<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
@@ -1053,25 +1052,17 @@
 				display: inline-flex;;
 				align-items: center;
 				.title-left{
-					border-left:2px solid #445781;
-					padding-left:8px;
-					padding-right:32px;
-					font-size: 16px;
 				  height:16px;
 				  line-height: 16px;
-					font-weight: bold;
-					color: #232323;
+				  font-size: 12px;
+				  font-weight: 400;
+				  color: #3D3D3D;
 			   }
 			}
 			.title-right{
 				display: flex;
 				align-items: center;
-				p:first-child{
-					font-size: 12px;
-					font-weight: 400;
-					color: #3D3D3D;
-					margin-right: 10px;
-				}
+				
 				p:last-child{
 					display: flex;
 					align-items: center;

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

@@ -123,7 +123,7 @@
 	  	<div class="bottomlist-title">
 	  		<div class="bottomlist-title-left" >
 					<p class="title-left">
-						查询结果
+						<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
 					</p>					
 					<el-popover v-model="fieldshow" placement="bottom-start" trigger="click" popper-class="viewlist-el-popover">
 						<ul class="pup_list pup_zhclist">
@@ -137,7 +137,6 @@
 					</el-popover>
 				</div>
 	  		<div class="title-right">
-	  			<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
 	  			<p v-hasPermi="['radar:export:important']" >
 	  				<img src="@/assets/images/EXCEL.png" alt="">
 	  				<span class="excel" @click="clickDialog">导出EXCEL</span>
@@ -918,12 +917,7 @@ export default {
 			.title-right{
 				display: flex;
 				align-items: center;
-				p:first-child{
-					font-size: 12px;
-					font-weight: 400;
-					color: #3D3D3D;
-					margin-right: 10px;
-				}
+				
 				p:last-child{
 					display: flex;
 					align-items: center;
@@ -943,14 +937,11 @@ export default {
 				display: inline-flex;;
 				align-items: center;
 				.title-left{
-					border-left:2px solid #445781;
-					padding-left:8px;
-					padding-right:32px;
-					font-size: 16px;
 				  height:16px;
 				  line-height: 16px;
-					font-weight: bold;
-					color: #232323;
+				  font-size: 12px;
+				  font-weight: 400;
+				  color: #3D3D3D;
 			   }
 			}
 		}

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

@@ -179,11 +179,10 @@
 			<div class="bottomlist-title">
 				<div class="bottomlist-title-left" >
 					<p class="title-left">
-						查询结果
+						<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
 					</p>
 				</div>
 				<div class="title-right">
-					<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
 					<p>
 						<img src="@/assets/images/EXCEL.png" alt="">
 						<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
@@ -1257,25 +1256,17 @@
 				display: inline-flex;;
 				align-items: center;
 				.title-left{
-					border-left:2px solid #445781;
-					padding-left:8px;
-					padding-right:32px;
-					font-size: 16px;
 				  height:16px;
 				  line-height: 16px;
-					font-weight: bold;
-					color: #232323;
+				  font-size: 12px;
+				  font-weight: 400;
+				  color: #3D3D3D;
 			   }
 			}
 			.title-right{
 				display: flex;
 				align-items: center;
-				p:first-child{
-					font-size: 12px;
-					font-weight: 400;
-					color: #3D3D3D;
-					margin-right: 10px;
-				}
+				
 				p:last-child{
 					display: flex;
 					align-items: center;

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

@@ -333,11 +333,10 @@
 		<div class="bottomlist-title">
 			<div class="bottomlist-title-left" >
 					<p class="title-left">
-						查询结果
+						<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
 					</p>
 				</div>
 			<div class="title-right">
-				<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
 				<p>
 					<img src="@/assets/images/EXCEL.png" alt="">
 					<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
@@ -2009,25 +2008,17 @@
 				display: inline-flex;;
 				align-items: center;
 				.title-left{
-					border-left:2px solid #445781;
-					padding-left:8px;
-					padding-right:32px;
-					font-size: 16px;
 				  height:16px;
 				  line-height: 16px;
-					font-weight: bold;
-					color: #232323;
+				  font-size: 12px;
+				  font-weight: 400;
+				  color: #3D3D3D;
 			   }
 			}
 			.title-right{
 				display: flex;
 				align-items: center;
-				p:first-child{
-					font-size: 12px;
-					font-weight: 400;
-					color: #3D3D3D;
-					margin-right: 10px;
-				}
+				
 				p:last-child{
 					display: flex;
 					align-items: center;

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

@@ -93,11 +93,10 @@
 			<div class="bottomlist-title">
 				<div class="bottomlist-title-left" >
 					<p class="title-left">
-						查询结果
+						<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
 					</p>
 				</div>
 				<div class="title-right">
-					<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
 					<p>
 						<img src="@/assets/images/EXCEL.png" alt="">
 						<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
@@ -697,25 +696,17 @@
 				display: inline-flex;;
 				align-items: center;
 				.title-left{
-					border-left:2px solid #445781;
-					padding-left:8px;
-					padding-right:32px;
-					font-size: 16px;
 				  height:16px;
 				  line-height: 16px;
-					font-weight: bold;
-					color: #232323;
+				  font-size: 12px;
+				  font-weight: 400;
+				  color: #3D3D3D;
 			   }
 			}
 			.title-right{
 				display: flex;
 				align-items: center;
-				p:first-child{
-					font-size: 12px;
-					font-weight: 400;
-					color: #3D3D3D;
-					margin-right: 10px;
-				}
+				
 				p:last-child{
 					display: flex;
 					align-items: center;