Merge pull request 'fix：新增图标；' (#57) from yws_dev into main

Reviewed-on: #57

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

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4723712 */
-  src: url('iconfont.woff2?t=1732173266977') format('woff2'),
-       url('iconfont.woff?t=1732173266977') format('woff'),
-       url('iconfont.ttf?t=1732173266977') format('truetype');
+  src: url('iconfont.woff2?t=1732240267757') format('woff2'),
+       url('iconfont.woff?t=1732240267757') format('woff'),
+       url('iconfont.ttf?t=1732240267757') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shangchuan:before {
+  content: "\e61b";
+}
+
 .icon-jiqiren_o:before {
   content: "\eb62";
 }

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

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "4942656",
+      "name": "上传",
+      "font_class": "shangchuan",
+      "unicode": "e61b",
+      "unicode_decimal": 58907
+    },
     {
       "icon_id": "5387814",
       "name": "机器人_o",

src/renderer/src/components/whiteboard/whiteboard.vue

@@ -6,7 +6,7 @@
       :style="type == 'design' ? ['top: 10px', 'justify-content: space-between'] : ['bottom: 10px', 'justify-content: center']">
       <div class="left">
         <!-- 前进回退 -->
-        <div class="blockBox" v-if="!readonly && width >= 1000">
+        <div class="blockBox" v-if="!readonly && (width >= 1000 || width==='100%')">
           <el-tooltip effect="light" content="回退" placement="top">
             <el-button :icon="RefreshLeft" circle :disabled="!canUndo" @click="undo" />
           </el-tooltip>
@@ -180,7 +180,7 @@
           </div>
         </template>
         <!-- 滚动 -->
-        <div v-if="width >= 1000" class="blockBox">
+        <div v-if="width >= 1000 || width==='100%'" class="blockBox">
           <template v-if="type == 'design'">
             <el-tooltip effect="light" content="滚动至中心" placement="top">
               <el-button icon="Operation" @click="scrollToCenter" />
@@ -202,7 +202,7 @@
       </div> -->
 
         <!-- 橡皮擦、显示网格、清空 -->
-        <div v-if="width >= 1000" class="blockBox">
+        <div v-if="width >= 1000 || width==='100%'" class="blockBox">
           <!-- 橡皮擦 -->
           <el-tooltip effect="light" :content="currentType === 'eraser' ? '关闭橡皮擦' : '橡皮擦'" placement="top">
             <el-button v-if="!readonly" :icon="Remove" circle :type="currentType === 'eraser' ? 'primary' : null"

src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue

@@ -29,14 +29,14 @@ import { ElMessage } from 'element-plus'
 
 const emit = defineEmits(['itemClick'])
 const items = shallowRef([
-  { title: '自主搜题', description: '1111111111111111111111111111111111111', icon: '#icon-soutibao-',type:'primary' },
-  { title: '校本题库', description: '222222', icon: '#icon-soutibao-',type:'success' },
-  { title: '个人题库', description: '333333', icon: '#icon-soutibao-',type:'default' },
-  { title: '智能推荐', description: '444444', icon: '#icon-tubiao_wuxing-',type:'default' },
-  { title: '课堂展示', description: '555555', icon: '#icon-huaban',type:'primary' },
-  { title: '常规作业', description: '555555', icon: '#icon-zhaoxiangji',type:'primary' },
-  { title: 'AI设计作业', description: '555555', icon: '#icon-jiqiren_o',type:'danger' },
-  { title: '习题上传', description: '555555', icon: '#icon-jiqiren_o',type:'danger' },
+  { title: '自主搜题', description: '上千万高质量习题资源，历届考试真题，每道题均有习题解析', icon: '#icon-soutibao-',type:'default' },
+  { title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'default' },
+  { title: '个人题库', description: '老师上传维护自己的个人题库。', icon: '#icon-soutibao-',type:'default' },
+  { title: '智能推荐', description: '通过对学生的薄弱知识点分析，推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'default' },
+  { title: '课堂展示', description: '通过课堂白板绘制作业，提升学生的创作思维能力。', icon: '#icon-huaban',type:'primary' },
+  { title: '常规作业', description: '推送pdf、视频、音频、图片，学生可以拍照上传。', icon: '#icon-zhaoxiangji',type:'danger' },
+  { title: 'AI设计作业', description: '通过AI助手，根据课标、教材、考试等分析结果，智能创建作业。', icon: '#icon-jiqiren_o',type:'danger' },
+  { title: '习题上传', description: '自己上传个人题库。', icon: '#icon-shangchuan',type:'danger' },
 ]);
 
 const handleClick = (item) => {
@@ -71,7 +71,7 @@ const handleClick = (item) => {
   border-radius: 8px;
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
   padding: 8px;
-  width: calc(25% - 16px); 
+  width: calc(25% - 16px);
   cursor: pointer;
   transition: all 0.3s ease;
 }
@@ -140,4 +140,4 @@ const handleClick = (item) => {
   opacity: 0;
 }
 
-</style>
+</style>

src/renderer/src/views/prepare/container/file-list-item.vue

@@ -280,14 +280,14 @@ export default {
               cookie,
               fileType: item.fileType
             })
-            ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
+            /*ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
               items.async = 'on'
             })
             ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
               items.fileSize = data.fileSize
               items.md5 = md5
               items.async = true
-            })
+            })*/
           }
         })
       })

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -357,14 +357,14 @@ export default {
               cookie,
               fileType: item.fileType
             })
-            ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
+            /*ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
               items.async = 'on'
             })
             ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
               items.fileSize = data.fileSize
               items.md5 = md5
               items.async = true
-            })
+            })*/
           }
         })
       })

src/renderer/src/views/resource/container/resoure-list.vue

@@ -161,7 +161,11 @@ const delRow = (item) => {
 }
 
 // 加入备课
-const addLesson = ({ id }) => {
+const addLesson = ({ id, fileSize }) => {
+  if (fileSize>1024*1024*150) {
+    ElMessage.warning('文件超过150M，暂停超过150M资源的下载，请重新选择')
+    return
+  }
   let data = {
     id,
     fileRoot: '备课',

src/renderer/src/views/resource/container/third-list.vue

@@ -125,6 +125,10 @@ const handleRow = (item) => {
   thirdPreview.value.init(item.itemId)
 }
 const openChapter = (item)=>{
+  if (item.size>1024*1024*150) {
+    ElMessage.warning('文件超过150M，暂停超过150M资源的下载，请重新选择')
+    return
+  }
   currentItem.value = item
   // 打开弹窗
   treelogRef.value.openDialog()