代码合并

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

@@ -538,7 +538,7 @@ ul, li {
 .el-card.noborder{
   border: 0;
   box-shadow: none;
-  margin-bottom: 12px;
+  //margin-bottom: 12px;
   color: #232323;
   .el-card__body{
     padding: 0;

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

@@ -360,7 +360,7 @@ export default {
           cursor: pointer;
         }
         &.span-ba{
-          /*border: 1px solid #0081FF;*/
+          border: 1px solid #0081FF;
           span{
             color: #ffffff;
             background: #0081FF;

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

 <template>
   <div class="Tables">
     <div class="table-item">
-      <el-table v-if="tableDataTotal>0" class="fixed-table" max-height="640"
+      <el-table v-if="tableDataTotal>0" class="fixed-table"
         v-loading="tableLoading"
         :data="tableData"
         element-loading-text="Loading"
@@ -222,4 +222,21 @@ export default {
 ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td {
   background-color: #DCEBFF;
 }
+::v-deep .fixed-table{
+  overflow: visible;
+}
+::v-deep .el-table__header-wrapper{
+  position: sticky;
+  top:56px;
+  z-index: 9;
+}
+::v-deep .el-table__fixed-header-wrapper{
+  position: sticky;
+  z-index: 9;
+  top: 56px;
+}
+::v-deep .el-table__fixed{
+  overflow-x: clip;
+  overflow-y: clip;
+}
 </style>

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

@@ -371,9 +371,13 @@ export default {
             }
           }
         }
+        ::v-deep .el-input.el-input-group:has(:focus){
+          border-color: #0081FF;
+        }
         ::v-deep .el-input.el-input-group{
           width: 240px;
           height: 30px;
+          border-radius:2px;
           border: 1px solid #e0e0e0;
           .el-input__inner{
             height: 30px;
@@ -389,11 +393,8 @@ export default {
             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;*/
+            border: 1px solid #0081FF;
             color: #ffffff;
             background: #0081FF;
           }

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

@@ -907,11 +907,15 @@ export default {
             }
           }
         }
+        ::v-deep .search-input:has(:focus){
+          border-color: #0081FF;
+        }
         ::v-deep .search-input{
           /*::v-deep .el-input{*/
             width: 235px;
             height: 30px;
             border: 1px solid #e0e0e0;
+            border-radius:2px;
             .el-input__inner{
               height: 30px;
               line-height: 30px;
@@ -929,10 +933,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;
             }

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -173,17 +173,15 @@
           </div>
         </div>
       </div>
-      <div class="tables">
-        <div class="bottems" v-if="total>searchParam.pageSize">
-          <el-pagination
-            background
-            :page-size="searchParam.pageSize"
-            :current-page="searchParam.pageNum"
-            @current-change="handleCurrentChange"
-            layout="prev, pager, next"
-            :total="total">
-          </el-pagination>
-        </div>
+      <div class="pagination-box" v-if="total>searchParam.pageSize">
+        <el-pagination
+          background
+          :page-size="searchParam.pageSize"
+          :current-page="searchParam.pageNum"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total">
+        </el-pagination>
       </div>
     </el-card>
     <addproject v-if="isshow" @addproject="add" @cancel="addNew"></addproject>