zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

This commit is contained in:
zdg 2024-09-20 13:53:53 +08:00
parent 4ab4d5dff2 80d6e1c59c
commit 51cb1989a1
7 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
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",

10
src/renderer/src/components/choose-textbook/index.vue
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)

34
src/renderer/src/views/classTask/container/item-dialog-score.vue
View File

@ -8,15 +8,15 @@
<div class="teacher_content_con">
<!-- 题目内容：习题训练 -->
<div v-if="dialogProps.studentObj.worktype == '习题训练'">
<div v-for="(stuItem, sIndex) in dialogProps.studentQuizAllList" :key="stuItem.id">
<div v-for="quItem in dialogProps.quizlist" :key="quItem.id">
<div v-for="(quItem, qIndex) in dialogProps.quizlist" :key="quItem.id">
<div v-for="(stuItem, sIndex) in dialogProps.studentQuizAllList" :key="stuItem.id">
<div v-if="stuItem.entpcourseworkid == quItem.id">
<el-card style="max-width: 100%; margin-bottom: 10px">
<!-- 题型 分值 -->
<template #header>
<div class="card-header">
<span
>{{ sIndex + 1 }}、{{ quItem.worktype }}
>{{ qIndex + 1 }}、{{ quItem.worktype }}
{{ stuItem.score ? stuItem.score : 0 }}分</span
>
</div>
@ -94,21 +94,19 @@
</span>
</el-col>
<el-col :span="6" style="padding: 10px">
<div
v-for="(imageItem, index) in stuItem.imagefile"
v-if="stuItem.imagefile && stuItem.imagefile.length > 0"
:key="index"
>
<el-image
style="width: 30px; height: 30px"
:src="imageItem"
:zoom-rate="1.2"
:max-scale="7"
:min-scale="0.2"
:preview-src-list="stuItem.imagefile"
:initial-index="4"
fit="contain"
/>
<div v-if="stuItem.imagefile && stuItem.imagefile.length > 0">
<div v-for="(imageItem, index) in stuItem.imagefile" :key="index">
<el-image
style="width: 30px; height: 30px"
:src="imageItem"
:zoom-rate="1.2"
:max-scale="7"
:min-scale="0.2"
:preview-src-list="stuItem.imagefile"
:initial-index="4"
fit="contain"
/>
</div>
</div>
</el-col>
<el-col :span="6" style="padding: 10px">

2
src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
View File

@ -411,8 +411,6 @@ const queryForm = reactive({
entpCourseWorkTotal.value = entpcourseworkres.data.length;
}
if()
//格式化试题信息
processList(workResource.entpCourseWorkList);
})

4
src/renderer/src/views/desktop/container/work-trend.vue
View File

@ -2,9 +2,9 @@
<div class="desktop-work-item">
<div class="item-title flex">
<span class="title">工作动态</span>
<el-radio-group v-model="type">
<!-- <el-radio-group v-model="type">
<el-radio-button label="全部" :value="-1" />
</el-radio-group>
</el-radio-group> -->
</div>
<div class="item-content" v-loading="loading">
<el-scrollbar height="500px">

4
src/renderer/src/views/prepare/container/file-oper-batch.vue
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',

6
src/renderer/src/views/prepare/index.vue
View File

@ -68,7 +68,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>
@ -140,7 +140,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"
@ -254,7 +254,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() {