feat:合并

This commit is contained in:
lixg
2022-12-09 14:23:01 +08:00
9 changed files with 169 additions and 60 deletions

View File

@@ -75,10 +75,10 @@
<div class="btnText">重置</div>
</div>
<!-- 2022-11-30注释 后面放开 -->
<!-- <div class="btn btn3" @click="openMessage">
<div class="btn btn3" @click="openMessage">
<div class="search"></div>
<div class="btnText">导出</div>
</div> -->
</div>
<div class="btn btn4" @click="of_hShow">
<div class="search"></div>
<div class="btnText">新建课程</div>
@@ -629,6 +629,9 @@
<!-- <div class="file_name">
<span style="color: #6f6f6f">{{ item.name }}</span>
</div> -->
<div class="file_name">
<span style="color: #6f6f6f;width:140px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.slice(item.lastIndexOf('/')+1) }}</span>
</div>
<!-- 条件渲染 s -->
<!-- <div class="file_size">
<span style="color: #999ba3">{{ item.size }}</span>
@@ -1971,9 +1974,9 @@
>
<div class="file_img"></div>
<div class="file_detail">
<!-- <div class="file_name">
<span style="color: #6f6f6f">{{ item.name }}</span>
</div> -->
<div class="file_name">
<span style="color: #6f6f6f;width:140px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.slice(item.lastIndexOf('/')+1) }}</span>
</div>
<!-- 条件渲染 s -->
<!-- <div class="file_size">
<span style="color: #999ba3">{{ item.size }}</span>
@@ -5156,6 +5159,7 @@ export default defineComponent({
// size: file.size,
// });
// console.log(state.filesList);
console.log(res.data.data)
state.filesList = [res.data.data];
// state.hasImgName = res.data.data;
}