Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

This commit is contained in:
lpq
2023-02-21 23:58:30 +08:00
2 changed files with 1 additions and 2 deletions

View File

@@ -64,7 +64,6 @@
<a-progress :percent="file.percent"/> <a-progress :percent="file.percent"/>
</div> </div>
<div class="curloading"> <div class="curloading">
<div class="cur">{{ file.percent }}%</div>
<div style="color: #387df7; margin-left: 20px; cursor: pointer" <div style="color: #387df7; margin-left: 20px; cursor: pointer"
v-if="file.uploadState?.status === 'FAILED'" @click="downloadErrorData(file.uploadState?.url)"> v-if="file.uploadState?.status === 'FAILED'" @click="downloadErrorData(file.uploadState?.url)">
下载失败数据 下载失败数据

View File

@@ -758,7 +758,7 @@
<div class="btn2" @click="exportGroup"> <div class="btn2" @click="exportGroup">
<span class="btn2text">导出小组</span> <span class="btn2text">导出小组</span>
</div> </div>
<ImpoterGroupLeader :url="`/admin/studentGroup/importGroup`" :template-url="`/admin/studentGroup/exportGroup/${projectId}`"> <ImpoterGroupLeader :data="{targetId:projectId,type:1}" :url="`/admin/studentGroup/importGroup`" :template-url="`/admin/studentGroup/exportGroup/${projectId}`">
<div class="btn2"> <div class="btn2">
<span class="btn2text">导入小组长</span> <span class="btn2text">导入小组长</span>
</div> </div>