Merge remote-tracking branch 'origin/master'

Tcsm

2023-05-26 fe37beed44df3d9f98aad764f3977b18ef557784

 ruoyi-ui/src/views/collection/index.vue

@@ -125,14 +125,14 @@

    </el-form>
    <div>
      <div style="width: 100px;
      height: 24px;
      font-size: 18px;
      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
      font-weight: 400;
      color: #000000;
      line-height: 21px;
      ">收藏和荣誉</div>
<!--      <div style="width: 100px;-->
<!--      height: 24px;-->
<!--      font-size: 18px;-->
<!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--      font-weight: 400;-->
<!--      color: #000000;-->
<!--      line-height: 21px;-->
<!--      ">收藏和荣誉</div>-->

      <el-row :gutter="10" class="mb8">
        <el-col :span="1.5">
@@ -196,7 +196,7 @@
    </div>
    <el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" :reserve-selection="true" width="25"  align="center" />
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
      <el-table-column label="获得时间" prop="happenTime" sortable width="100" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
@@ -226,7 +226,7 @@
      <el-table-column label="备注" prop="remark" sortable width="90" align="center">
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" width="180" >
      <el-table-column label="电子文件" prop="url" width="180" align="center">

        <template slot-scope="scope" >
          <img