Merge remote-tracking branch '104/master-20250627bk' into master-20250627bk-a

This commit is contained in:
joshen
2025-11-14 16:56:23 +08:00

View File

@@ -4,7 +4,7 @@
<!-- 搜索框及按钮 -->
<div class="filter">
<div class="filterItems">
<div style="display: flex; width: 100%;">
<div style="display: flex; flex-wrap: wrap;">
<div class="pathnameInp">
<a-input v-model:value="courseNameOrTeacherName" style="width: 276px; height: 40px; border-radius: 8px;"
placeholder="请输入课程名称或授课教师" />
@@ -30,6 +30,26 @@
<a-select v-model:value="years" mode="multiple" style="width: 200px" placeholder="请选择年份"
:options="yearOptions" allow-clear :max-tag-count="1">
</a-select>
</div>
<div style="display: flex; margin-bottom: 20px;">
<div class="btn btn1" @click="handleSearch1">
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
<div class="btn btn2" @click="handleRest1">
<div class="search"></div>
<div class="btnText">重置</div>
</div>
</div>
</div>
<div style="display: flex; text-align: right;">
<div class="btn btn1" @click="exportTaskStu">
<div class="btnText">导入标记</div>
</div>
<div class="btn btn1" @click="exportAll">
<div class="btnText">导出表格</div>
</div>
</div>
</div>
<!-- 导入标记弹窗 -->
<!-- <a-modal v-model:visible="importMarkVisible" title="导入标记" @ok="handleImportMarkOk"
@@ -106,24 +126,9 @@
</div>
</div>
</a-modal>
<div style="display: flex; margin-bottom: 20px; margin-left: auto;" class="courseBtn">
<div class="btn btn1" @click="exportTaskStu">
<div class="btnText">导入标记</div>
</div>
<div class="btn btn1" @click="exportAll">
<div class="btnText">导出表格</div>
</div>
<div class="btn btn1" @click="handleSearch1">
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
<div class="btnn btn2" @click="handleRest1">
<div class="search"></div>
<div class="btnText">重置</div>
</div>
</div>
</div>
</div>
<!-- </div> -->
</div>
<!-- 搜索框及按钮 -->
</div>
@@ -825,15 +830,13 @@ export default defineComponent({
margin-left: 35px;
margin-right: 35px;
margin-top: 30px;
display: flex;
flex-wrap: wrap;
// display: flex;
// flex-wrap: wrap;
.filterItems {
width: 100%;
justify-content: space-between;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.pathnameInp {
margin-right: 20px;
margin-bottom: 20px;
@@ -916,7 +919,7 @@ export default defineComponent({
.search {
width: 16px;
height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
background-image: url("../../assets/images/courseManage/reset0.png");
}
.daochu {