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

This commit is contained in:
shidongli 2024-06-14 17:48:14 +08:00
commit 467d67389b
2 changed files with 1 additions and 5 deletions

View File

@ -112,8 +112,4 @@ export default {
.pagination-container.hidden { .pagination-container.hidden {
display: none; display: none;
} }
::v-deep .el-pager {
width: 360px !important;
}
</style> </style>

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="app-container"> <div class="app-container" ref="layout">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="5"> <el-col :span="5">
<div class="leftscript" ref="box"> <div class="leftscript" ref="box">