Compare commits

..

5 Commits

Author SHA1 Message Date
小杨 122c5341e9 fix:修复头像问题; 2024-12-16 17:06:01 +08:00
朱浩 c2a4f2c708 Merge remote-tracking branch 'origin/main' 2024-12-16 16:46:22 +08:00
yangws eb18344b6b Merge pull request 'yws_dev' (#143) from yws_dev into main
Reviewed-on: #143
2024-12-16 16:41:13 +08:00
朱浩 3b67c34ccb Merge remote-tracking branch 'origin/main' 2024-12-16 16:20:53 +08:00
朱浩 187c222fe5 大模型页面补全 2024-12-16 16:20:30 +08:00
11 changed files with 43 additions and 8 deletions

View File

@ -1,8 +1,8 @@
@font-face { @font-face {
font-family: "iconfont"; /* Project id 4723712 */ font-family: "iconfont"; /* Project id 4723712 */
src: url('iconfont.woff2?t=1733880548695') format('woff2'), src: url('iconfont.woff2?t=1734337029245') format('woff2'),
url('iconfont.woff?t=1733880548695') format('woff'), url('iconfont.woff?t=1734337029245') format('woff'),
url('iconfont.ttf?t=1733880548695') format('truetype'); url('iconfont.ttf?t=1734337029245') format('truetype');
} }
.iconfont { .iconfont {
@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-yinle:before {
content: "\e6c9";
}
.icon-yuyin:before { .icon-yuyin:before {
content: "\e648"; content: "\e648";
} }

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,13 @@
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "", "description": "",
"glyphs": [ "glyphs": [
{
"icon_id": "11819186",
"name": "音乐",
"font_class": "yinle",
"unicode": "e6c9",
"unicode_decimal": 59081
},
{ {
"icon_id": "6338162", "icon_id": "6338162",
"name": "语音生成", "name": "语音生成",

View File

@ -41,6 +41,7 @@ const getFileTypeIcon = () => {
airobot: 'icon-jiqirenfushi', // airobot: 'icon-jiqirenfushi', //
aiimg: 'icon-xiangmuicon_maobishufa', // aiimg: 'icon-xiangmuicon_maobishufa', //
aidraw: 'icon-meishu-F', // aidraw: 'icon-meishu-F', //
aiyinyue: 'icon-yinle' //
} }
if (iconObj[name]) { if (iconObj[name]) {
return '#' + iconObj[name] return '#' + iconObj[name]

View File

@ -5,7 +5,7 @@
<el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" > <el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" >
<template #reference> <template #reference>
<div class="user-info"> <div class="user-info">
<el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api + userStore.user.avatar" /> <el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api + userStore.user.avatar" />
<span>{{ userStore.user.nickName }}</span> <span>{{ userStore.user.nickName }}</span>
</div> </div>
</template> </template>

View File

@ -422,6 +422,19 @@ export const toLinkWeb = (path) => {
cookieData: { ...config } cookieData: { ...config }
}) })
} }
/**
* @description 外部跳转-web网页
* @param {*} url
*/
export const toLinkLeftWeb = (url) => {
// 通知主进程
ipcRenderer.send('openWindow', {
key: `win-${Date.now()}`,
fullPath: url
})
}
/** /**
* @description 外部跳转-web网页 * @description 外部跳转-web网页
* @param {*} path * @param {*} path

View File

@ -90,7 +90,7 @@ import { dataSetJson } from '@/utils/comm' // 数据集id文生图
import { sessionStore } from '@/utils/store' import { sessionStore } from '@/utils/store'
import {listEntpcourse} from "@/api/teaching/classwork"; import {listEntpcourse} from "@/api/teaching/classwork";
import {addEntpcoursefileReturnId, getEntpcoursefile} from "@/api/education/entpcoursefile"; import {addEntpcoursefileReturnId, getEntpcoursefile} from "@/api/education/entpcoursefile";
import {createWindow, ipcMsgSend} from "@/utils/tool"; import {createWindow, toLinkLeftWeb} from "@/utils/tool";
import {ElMessage} from "element-plus"; import {ElMessage} from "element-plus";
import {PPTXFileToJson} from "@/AixPPTist/src/hooks/useImport"; import {PPTXFileToJson} from "@/AixPPTist/src/hooks/useImport";
import * as API_entpcoursefile from "@/api/education/entpcoursefile"; import * as API_entpcoursefile from "@/api/education/entpcoursefile";
@ -161,6 +161,11 @@ const tools = reactive([{
name: '视频生成', name: '视频生成',
path: '', path: '',
img: 'aivideo' img: 'aivideo'
},{
name: '音乐生成',
path: 'https://ai.ysaix.com:7845/',
type: 'link',
img: 'aiyinyue'
}]) }])
const uploadData = ref({ const uploadData = ref({
@ -173,6 +178,11 @@ const uploadData = ref({
const currentFileList = ref([]) const currentFileList = ref([])
const gotoRoute = (item) => { const gotoRoute = (item) => {
if (item.type === 'link') {
//link
toLinkLeftWeb(item.path);
return
}
if (item.path) { if (item.path) {
if (item.path === '/model/aiKolors') { if (item.path === '/model/aiKolors') {
gotoAiKolors(item.path) gotoAiKolors(item.path)

View File

@ -33,7 +33,7 @@ const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
// //
const options = reactive({ const options = reactive({
img: userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar, // img: userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar, //
autoCrop: true, // autoCrop: true, //
autoCropWidth: 400, // autoCropWidth: 400, //
autoCropHeight: 400, // autoCropHeight: 400, //
@ -69,7 +69,7 @@ function uploadImg(data) {
/** 关闭窗口 */ /** 关闭窗口 */
function closeDialog() { function closeDialog() {
options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar
options.visible = false options.visible = false
} }
const cancle = () => { const cancle = () => {