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 14 additions and 8 deletions
Showing only changes of commit 2ca637072d - Show all commits

View File

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

View File

@ -30,7 +30,7 @@
<el-scrollbar height="450px"> <el-scrollbar height="450px">
<div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''" <div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''"
:key="item.id" @click="changeBook(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"> <div v-else class="textbook-img">
<i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i> <i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
</div> </div>
@ -42,7 +42,7 @@
</template> </template>
<script setup> <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 useUserStore from '@/store/modules/user'
import { listEvaluation } from '@/api/subject' import { listEvaluation } from '@/api/subject'
@ -64,6 +64,12 @@ const defaultProps = {
class: 'textbook-tree' 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) const treeLoading = ref(false)
//ID //ID
const curBookId = ref(-1) const curBookId = ref(-1)

View File

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

View File

@ -140,7 +140,7 @@
</div> </div>
<file-oper-batch <file-oper-batch
v-show="checkFileList.length > 0" v-show="checkFileList.length > 0"
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length" :indeterminate="checkFileList.length > 0 && checkFileList.length < currentSCFileList.length"
:choose="checkFileList" :choose="checkFileList"
:check-all="isCheckAll" :check-all="isCheckAll"
@click-delete="clickDelete" @click-delete="clickDelete"
@ -252,7 +252,7 @@ export default {
computed: { computed: {
isCheckAll() { isCheckAll() {
return ( return (
this.checkFileList.length > 0 && this.checkFileList.length === this.currentFileList.length this.checkFileList.length > 0 && this.checkFileList.length === this.currentSCFileList.length
) )
}, },
currentKJFileList() { currentKJFileList() {