Merge branch 'V20231129-中建一局二公司' of 192.168.60.201:root/dsk-operate-sys into V20231129-中建一局二公司

dsk-operate-ui/src/views/supplier/aptitude/zizhi.vue

@@ -40,6 +40,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  .title_wrap{
+    padding: 20px;
+    background-color: #FFFFFF;
+    border-bottom: 1px solid #e0e0e0;
+    .enterprise_title{
+      border-left: 2px solid #445781;
+      padding-left: 8px;
+      font-size: 16px;
+      height: 16px;
+      line-height: 16px;
+      font-weight: 700;
+      color: #232323;
+    }
+  }
     .header{
       justify-content: space-between;
       background: #FFFFFF;

dsk-operate-ui/src/views/supplier/aptitude/zzStandard.vue

@@ -40,6 +40,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  .title_wrap{
+    padding: 20px;
+    background-color: #FFFFFF;
+    border-bottom: 1px solid #e0e0e0;
+    .enterprise_title{
+      border-left: 2px solid #445781;
+      padding-left: 8px;
+      font-size: 16px;
+      height: 16px;
+      line-height: 16px;
+      font-weight: 700;
+      color: #232323;
+    }
+  }
     .header{
       justify-content: space-between;
       background: #FFFFFF;

dsk-operate-ui/src/views/supplier/supplierRating/ratelist/honourAgreement.vue

@@ -25,13 +25,13 @@
                 <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
                 </div>
                 <skeleton v-if="isSkeleton"></skeleton>
-        
+
                 <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
                     <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
                                 v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
                                 :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
                                 ref="theOwnerListTable">
-            
+
                         <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
                         <template slot-scope="scope">
                             <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
@@ -86,25 +86,25 @@
                 <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
                 </div>
                 <skeleton v-if="isSkeleton"></skeleton>
-        
-                <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
-                    <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                                v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
-                                :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
-                                ref="theOwnerListTable">
-            
-                        <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
-                        <template slot-scope="scope">
-                            <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
-                        </template>
-                        </el-table-column>
-                        <el-table-column label="评价维度" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
-                        <el-table-column label="规则名称" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
-                        <el-table-column label="规则定义" prop="name1" :fixed="tableColumnFixed"  :resizable="false"></el-table-column>
-                        <el-table-column label="考核周期" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
-                        <el-table-column label="得分" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
-                    </el-table>
-                </div>
+
+              <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                          v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                          :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                          ref="theOwnerListTable">
+
+                  <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
+                    <template slot-scope="scope">
+                      <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="评价维度" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                  <el-table-column label="规则名称" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                  <el-table-column label="规则定义" prop="name1" :fixed="tableColumnFixed"  :resizable="false"></el-table-column>
+                  <el-table-column label="考核周期" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                  <el-table-column label="得分" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                </el-table>
+              </div>
                 <div class="pagination clearfix" v-show="total>queryParams.pageSize">
                     <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                                 :total="total">
@@ -113,14 +113,14 @@
             </div>
         </template>
     </div>
-  
+
   </template>
-  
+
   <script>
     import '@/assets/styles/public.scss'
     import '@/assets/styles/supplierlist.scss'
     import mixin from '@/views/detail/party-a/mixins/mixin'
-  
+
     export default {
       name: 'ratinglist',
       mixins: [mixin],
@@ -160,7 +160,7 @@
           queryParams: {
             // customerId: this.companyId,
             // customerName: this.companyName,
-  
+
             pageNum: 1,
             pageSize: 10,
           },
@@ -197,10 +197,10 @@
         },
         handleSearch(){},
         handleExcel() {
-  
+
         },
         customerExport(){
-  
+
         },
         setHeaderRow() {
           return "owner-table-list-header";
@@ -219,7 +219,7 @@
       }
     }
   </script>
-  
+
   <style lang="scss" scoped>
     .title_wrap{
         border: none;
@@ -281,20 +281,20 @@
           white-space: nowrap;
           width: 134px;
         }
-  
+
       }
       input {
         border: 1px solid #efefef;
       }
-  
+
       ::v-deep .el-form-item {
         margin-right: 8px !important;
       }
-  
+
       .query-box {
         margin: 10px 0 20px;
       }
-  
+
       .cell-span {
         display: inline-block;
         position: relative;
@@ -304,7 +304,7 @@
         -webkit-box-orient: vertical;
         -webkit-line-clamp: 4;
         cursor: pointer;
-  
+
         > span {
           display: inline-block;
           width: 37px;
@@ -315,7 +315,7 @@
           z-index: 1;
         }
       }
-  
+
       @import "@/assets/styles/search-common.scss";
     }
     .table-supplier2{
@@ -323,4 +323,3 @@
         margin-top: 0;
     }
   </style>
-  
\ No newline at end of file