Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

 src/components/view/a6-personnel-overview.vue

@@ -77,7 +77,7 @@
   <div class="role_manage">
      <div>
         <el-row class="title">
            <el-col :span="12" style="padding-left: 20px;">人员总览</el-col>
            <el-col :span="12" style="padding-left: 20px;text-align: left;">人员总览</el-col>
         </el-row>
      </div>
      <div class="search">
@@ -91,7 +91,7 @@
         </div>
      </div>
      <div class="table" v-loading="loading">
      <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list">
      <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>0||loading">
        <ul class="card" style="margin-top: 10px;">
        <li v-for="(m,i) in list" :key="i">
          <el-image style="width: 80px;
@@ -166,7 +166,7 @@
        if(this.currentPage==1){
          this.loading = true
        }
        this.$axios.post(this.$api.user.selectUserList,{
        this.$axios.post(this.$api.user.selectPersonnelOverview,{
               page: {
            current: this.currentPage,
            size: this.pageSize