zhuhao_dev #230

Merged
zhuhao merged 6 commits from zhuhao_dev into main 2024-09-20 09:19:11 +08:00
4 changed files with 15 additions and 9 deletions

View File

@ -1,6 +1,6 @@
{
"name": "aix-win",
"version": "1.2.3",
"version": "2.0.1",
"description": "An Electron application with Vue",
"main": "./out/main/index.js",
"author": "example.com",

View File

@ -30,7 +30,7 @@
<el-scrollbar height="450px">
<div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''"
:key="item.id" @click="changeBook(item)">
<img v-if="item.avartar" :src="BaseUrl + item.avartar" class="textbook-img" alt="">
<img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt="">
<div v-else class="textbook-img">
<i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
</div>
@ -42,7 +42,7 @@
</template>
<script setup>
import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
import { onMounted, ref, nextTick, toRaw, reactive, computed } from 'vue'
import useUserStore from '@/store/modules/user'
import { listEvaluation } from '@/api/subject'
@ -64,6 +64,12 @@ const defaultProps = {
class: 'textbook-tree'
}
/*let coverImgUrl = computed((item)=>{
if(!item.avartar){
return ""
}
return item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar
})*/
const treeLoading = ref(false)
//ID
const curBookId = ref(-1)

View File

@ -1,6 +1,6 @@
<template>
<div class="file-oper-batch-wrap">
<div style="margin: 0 20px; line-height: 40px">
<div style="line-height: 40px">
<el-checkbox
v-model="isCheckAll"
:indeterminate="indeterminate"
@ -15,7 +15,7 @@
</template>
<script>
import { deleteSmarttalkBatch } from '@/api/file'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ElMessage } from 'element-plus'
import { exportFile } from '@/utils/talkFile'
export default {
name: 'FileOperBatch',

View File

@ -69,7 +69,7 @@
<el-tab-pane label="素材" name="素材">
<div class="prepare-body-header">
<div>
<label style="font-size: 15px">{{ currentFileList.length }}个文件</label>&nbsp;
<label style="font-size: 15px">{{ currentFileList.filter(ite=>ite.fileFlag!=='apt'&&ite.fileFlag!=='课件').length }}个文件</label>&nbsp;
<el-popover placement="top-start" :width="250" trigger="hover">
<template #default>
<div>
@ -141,7 +141,7 @@
</div>
<file-oper-batch
v-show="checkFileList.length > 0"
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentSCFileList.length"
:choose="checkFileList"
:check-all="isCheckAll"
@click-delete="clickDelete"
@ -255,7 +255,7 @@ export default {
computed: {
isCheckAll() {
return (
this.checkFileList.length > 0 && this.checkFileList.length === this.currentFileList.length
this.checkFileList.length > 0 && this.checkFileList.length === this.currentSCFileList.length
)
},
currentKJFileList() {