修改

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

@@ -61,7 +61,7 @@
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
           <div class="table-item">
-            <el-table v-show="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="'always'" ref="thistables"
+            <el-table v-show="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="'hover'" ref="thistables"
                       :data="tableData.rows"
                       stripe border
                       style="width: 100%">

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" v-horizontal-scroll="'always'" max-height="640"
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="'hover'" max-height="640"
             :data="tableData.rows"
             stripe border
             style="width: 100%">

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

@@ -75,7 +75,7 @@
         </el-col>
         <div class="empty" v-if="hzqkTotal === 0">
           <img class="img" src="@/assets/images/project/empty.png">
-          <div class="p1">抱歉，没找到相关数据</div>
+          <div class="p1">抱歉，您还未添加合作客户</div>
         </div>
       </el-row>
     </div>
@@ -102,7 +102,7 @@
       </el-row>
       <div class="empty" v-if="creditLevel.length === 0">
         <img class="img" src="@/assets/images/project/empty.png">
-        <div class="p1">抱歉，没找到相关数据</div>
+        <div class="p1">抱歉，您还未添加客户</div>
       </div>
     </div>
     <div class="content_wap3">
@@ -178,8 +178,7 @@
         </div>
         <div class="empty" v-if="recordlist.length === 0">
           <img class="img" src="@/assets/images/project/empty.png">
-          <div class="p1">抱歉，没找到相关数据</div>
-          <div class="p2">建议调整筛选条件，重新搜索</div>
+          <div class="p1">抱歉，您还未添加跟进动态</div>
         </div>
       </div>
     </div>
@@ -973,7 +972,7 @@
         width: 108px;
         height: 108px;
         margin-bottom: 24px;
-        margin-top: 50px;
+        margin-top: 100px;
       }
       .p1{
         color: #333333;

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

@@ -85,7 +85,7 @@
         ],
         formData: [
           { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '项目地区', options:[]},
-          { type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[] },
+          { type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[],dateTo:this.formatDate(new Date()) },
           { type: 6, fieldName: 'money', value: '', placeholder: '中标金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[] },
           { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150},
           { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150},

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

@@ -150,7 +150,7 @@
 		<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
 
 	  	<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  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"  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>

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

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

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

@@ -32,7 +32,7 @@
           v-loading="tableLoading"
           border
           fit
-          v-horizontal-scroll="'always'"
+          v-horizontal-scroll="'hover'"
           @sort-change="sortChange"
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"
@@ -373,10 +373,11 @@ export default {
         }
         ::v-deep .el-input.el-input-group{
           width: 240px;
-          height: 32px;
+          height: 30px;
+          border: 1px solid #e0e0e0;
           .el-input__inner{
-            height: 32px;
-            border-right: 0;
+            height: 30px;
+            border: 0;
           }
           .el-input__suffix{
             margin-top: -1px;
@@ -389,10 +390,10 @@ export default {
             margin-right: 4px;
           }
           .el-input__inner:focus{
-            border-color: #0081FF;
+            /*border-color: #0081FF;*/
           }
           .el-input__inner:focus ~.el-input-group__append{
-            border: 1px solid #0081FF;
+            /*border: 1px solid #0081FF;*/
             color: #ffffff;
             background: #0081FF;
           }
@@ -402,8 +403,12 @@ export default {
             text-align: center;
             background: #F5F5F5;
             color:#0081FF;
-            border-left: 0;
-            border-radius: 2px;
+            border-radius:0 2px 2px 0;
+            border: 0;
+            &:hover{
+              color: #ffffff;
+              background: #0081FF;
+            }
           }
         }
         .total{

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

@@ -35,7 +35,7 @@
           :data="tableData"
           element-loading-text="Loading"
           @sort-change="sortChange"
-          v-horizontal-scroll="'always'"
+          v-horizontal-scroll="'hover'"
           border
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"

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

@@ -152,7 +152,7 @@
             element-loading-text="Loading"
             @sort-change="sortChange"
             border
-            v-horizontal-scroll="'always'"
+            v-horizontal-scroll="'hover'"
             fit
             highlight-current-row
           >
@@ -430,6 +430,7 @@ export default {
   methods: {
     scrolling() {
       let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
+
       // let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
       // if (scrollTop>368){
       //   let top = scrollTop-368
@@ -909,12 +910,13 @@ export default {
         ::v-deep .search-input{
           /*::v-deep .el-input{*/
             width: 235px;
-            height: 32px;
+            height: 30px;
+            border: 1px solid #e0e0e0;
             .el-input__inner{
-              height: 32px;
-              line-height: 32px;
+              height: 30px;
+              line-height: 30px;
               font-size: 12px;
-              border-right: 0;
+              border: 0;
             }
             .el-input__suffix{
               margin-top: -1px;
@@ -927,10 +929,10 @@ export default {
               margin-right: 4px;
             }
             .el-input__inner:focus{
-              border-color: #0081FF;
+              /*border-color: #0081FF;*/
             }
             .el-input__inner:focus ~.el-input-group__append{
-              border: 1px solid #0081FF;
+              /*border: 1px solid #0081FF;*/
               color: #ffffff;
               background: #0081FF;
             }
@@ -940,8 +942,12 @@ export default {
               text-align: center;
               background: #F5F5F5;
               color:#0081FF;
-              border-left: 0;
-              border-radius: 2px;
+              border-radius:0 2px 2px 0;
+              border: 0;
+              &:hover{
+                color: #ffffff;
+                background: #0081FF;
+              }
             }
           /*}*/
         }