Merge remote-tracking branch 'origin/main'

src/renderer/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   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 {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yinle:before {
+  content: "\e6c9";
+}
+
 .icon-yuyin:before {
   content: "\e648";
 }

src/renderer/src/assets/iconfont/iconfont.json

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

src/renderer/src/components/file-image/index.vue

@@ -41,6 +41,7 @@ const getFileTypeIcon = () => {
     airobot: 'icon-jiqirenfushi', // 数字人生成
     aiimg: 'icon-xiangmuicon_maobishufa', // 文生图片
     aidraw: 'icon-meishu-F', // 文生连环画
+    aiyinyue: 'icon-yinle' //文生音乐
   }
   if (iconObj[name]) {
     return '#' + iconObj[name]

src/renderer/src/utils/tool.js

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

src/renderer/src/views/model/index.vue

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