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

dsk-operate-ui/src/views/supplier/supplierOverview/index.vue

@@ -163,7 +163,7 @@
               <div v-if="scope.row.companyId">
                 <router-link  :to="`/monitoring/MonitoringReportDetails/${scope.row.companyId}`" tag="a" class="a-link companyName">{{scope.row.customerName}}</router-link>
               </div>
-              <div v-else>{{scope.row.companyName}}</div>
+              <div v-else>{{scope.row.customerName}}</div>
             </template>
           </el-table-column>
           <el-table-column label="风险总数" prop="riskTotal">
@@ -498,7 +498,7 @@
             score:'25'
           },
         ],
-        timeList: ['昨天','近三天', '近七天', '近半月', '自定义'],
+        timeList: ['昨日','近三天', '近七天', '近半月', '自定义'],
         time:'',
         time1:'',
         inputID: this.getUid(),
@@ -1754,7 +1754,8 @@
       }
       .picker-block{
         .el-picker-panel.el-date-range-picker.el-popper{
-          left: -680px !important;
+          left: auto !important;
+          right: 124px !important;
           top:144px !important;
         }
       }