Merge pull request 'lyc-dev' (#306) from lyc-dev into main

This commit is contained in:
lyc 2024-10-10 16:01:01 +08:00
commit ef18d4adf4
1 changed files with 17 additions and 14 deletions

View File

@ -14,19 +14,25 @@
<el-scrollbar height="360px"> <el-scrollbar height="360px">
<ul> <ul>
<!--资源--> <!--资源-->
<li class="item flex" v-for="item in resourceList" :key="item.id"> <template v-for="item in resourceList" :key="item.id">
<div class="item-left flex"> <!--
<FileImage :size="50" :file-name="item.fileShowName" /> apt pptx 暂时不显示
<div class="item-info flex"> 2024-10-10
<span class="item-name">{{ item.fileShowName }}</span> -->
<div class="item-student"> <li class="item flex" v-if="item.fileFlag != 'apt' && item.fileSuffix != 'pptx' && item.fileSuffix != 'ppt'">
<span class="item-option">{{ item.fileFlag }}</span> <div class="item-left flex" >
<span>{{ item.fileSuffix }}</span> <FileImage :size="50" :file-name="item.fileShowName" />
<div class="item-info flex">
<span class="item-name">{{ item.fileShowName }}</span>
<div class="item-student">
<span class="item-option">{{ item.fileFlag }}</span>
<span>{{ item.fileSuffix }}</span>
</div>
</div> </div>
</div> </div>
</div> <el-button color="#349d44" @click="openFileLink(item)">推送</el-button>
<el-button color="#349d44" @click="openFileLink(item)">推送</el-button> </li>
</li> </template>
<!--作业--> <!--作业-->
<li class="item flex" v-for="item in dataList" :key="item.id"> <li class="item flex" v-for="item in dataList" :key="item.id">
<div class="item-left flex"> <div class="item-left flex">
@ -170,7 +176,6 @@ const openFileLink = async (item) =>{
// //
const getResource = () => { const getResource = () => {
let querySearch = toRaw(toolStore.curSubjectNode).querySearch let querySearch = toRaw(toolStore.curSubjectNode).querySearch
querySearch.orderByColumn = 'uploadTime' querySearch.orderByColumn = 'uploadTime'
querySearch.isAsc = 'desc' querySearch.isAsc = 'desc'
querySearch.pageSize = 500 querySearch.pageSize = 500
@ -217,8 +222,6 @@ onMounted(async () => {
curNode.data = sessionStore.get('subject.curNode') curNode.data = sessionStore.get('subject.curNode')
getHomework() getHomework()
getResource() getResource()
}) })
</script> </script>