diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 202a504..8c73356 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -110,8 +110,10 @@ /** 表格布局 **/ .pagination-container { - // position: relative; - height: 25px; + display: flex; + flex-wrap: wrap; + justify-content: flex-end; + height: auto; margin-bottom: 10px; margin-top: 15px; padding: 10px 20px !important; @@ -127,8 +129,7 @@ } .pagination-container .el-pagination { - // right: 0; - position: absolute; + position: static; } @media ( max-width : 768px) { diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue index 2ca9aa1..a53fdea 100644 --- a/src/views/exam/index.vue +++ b/src/views/exam/index.vue @@ -26,7 +26,7 @@ function deviceToken(id){const key=`exam-device-${id}`;let value=localStorage.ge function count(value){return value==="ALL"?exams.value.length:exams.value.filter(e=>e.status===value).length}function day(v){return String(new Date(v).getDate()).padStart(2,"0")}function month(v){return `${new Date(v).getMonth()+1}月`}function formatTime(v){return new Date(v).toLocaleString("zh-CN",{hour12:false}).replaceAll("/","-")}function countdown(v){const minutes=Math.max(0,Math.ceil((new Date(v)-Date.now())/60000));return minutes<60?`${minutes} 分钟后开始`:`${Math.ceil(minutes/60)} 小时后开始`} diff --git a/src/views/teacherEnd/exam/editor.vue b/src/views/teacherEnd/exam/editor.vue index 8e2c9ce..80c66e5 100644 --- a/src/views/teacherEnd/exam/editor.vue +++ b/src/views/teacherEnd/exam/editor.vue @@ -109,7 +109,7 @@ function formatValue(value) { const date = value instanceof Date ? value : new D .editor-head { display: grid; grid-template-columns: 1fr auto 1fr; align-items: center; border-bottom: 1px solid #e5e7eb; padding-bottom: 14px; > :last-child { justify-self: end; } } .title-block { display: flex; align-items: center; gap: 10px; h1 { margin: 0; font-size: 23px; letter-spacing: 0; } } .steps { max-width: 760px; margin: 28px auto; } -.editor-panel { max-width: 1120px; margin: auto; h2 { font-size: 19px; margin: 0 0 22px; } } +.editor-panel { width: 100%; max-width: none; margin: auto; h2 { font-size: 19px; margin: 0 0 22px; } } .base-form { max-width: 650px; .el-input, .el-select { width: 100%; } .el-date-editor { width: 100%; } } .unit { margin-left: 8px; color: #6b7280; } .section-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 18px; h2 { margin: 0; } p { margin: 6px 0 0; color: #6b7280; } } @@ -127,3 +127,9 @@ function formatValue(value) { const date = value instanceof Date ? value : new D .editor-footer { position: fixed; bottom: 0; left: 0; right: 0; height: 64px; display: flex; justify-content: center; align-items: center; gap: 12px; background: rgba(255,255,255,.96); border-top: 1px solid #e5e7eb; z-index: 10; } @media (max-width: 760px) { .editor-head { grid-template-columns: 1fr; gap: 12px; .title-block { grid-row: 1; } > :last-child { justify-self: start; } } .question-layout { grid-template-columns: 1fr; } .type-nav { display: flex; overflow-x: auto; border-right: 0; border-bottom: 1px solid #e5e7eb; } .score-summary { grid-template-columns: 1fr 1fr; } .section-head { align-items: flex-start; flex-direction: column; gap: 12px; } } + + diff --git a/src/views/teacherEnd/index.vue b/src/views/teacherEnd/index.vue index 0b9ed23..7320b98 100644 --- a/src/views/teacherEnd/index.vue +++ b/src/views/teacherEnd/index.vue @@ -18,10 +18,10 @@
- + - + @@ -203,7 +203,7 @@ onMounted(() => { // gap: 15px; :deep(.el-card) { padding: 0px 15px; - height: calc(100vh - 80px); + height: auto; border: none; #trend { height: 500px; @@ -272,11 +272,13 @@ onMounted(() => { } } .el-card:nth-child(1) { - width: calc(100% - 47% - 15px); + flex: 1 1 53%; + min-width: 0; border-right: 2px dashed #e5e5e5; } .el-card:nth-child(2) { - width: calc(100% - 53%); + flex: 1 1 47%; + min-width: 0; .card-header { font-family: Source Han Sans CN; font-weight: bold; diff --git a/src/views/teacherEnd/score/TaskReviewPanel.vue b/src/views/teacherEnd/score/TaskReviewPanel.vue index 36b66bc..514e63c 100644 --- a/src/views/teacherEnd/score/TaskReviewPanel.vue +++ b/src/views/teacherEnd/score/TaskReviewPanel.vue @@ -41,7 +41,7 @@ - +