Compare commits
No commits in common. "10a7e73c64f8dc2bea3cd5f9bef56fdd3e811259" and "2c238b57068a5fdb199ad572ecf3a9c012ccbbac" have entirely different histories.
10a7e73c64
...
2c238b5706
|
|
@ -11,15 +11,10 @@ import * as API_smarttalk from '@/api/file' // 相关api
|
|||
import * as useStore from '../store' // pptist-状态管理
|
||||
import { sessionStore } from '@/utils/store' // electron-store 状态管理
|
||||
import useUserStore from '@/store/modules/user' // 外部-用户信息
|
||||
import * as Api_server from '@/api/apiService' // 相关api
|
||||
import * as commUtils from '@/utils/comm.js'
|
||||
|
||||
const slidesStore = useStore.useSlidesStore()
|
||||
const userStore = useUserStore()
|
||||
|
||||
import { getClassWorkList,getStudentClassWorkData } from '@/views/tool/createHomework'
|
||||
import {createWindow} from '@/utils/tool'
|
||||
import { useToolState } from '@/store/modules/tool'
|
||||
const toolStore = useToolState()
|
||||
/** 工具类 */
|
||||
export class Utils {
|
||||
static mxData: any = {
|
||||
|
|
@ -191,30 +186,6 @@ export class PPTApi {
|
|||
else msgUtils.msgError(res.msg || '更新失败');return false
|
||||
})
|
||||
}
|
||||
|
||||
// 图片|音频|视频 转换为在线地址
|
||||
static toRousrceUrl =async (o:any) => {
|
||||
const formData = new FormData()
|
||||
formData.append('file', o)
|
||||
const res = await Api_server.Other.uploadFile(formData)
|
||||
if (res && res.code == 200){
|
||||
const url = res?.url
|
||||
url &&(o.src = url)
|
||||
return url
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
export class Homework{
|
||||
// 作业弹窗
|
||||
static async showHomework(id: any) {
|
||||
let result = await getClassWorkList(id)
|
||||
result = await getStudentClassWorkData()
|
||||
localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
|
||||
toolStore.isTaskWin=true; // 设置打开批改窗口
|
||||
// emit('closeActive')
|
||||
createWindow('open-taskwin',{url:'/teachClassTask'});
|
||||
}
|
||||
}
|
||||
export default PPTApi
|
||||
|
|
@ -7,44 +7,19 @@
|
|||
/>
|
||||
|
||||
<template v-if="type === 'video'">
|
||||
<el-tabs :tab-position="'left'" class="demo-tabs" v-model="tabvalue">
|
||||
<el-tab-pane label="常规" >
|
||||
<Input v-model:value="videoSrc" style="width:100%" placeholder="请输入视频地址，e.g. https://xxx.mp4"></Input>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="上传" >
|
||||
<FileInput accept="video/*" @change="files => insertImageElementvideo(files)">
|
||||
<div class="updivs">+点击上传视频</div>
|
||||
</FileInput>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
||||
|
||||
|
||||
<div class="btns" v-if="tabvalue=='0'">
|
||||
<Input v-model:value="videoSrc" placeholder="请输入视频地址，e.g. https://xxx.mp4"></Input>
|
||||
<div class="btns">
|
||||
<Button @click="emit('close')" style="margin-right: 10px;">取消</Button>
|
||||
<Button type="primary" @click="insertVideo()">确认</Button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template v-if="type === 'audio'">
|
||||
<el-tabs :tab-position="'left'" class="demo-tabs" v-model="tabvalue1">
|
||||
<el-tab-pane label="常规" >
|
||||
<Input v-model:value="audioSrc" style="width:100%" placeholder="请输入音频地址，e.g. https://xxx.mp3"></Input>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="上传" >
|
||||
<FileInput accept="audio/*" @change="files => insertImageElementaudio(files)">
|
||||
<div class="updivs">+点击上传音频</div>
|
||||
</FileInput>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
||||
<div class="btns" v-if="tabvalue1=='0'">
|
||||
<Input v-model:value="audioSrc" placeholder="请输入音频地址，e.g. https://xxx.mp3"></Input>
|
||||
<div class="btns">
|
||||
<Button @click="emit('close')" style="margin-right: 10px;">取消</Button>
|
||||
<Button type="primary" @click="insertAudio()">确认</Button>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -55,8 +30,6 @@ import message from '../../../utils/message'
|
|||
import Tabs from '../../../components/Tabs.vue'
|
||||
import Input from '../../../components/Input.vue'
|
||||
import Button from '../../../components/Button.vue'
|
||||
import FileInput from '../../../components/FileInput.vue'
|
||||
import { PPTApi } from '../../../api'
|
||||
|
||||
type TypeKey = 'video' | 'audio'
|
||||
interface TabItem {
|
||||
|
|
@ -72,33 +45,9 @@ const emit = defineEmits<{
|
|||
|
||||
const type = ref<TypeKey>('video')
|
||||
|
||||
const videoSrc = ref('')
|
||||
const audioSrc = ref('')
|
||||
// https://freesound.org/data/previews/614/614107_11861866-lq.mp3
|
||||
const tabvalue = ref('0')
|
||||
const tabvalue1 = ref('0')
|
||||
const videoSrc = ref('https://mazwai.com/videvo_files/video/free/2019-01/small_watermarked/181004_04_Dolphins-Whale_06_preview.webm')
|
||||
const audioSrc = ref('https://freesound.org/data/previews/614/614107_11861866-lq.mp3')
|
||||
|
||||
const insertImageElementvideo = (files: FileList) => {
|
||||
console.log('files', files)
|
||||
const imageFile = files[0]
|
||||
if (!imageFile) return
|
||||
PPTApi.toRousrceUrl(imageFile).then(data=>{
|
||||
videoSrc.value=data
|
||||
insertVideo()
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
const insertImageElementaudio = (files: FileList) => {
|
||||
console.log('files', files)
|
||||
const imageFile = files[0]
|
||||
if (!imageFile) return
|
||||
PPTApi.toRousrceUrl(imageFile).then(data=>{
|
||||
videoSrc.value=data
|
||||
insertAudio()
|
||||
})
|
||||
|
||||
}
|
||||
const tabs: TabItem[] = [
|
||||
{ key: 'video', label: '视频' },
|
||||
{ key: 'audio', label: '音频' },
|
||||
|
|
@ -125,33 +74,4 @@ const insertAudio = () => {
|
|||
margin-top: 10px;
|
||||
text-align: right;
|
||||
}
|
||||
.updivs{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: #f5f7fa;
|
||||
border: 1px dashed #d9d9d9;
|
||||
border-radius: 6px;
|
||||
text-align: center;
|
||||
line-height: 100px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.demo-tabs{
|
||||
:deep(.el-tabs__content){
|
||||
display: flex;
|
||||
align-items: center;
|
||||
div{
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
:deep( .el-tabs__item.is-active) {
|
||||
color: #d14424;
|
||||
}
|
||||
:deep( .el-tabs__item:hover) {
|
||||
color: #d14424;
|
||||
}
|
||||
:deep(.el-tabs__active-bar) {
|
||||
background-color: #d14424;
|
||||
height: 3px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -161,7 +161,6 @@ import Popover from '../../../components/Popover.vue'
|
|||
import PopoverMenuItem from '../../../components/PopoverMenuItem.vue'
|
||||
import QuestToPPTist from '@/views/classTask/newClassTaskAssign/questToPPTist/index.vue'
|
||||
import MaterialDialog from './MaterialDialog.vue'
|
||||
import { PPTApi } from '../../../api'
|
||||
import TextCreateImg from '@/components/ai-kolors/index.vue'
|
||||
import { toPng } from 'html-to-image' // 引入html-to-image库
|
||||
|
||||
|
|
@ -196,16 +195,9 @@ const {
|
|||
} = useCreateElement()
|
||||
|
||||
const insertImageElement = (files: FileList) => {
|
||||
console.log('files', files)
|
||||
const imageFile = files[0]
|
||||
if (!imageFile) return
|
||||
// 上传图片转为线上地址
|
||||
PPTApi.toRousrceUrl(imageFile).then(data=>{
|
||||
createImageElement(data)
|
||||
})
|
||||
// getImageDataURL(imageFile).then(dataURL => {
|
||||
// createImageElement(dataURL)
|
||||
// })
|
||||
getImageDataURL(imageFile).then(dataURL => createImageElement(dataURL))
|
||||
}
|
||||
|
||||
const onhtml2canvas = async (html: HTMLElement) => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue