Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-02-18 69af2b03fbf5bbd13a018acd4fcb0a1f191f4dcd

 src/components/Table/lims-table.vue

@@ -77,6 +77,11 @@
            <div v-else-if="item.dataType == 'progress'">
              <el-progress :percentage="Number(scope.row[item.prop])" />
            </div>
            <!-- 图片 -->
            <div v-else-if="item.dataType == 'image'">
              <img :src="javaApi+'/img/'+item.prop"
                   alt="" style="width: 40px;height: 40px;margin-top: 10px;">
            </div>

            <!-- tag -->
            <div v-else-if="item.dataType == 'tag'">
@@ -326,19 +331,19 @@
    },
    rowKey: {
      type: String,
      default: undefined
      default: undefined,
    },
    page:{
      type:Object,
    page: {
      type: Object,
      default() {
        return {
          total:0,
          current:0,
          size:10,
          layout: 'total, sizes, prev, pager, next, jumper'
          total: 0,
          current: 0,
          size: 10,
          layout: "total, sizes, prev, pager, next, jumper",
        };
      }
    }
      },
    },
  },

  methods: {