修改

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

@@ -121,7 +121,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 16px;
+  //padding: 16px;
   //margin-top: 56px;
 }
 
@@ -223,6 +223,7 @@ ul, li {
 .app-container {
   margin: 12px 24px;
   background-color: #f5f5f5;
+  padding-bottom: 16px !important;
   .el-input__inner{
     border-color: #D9D9D9;
     color: #232323;

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -88,7 +88,7 @@ export default {
   overflow: inherit;
   /*position: relative;*/
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  /*box-shadow: 0 1px 4px rgba(0,21,41,.08);*/
   position: fixed;
   top:0;
   z-index: 999;

dsk-operate-ui/src/views/custom/historicalCustomers/index.vue

@@ -18,7 +18,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" max-height="640"
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="'always'" max-height="640"
             :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -26,7 +26,7 @@
               prop="index"
               label="序号"
               fixed="left"
-              width="47">
+              width="60">
               <template slot-scope='scope'>
                 <span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span>
               </template>
@@ -51,7 +51,7 @@
             <el-table-column
               prop="cooperationProject"
               label="合作项目"
-              width="76">
+              width="90">
               <template slot-scope="scope">
                 {{scope.row.cooperationProject || '--'}}
               </template>
@@ -59,7 +59,7 @@
             <el-table-column
               prop="followProject"
               label="跟进项目"
-              width="76">
+              width="90">
               <template slot-scope="scope">
                 {{scope.row.followProject || '--'}}
               </template>
@@ -67,7 +67,7 @@
             <el-table-column
               prop="reserveProject"
               label="储备项目"
-              width="76">
+              width="90">
               <template slot-scope="scope">
                 {{scope.row.reserveProject || '--'}}
               </template>
@@ -91,7 +91,7 @@
             <el-table-column
               prop="registerCapitalStr"
               label="注册资本金（万元）"
-              width="140">
+              width="160">
               <template slot-scope="scope">
                 <span v-if="scope.row.registerCapital && scope.row.registerCapital>0">{{scope.row.registerCapital}}</span><span v-else>--</span>
               </template>

dsk-operate-ui/src/views/custom/overview/index.vue

@@ -108,7 +108,7 @@
     <div class="content_wap3">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
-          <span class="title">跟进动态</span>
+          <span class="item_title">跟进动态</span>
         </div>
         <div class="flex-box time-label">
           <div class="labels">
@@ -689,14 +689,6 @@
           border: 1px solid #0081FF;
           color: #ffffff;
           background: #0081FF;
-          /*.el-button{*/
-            /*border: 1px solid #0081FF;*/
-            /*span{*/
-              /*color: #ffffff;*/
-              /*background: #0081FF;*/
-              /*border: 1px solid #0081FF;*/
-            /*}*/
-          /*}*/
         }
 
 
@@ -856,7 +848,7 @@
       .query-box{
         padding:16px;
       }
-      .title{
+      .item_title{
         font-weight: 700;
         color: #232323;
         font-size: 16px;

dsk-operate-ui/src/views/detail/groupAccount/component/Sidebar.vue

@@ -53,12 +53,14 @@ export default {
         {title: '集团成员', pathName: 'members'},
         {title: '集团资质', pathName: 'qualifications'},
         {title: '集团业绩', pathName: 'performance'},
+        {title: '集团招标', pathName: 'zhaobiao'},
       ],
       defaultRoute: [],
       customer:[
         'members',
         'qualifications',
         'performance',
+        'zhaobiao',
       ],
       uniqueOpened:false,
       searchIndex: ''

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -171,7 +171,7 @@
         qyType:[],
         cgblList:['100%','50%以上','20%以上','5%以上','1%-5%'],
         cgblName:'',
-        paramsData:[],  //储存组件筛选的条件
+        paramsData:{},  //储存组件筛选的条件
       }
     },
     watch:{
@@ -244,7 +244,7 @@
         }
       },
       handleQuery(params){
-        this.paramsData=params;
+        this.paramsData=params || {};
         this.tableLoading=true
         let data = this.getAreaList(params || this.queryParams)
         memberList(data).then(res=>{
@@ -400,7 +400,11 @@
       },
       sortChange({ column, prop, order }){
         this.queryParams.orderName = prop
-        this.paramsData.orderName = prop
+        this.paramsData.orderName = prop;
+        this.paramsData.combineId = this.customerId;
+        this.paramsData.pageNum = 1;
+        this.paramsData.pageSize = 20;
+
         if(column.order === "ascending"){
           this.queryParams.orderType = 'asc'
           this.paramsData.orderType = 'asc'

dsk-operate-ui/src/views/detail/groupAccount/index.vue

@@ -15,6 +15,7 @@
           <Members v-if="currentPath.pathName=='members'" :customer-id="customerId" :isSkeleton="isSkeleton" />
           <Qualifications v-if="currentPath.pathName=='qualifications'" :customer-id="customerId" :isSkeleton="isSkeleton" :name="name"/>
           <Performance v-if="currentPath.pathName=='performance'" :customer-id="customerId" :isSkeleton="isSkeleton"/>
+          <Zhaobiao v-if="currentPath.pathName=='zhaobiao'" :customer-id="customerId" :isSkeleton="isSkeleton"/>
         </div>
       </div>
     </div>
@@ -27,12 +28,13 @@
   import Members from "./component/members"
   import Qualifications from "./component/qualifications"
   import Performance from "./component/performance"
+  import Zhaobiao from "./component/zhaobiao"
   import { infoHeader } from '@/api/detail/party-a/index'
   import elementResizeDetectorMaker from "element-resize-detector"
   export default {
     name: 'GroupAccount',
     components:{
-      SideBar,Members,Qualifications,Performance
+      SideBar,Members,Qualifications,Performance,Zhaobiao
     },
     data(){
       return{
@@ -83,6 +85,7 @@
     width: 100%;
     background: #FFFFFF;
     border-radius: 4px;
+    margin-bottom: 16px;
   }
   .part-header{
     font-size: 16px;

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

 <template>
   <div class="headForm">
-    <div class="flex-box query-box">
+    <div class="flex-box query-box" v-if="title === '集团招标'">
       <div class="flex-box query-params">
         <span class="common-title" v-if="title">{{ title }}</span>
         <div class="headForm-from">
           <div class="from-item" :key="i" v-for="(form, i) in formData">
             <!-- 单选 -->
             <template v-if="form.type==1">
-                <el-select
-                  v-model="form.value"
-                  clearable
-                  class="form-content-width"
-                  :style="form.width?'width:'+form.width+'px':'max-width: 110px'"
-                  :placeholder="form.placeholder"
-                  @change="changeSelect">
-                  <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" :disabled="item.disabled"/>
-                </el-select>
+              <el-select
+                v-model="form.value"
+                clearable
+                class="form-content-width"
+                :style="form.width?'width:'+form.width+'px':'max-width: 110px'"
+                :placeholder="form.placeholder"
+                @change="changeSelect">
+                <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" :disabled="item.disabled"/>
+              </el-select>
             </template>
             <!-- 年月日 -->
             <template v-if="form.type==2">
@@ -102,6 +102,7 @@
       </div>
     </div>
   </div>
+
 </template>
 
 <script>

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

@@ -11,10 +11,10 @@
 	  	       <el-input class="ename_input" placeholder="请输入企业名称关键字" clearable v-model="keys" >
 	  	   		<div slot="append" class="btn-search" @click="search()">搜索</div>
 	  	   	</el-input>
-	  	      
+
 	  	   </div>
 	  	</div>
-		
+
 		<div class="content_item">
 		    <div class="label">企业地区</div>
 		    <div class="content_right item_ckquery_list">
@@ -45,7 +45,7 @@
 						</el-checkbox-group>
 				   </div>
 			   </div>
-			   
+
 		    </div>
 		</div>
 		<div class="content_item">
@@ -131,8 +131,8 @@
 					</span>
 				</el-popover>
 			</div>
-	  		
-			
+
+
 	  		<div class="title-right">
 	  			<p>共有{{total}}条</p>
 	  			<p>
@@ -140,7 +140,7 @@
 	  				<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
 	  			</p>
 	  		</div>
-	  		  
+
 	  	</div>
 		<div class="table-item-jf table-item-jf1" v-if="tableData.length==0&& !isSkeleton">
 			<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
@@ -149,8 +149,8 @@
 		</div>
 		<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
 
-	  	<div class=" table-item-jf" v-if="!isSkeleton&&tableData.length>0">
-	  	  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" max-height="640"  class="table-item1 fixed-table"  border  highlight-current-row>
+	  	<div class="table-item table-item-jf" v-if="!isSkeleton&&tableData.length>0">
+	  	  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'always'"  class="table-item1 fixed-table"  border  highlight-current-row>
 	  			<el-table-column type="index" label="序号" fixed width="60">
 	  			 <template slot-scope="scope">
 	  			 	<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
@@ -162,22 +162,22 @@
 									 <router-link  :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="list-titel-a" v-html="scope.row.companyName" ></router-link>
 									 <div class="renling-btn" @click="claimbtn(scope.row)" >
 										 <p  v-if="scope.row.claimStatus==0"  class="renling-img-true">
-											 
+
 										 </p>
 										 <p v-else   class="renling-img-false">
-										 											 
+
 										 </p>
 									 	<span v-if="scope.row.claimStatus==0" @click="cancelClaim(scope.row.companyName,scope.$index)" class="renling-hui">
 											已认领
-										</span>	
+										</span>
 										<span v-else class="renling-hei">
 											认领
 										</span>
 									 </div>
 								 </div>
-								 
+
 							</template>
-								 
+
 	  			 </el-table-column>
 	  			<el-table-column label="区域"   width="160">
 	  					<template slot-scope="scope">
@@ -191,20 +191,20 @@
 							   </template>
 							   {{scope.row.area}}
 	  					</template>
-	  						  
+
 	  			</el-table-column>
 	  			<el-table-column  label="招标数量" width="72" >
 	  						  <template slot-scope="scope">
 	  							 {{scope.row.biddingCount||"--"}}
 	  							</template>
-	  							
+
 	  			</el-table-column>
 	  			<el-table-column  label="城投拿地" width="72" >
 	  						<template slot-scope="scope">
 	  							  	{{scope.row.landInfoCount||"--"}}
 	  						</template>
 	  			 </el-table-column>
-				 
+
 				 <el-table-column  label="供应商" width="72" >
 				 			<template slot-scope="scope">
 				 				  	{{scope.row.supplierCount||"--"}}
@@ -440,7 +440,7 @@
 														  	{{scope.row.developmentZone||"--"}}
 													</template>
 										</el-table-column>
-										
+
 	  	  </el-table>
 	  	</div>
 	  	<div class="pagination clearfix"  v-show="total>0">
@@ -453,7 +453,7 @@
 	  		    :total="total">
 	  		  </el-pagination>
 	  	</div>
-	  	
+
 	  </div>
 	  <el-dialog
 	    title=""
@@ -544,10 +544,10 @@ export default {
 	  equityRelationship:[],
 	  equityRelationshipText:[],
 	  checkequityRelationship:true,
-	  
+
       pageFlag: true,
 	  conditionsArr: [],
-	  
+
 	  fieldshow: false,
 	  fieldText: '默认排序',
 	  sort: '3', //查询结果排序方式
@@ -556,20 +556,20 @@ export default {
 	  		value: "默认排序",
 	  		status: true,
 	  	},
-	  	
+
 		{
 			key: "5",
 			value: "招标数量从多到少",
 			status: false,
 		},
-		
-		
+
+
 		{
 			key: "7",
 			value: "土地数量从多到少",
 			status: false,
 		},
-		
+
 	  ],
 	  companyId:'',
 	  companyName:'',
@@ -588,12 +588,12 @@ export default {
         let arr = [];
 		let flag = false;
 		let data = {};
-      
-     
-     
-     
-     
-     
+
+
+
+
+
+
       if (this.domicile.length > 0) {
         data = {
           title: "行政区划:",
@@ -604,9 +604,9 @@ export default {
         flag = true;
         arr.push(data)
       }
-     
-      
-      
+
+
+
       this.conditionsArr = arr
       return flag;
     },
@@ -624,10 +624,10 @@ export default {
   	          	this.shareholderBg=res.data.shareholderBg,
   	          	// 股权关系
   	          	this.equityRelationship=res.data.equityRelationship;
-				
+
   	          }
   	}).catch(error=>{
-		
+
   	});
   },
   mounted() {
@@ -660,9 +660,9 @@ export default {
     	this.jskBidQueryDto = obj;
 		this.search();
     },
-    
-   
-   
+
+
+
     addressListfn() {
       var str = [];
       for (let x = 0; x < 3; x++) {
@@ -707,24 +707,24 @@ export default {
       }
       this.addressList = str;
     },
-  
-   
-   
+
+
+
     reset() {
       Object.assign(this.$data, this.$options.data.call(this)); //重置data
       this.init();
-   
+
     },
     init(){
       this.search();
       this.addressListfn();
     },
-   
+
 	checkuipExecutivebtn(val){
 		this.uipExecutiveText =[];
 		this.checkuipExecutive=true;
 		this.search();
-		
+
 	},
 	uipExecutiveLevelbtn(val){
 		if(val.length>0){
@@ -733,7 +733,7 @@ export default {
 			this.checkuipExecutive=true;
 		}
 		this.search();
-		
+
 	},
 	checkuipBusinessbtn(val){
 		this.uipBusinessText =[];
@@ -848,12 +848,12 @@ export default {
 				 		this.customerId=res1.data.customerId;
 				    }
 				 }).catch(error=>{
-				 	
+
 				 });
 		}).catch(error=>{
-			
+
 		});
-		
+
 	},
 	cancelClaim(companyName,index){
 		this.dialogVisible1 = true;
@@ -871,9 +871,9 @@ export default {
 		})
 	},
 	claimopen(companyId,customerId){
-		this.$router.push({ 
+		this.$router.push({
 			path: '/enterprise/'+encodeStr(companyId),
-			query: { 
+			query: {
 				'customerId': customerId,
 				'path':'business'
 				} ,
@@ -904,7 +904,7 @@ export default {
 	  }else{
 	    delete params.keys
 	  }
-	  
+
 	  if(data.provinceIds.length>0){
 	   params['provinceIds'] = data.provinceIds;
 	  }else{
@@ -952,19 +952,19 @@ export default {
 	            if (res.code==200) {
 					this.tableData=res.rows;
 					this.total=res.total;
-	  			
+
 	            }
 	  }).catch(error=>{
 	  });
-	  
+
 	},
 	renlin(){
 		this.dialogVisible=false;
 		// this.$router.push({path:'/home',query: {id:'1'}})
 		// 跳转地址
 	},
-	
-	
+
+
   },
 };
 </script>
@@ -1027,7 +1027,7 @@ export default {
 			   color: rgba(35,35,35,0.8);
 	       }
 	       .content_right{
-	           
+
 	           .ename_input{
 	               width: 640px;
 	               margin-right: 20px;
@@ -1075,10 +1075,10 @@ export default {
 		   	   .ckquery_list_right{
 		   	     width: 670px;
 		   	   }
-		   
+
 		   }
-		   
-		
+
+
 		 .item_ckquery_list .el-input__icon {
 			position: relative;
 			top: 1px;
@@ -1088,7 +1088,7 @@ export default {
 		}
 		.register_count_ipt{
 			margin-left: 0px;
-			
+
 		}
 		.register_count_ipt .el-input__inner{
 			width: 174px;
@@ -1121,19 +1121,19 @@ export default {
 				padding: 1px 5px !important;
 			}
 		}
-		
-		
-	   
+
+
+
 	   }
 	   .content_item_padding0{
 		   padding: 0;
 	   }
-		
+
 	}
 	.bottomlist{
 		width: 100%;
 		background-color: #FFFFFF;
-		
+
 	     border-radius: 4px 4px 4px 4px;
 		.bottomlist-title{
 			display: flex;
@@ -1141,7 +1141,7 @@ export default {
 			align-items: center;
 			margin-top: 12px;
 			padding: 16px ;
-			 
+
 			.title-right{
 				display: flex;
 				align-items: center;
@@ -1166,7 +1166,7 @@ export default {
 					cursor: pointer;
 				}
 			}
-			
+
 		}
 		.bottomlist-title-left{
 			display: inline-flex;;
@@ -1183,24 +1183,24 @@ export default {
 			}
 		}
 		.bottomlist-content{
-			
+
 			padding-bottom: 0px;
 		}
 
-		
+
 		.table-item-jf{
 			padding:0px 16px;
 			.list-titel-a{
 				color:#0081FF;
 			}
 			::v-deep .el-table--border .el-table__cell:first-child .cell{
-				padding:0px 8px;
+				padding:0px 8px ;
 				padding-left:12px;
 				font-size: 12px;
 				font-weight: 400;
 			}
 			 ::v-deep .el-table th.el-table__cell > .cell{
-				padding:0px 8px;
+				padding:0px 8px !important;
 				padding-left:12px;
 				font-size: 12px;
 				font-weight: 400;
@@ -1241,7 +1241,7 @@ export default {
 						background-size: 100% 100%;
 						background-repeat: no-repeat;
 					}
-					
+
 					.renling-hui{
 						font-size: 13px;
 						font-weight: 400;
@@ -1252,20 +1252,20 @@ export default {
 						font-weight: 400;
 						color: #3D3D3D;
 					}
-					
-					
+
+
 				}
-				
-				
+
+
 				.renling-btn:hover{
 					.renling-hei{
 						color: #0081FF;
 					}
-					
+
 				}
-				
+
 			}
-			
+
 		}
 		.table-item1{
 			::v-deep .el-table__body-wrapper{
@@ -1289,7 +1289,7 @@ export default {
 				overflow-x: clip;
 				overflow-y: clip;
 			}
-			
+
 		}
 		.table-item-jf1{
 			border-top:1px solid  #EFEFEF;
@@ -1301,6 +1301,6 @@ export default {
 		   }
 		}
 	}
-	
-	
+
+
 </style>

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -22,6 +22,7 @@
           v-loading="tableLoading"
           :data="tableData"
           border
+          v-horizontal-scroll="'always'"
           highlight-current-row
           @sort-change="sortChange"
           :default-sort = "{prop: 'gdp', order: 'descending'}"

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -20,6 +20,7 @@
           collapse-tags
           clearable></el-cascader>
         <el-input placeholder="输入关键词查询" v-model="queryParams.ename" clearable @clear="handleSearch()">
+          <i slot="prefix" class="el-icon-search"></i>
           <el-button slot="append" @click="handleSearch()">搜索</el-button>
         </el-input>
         <span class="total">共{{tableDataTotal}}条</span>
@@ -31,7 +32,7 @@
           v-loading="tableLoading"
           border
           fit
-          max-height="640"
+          v-horizontal-scroll="'always'"
           @sort-change="sortChange"
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"
@@ -353,11 +354,13 @@ export default {
           width: 180px;
           margin-right: 12px;
           height: 32px;
+          line-height: 32px !important;
           .el-input{
             width: 100%;
             height: 32px;
             .el-input__inner{
               height: 32px !important;
+              line-height: 32px !important;
             }
           }
           .el-cascader__tags{
@@ -378,8 +381,20 @@ export default {
           .el-input__suffix{
             margin-top: -1px;
           }
+          .el-icon-search{
+            font-size: 14px;
+            line-height: 32px;
+            color:#0081FF;
+            margin-left: 6px;
+            margin-right: 4px;
+          }
           .el-input__inner:focus{
-            border-color: #e0e0e0;
+            border-color: #0081FF;
+          }
+          .el-input__inner:focus ~.el-input-group__append{
+            border: 1px solid #0081FF;
+            color: #ffffff;
+            background: #0081FF;
           }
           .el-input-group__append{
             width: 60px;
@@ -388,8 +403,7 @@ export default {
             background: #F5F5F5;
             color:#0081FF;
             border-left: 0;
-            border-radius: 0;
-            border-right: 0;
+            border-radius: 2px;
           }
         }
         .total{

dsk-operate-ui/src/views/macro/financing/index.vue

@@ -437,7 +437,6 @@ export default {
     .content{
       background: #ffffff;
       padding: 16px;
-      margin-bottom: 16px;
       border-radius: 4px;
     }
     .common-title{

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -29,14 +29,13 @@
         </div>
       </div>
       <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
-      <!--v-horizontal-scroll="'always'"-->
       <div class="table-item">
         <el-table
           class="fixed-table"
           :data="tableData"
           element-loading-text="Loading"
           @sort-change="sortChange"
-          max-height="640"
+          v-horizontal-scroll="'always'"
           border
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -92,8 +92,8 @@
           </div>
         </div>
         <el-input class="search-input" placeholder="输入企业名称查询" v-model="queryParams.keyword" clearable @clear="handleKeyword()">
-          <template slot="prepend"><i class="el-icon-search"></i></template>
-          <el-button slot="append" @click="handleKeyword">搜索</el-button>
+          <i slot="prefix" class="el-icon-search"></i>
+          <el-button slot="append" @click="handleKeyword()">搜索</el-button>
         </el-input>
       </div>
       <div class="list-box">
@@ -152,7 +152,7 @@
             element-loading-text="Loading"
             @sort-change="sortChange"
             border
-            max-height="640"
+            v-horizontal-scroll="'always'"
             fit
             highlight-current-row
           >
@@ -830,7 +830,6 @@ export default {
     .content{
       background: #ffffff;
       padding: 16px;
-      margin-bottom: 16px;
       border-radius: 4px;
       .search{
         margin-top: 22px;
@@ -907,29 +906,30 @@ export default {
           /*::v-deep .el-input{*/
             width: 235px;
             height: 32px;
-            .el-input__inner:focus{
-              border-color: #e0e0e0;
-            }
-            .el-input-group__prepend:first-child{
-              padding: 0;
-              background-color:#ffffff;
-              border-right: 0;
-              padding-left: 8px;
-              i{
-                color:#0081FF;
-              }
-            }
             .el-input__inner{
-              border-left: 0;
               height: 32px;
               line-height: 32px;
               font-size: 12px;
-              padding-left: 8px;
               border-right: 0;
             }
             .el-input__suffix{
               margin-top: -1px;
             }
+            .el-icon-search{
+              font-size: 14px;
+              line-height: 32px;
+              color:#0081FF;
+              margin-left: 6px;
+              margin-right: 4px;
+            }
+            .el-input__inner:focus{
+              border-color: #0081FF;
+            }
+            .el-input__inner:focus ~.el-input-group__append{
+              border: 1px solid #0081FF;
+              color: #ffffff;
+              background: #0081FF;
+            }
             .el-input-group__append:last-child{
               width: 60px;
               padding: 0;
@@ -937,8 +937,7 @@ export default {
               background: #F5F5F5;
               color:#0081FF;
               border-left: 0;
-              border-radius: 0;
-              border-right: 0;
+              border-radius: 2px;
             }
           /*}*/
         }

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

@@ -9,7 +9,7 @@
 							<p>{{itme.value}}</p>
 						</div>
 					</div>
-					
+
 				</div>
 			</div>
 			<p class="solid"></p>
@@ -28,8 +28,8 @@
 		<Tender v-if="personnelHerf=='Tender'" />
 		<!-- 开标记录 -->
 		<BidRecord v-if="personnelHerf=='BidRecord'" />
-		
-		
+
+
 
 	</div>
 </template>
@@ -41,7 +41,7 @@
 	import Tender from "./components/Tender/index.vue";
 	import BidRecord from "./components/BidRecord/index.vue";
 	import Bidding from "./components/Bidding/index.vue";
-	
+
 	import "@/assets/styles/public.css";
 	export default {
 		name: 'Radar',
@@ -71,25 +71,25 @@
 						key: 'Bidding',
 						status: false,
 						value: '招标计划',
-					
+
 					},
 					{
 						key: 'bxprozbgg',
 						status: false,
 						value: '标讯pro',
-					
+
 					},
 					{
 						key: 'Tender',
 						status: false,
 						value: '公招标讯',
-					
+
 					},
 					{
 						key: 'BidRecord',
 						status: false,
 						value: '开标记录',
-					
+
 					},
 
 				],
@@ -112,7 +112,7 @@
 </script>
 
 <style lang="scss" scoped>
-	
+
 	.app-container {
 		margin: 12px 24px;
 		padding: 0;
@@ -120,7 +120,7 @@
 	.content{
 		padding: 0px 16px;
        background: #FFFFFF;
-		
+
 	}
 
 	.app-container .combined-title {
@@ -252,4 +252,4 @@
 		border-bottom: 2px solid #0081FF;
 		font-weight: bold;
 	}
-</style>
+</style>
\ No newline at end of file