Merge branch 'main' into zhuhao_dev

# Conflicts:
#	src/renderer/src/layout/index.vue
#	src/renderer/src/router/index.js

src/renderer/src/api/subject/index.js

@@ -0,0 +1,10 @@
+// 查询evaluation列表
+import request from '@/utils/request'
+
+export const listEvaluation = (query)=> {
+  return request({
+    url: '/education/evaluation/list',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2794390 */
-  src: url('./iconfont.woff2?t=1719991760511') format('woff2'),
+  src: url('iconfont.woff2?t=1720494614524') format('woff2'),
-       url('./iconfont.woff?t=1719991760511') format('woff'),
+       url('iconfont.woff?t=1720494614524') format('woff'),
-       url('./iconfont.ttf?t=1719991760511') format('truetype');
+       url('iconfont.ttf?t=1720494614524') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-xiangyou:before {
+  content: "\e609";
+}
+
+.icon-jiangke1:before {
+  content: "\e672";
+}
+
+.icon-jiaoxueziyuan:before {
+  content: "\e601";
+}
+
+.icon-beike:before {
+  content: "\e6c2";
+}
+
 .icon-zuidahua:before {
   content: "\e600";
 }

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

@@ -5,6 +5,34 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "22358026",
+      "name": "向右",
+      "font_class": "xiangyou",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "21230499",
+      "name": "讲课",
+      "font_class": "jiangke1",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "15841963",
+      "name": "教学资源",
+      "font_class": "jiaoxueziyuan",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "5562910",
+      "name": "备课",
+      "font_class": "beike",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
     {
       "icon_id": "4485682",
       "name": "最大化",