Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2024-05-30 09:17:07 +08:00
commit c653ab607f
2 changed files with 17 additions and 9 deletions

View File

@ -7,9 +7,13 @@
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
class="el-icon-upload2"
v-if="!isLoad" v-if="!isLoad"
style="position: relative;
}"
> >
<span style="opacity: 0">{{
$t("trials:uploadImage:button:selectFolder")
}}</span>
<label for="file"> <label for="file">
{{ $t("trials:uploadImage:button:selectFolder") }} {{ $t("trials:uploadImage:button:selectFolder") }}
</label> </label>
@ -180,17 +184,15 @@
min-width="120" min-width="120"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-tag
:type=" :type="
['warning', 'success', 'danger', 'primary', 'success', 'danger'][ ['warning', 'success', 'danger', 'primary', 'success', 'danger'][
scope.row.status scope.row.status
] ]
" "
size="mini"
plain
v-if="scope.row.status || scope.row.status === 0" v-if="scope.row.status || scope.row.status === 0"
>{{ $fd("UploadStatus", scope.row.status) }}</el-button >{{ $fd("UploadStatus", scope.row.status) }}
> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!--已有/成功/失败--> <!--已有/成功/失败-->
@ -680,4 +682,13 @@ export default {
.colorOfRed { .colorOfRed {
color: #f44336; color: #f44336;
} }
label {
cursor: pointer;
position: absolute;
top: 0;
bottom: 0;
right: 0;
left: 0;
padding: 9px 15px;
}
</style> </style>

View File

@ -230,9 +230,6 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
label {
cursor: pointer;
}
::v-deep .el-dialog { ::v-deep .el-dialog {
.el-dialog__header { .el-dialog__header {
padding-top: 15px; padding-top: 15px;