{{ state.user.nickName }}
-
@@ -35,7 +35,7 @@ import { getUserProfile } from '@/api/system/user'
import pkc from "../../../../../package.json"
//选择学校和班级
import selectClass from './components/selectClass.vue'
-
+import useUserStore from '@/store/modules/user'
const version = ref(pkc.version)
const activeTab = ref('userinfo')
@@ -46,6 +46,12 @@ const state = reactive({
postGroup: {}
})
+const isStadium = () => {
+ let user = useUserStore().user
+ let roles = user.roles
+ return roles.some(item => item.roleKey === 'stadium')
+}
+
const isSubject = ref(false)
async function getUser() {
getUserProfile().then((response) => {
From 99c26145d8de8832d9c9b2e5750a6587cbc24448 Mon Sep 17 00:00:00 2001
From: lyc
Date: Thu, 12 Dec 2024 17:14:39 +0800
Subject: [PATCH 2/6] edit
---
.../Editor/CanvasTool/MaterialDialog.vue | 13 +++++++--
.../src/views/Editor/CanvasTool/index.vue | 28 +++++++++++++------
src/renderer/src/layout/components/Header.vue | 1 -
.../views/teachingDesign/container/right.vue | 3 --
4 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
index 9ad6322..a680871 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
@@ -20,6 +20,7 @@ import { ref, reactive, onMounted, computed } from 'vue';
import { sessionStore } from '@/utils/store'
import { getSmarttalkPage } from '@/api/file'
import { getFileSuffix, urlToBase64 } from '@/utils/ruoyi.js'
+import * as commUtils from '@/utils/comm.js'
const emit = defineEmits(['insertMaterial', 'close'])
@@ -62,12 +63,18 @@ const fileUrl = computed(() => (item) =>{
// 插入
const onInsert = async (item) =>{
+
+ const bolb = commUtils.base64ToBlob(item.fileFullPath)
+
+ const file = commutils.blobToFile(bolb, item.fileShowName)
+
+
+
if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
- emit('insertMaterial',{ type: 'video', data: item.fileFullPath })
+ emit('insertMaterial',{ type: 'video', file })
}
else{
- const base64 = await urlToBase64(item.fileFullPath)
- emit('insertMaterial',{ type: 'img', data: base64 })
+ emit('insertMaterial',{ type: 'img', file })
}
}
diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
index 879865f..7780a65 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
@@ -132,7 +132,7 @@
-
+
@@ -165,6 +165,7 @@ import { PPTApi } from '../../../api'
import TextCreateImg from '@/components/ai-kolors/index.vue'
import { toPng } from 'html-to-image' // 引入html-to-image库
+
const mainStore = useMainStore()
const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
const { canUndo, canRedo } = storeToRefs(useSnapshotStore())
@@ -274,21 +275,30 @@ const toggleNotesPanel = () => {
// 插入素材
interface MaterialParams {
type: string,
- data: string
+ file: any
}
const insertMaterial = (item: MaterialParams) =>{
- const { type, data } = item
- if(type == 'video'){
- createVideoElement(data)
- }
- else{
- createImageElement(data)
- }
+ const { type, file } = item
+ PPTApi.toRousrceUrl(file).then(data=>{
+ if(type == 'video'){
+ createVideoElement(data)
+ }
+ else{
+ createImageElement(data)
+ }
+ })
materiaVisible.value = false
}
// 文生图
const imgVisible = ref(false)
+const insertImg = async (file: any) =>{
+ PPTApi.toRousrceUrl(file).then(data=>{
+ createImageElement(data)
+ imgVisible.value = false
+ })
+}
+