diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index 75ba33d..f13d533 100644 --- a/src/renderer/src/assets/iconfont/iconfont.css +++ b/src/renderer/src/assets/iconfont/iconfont.css @@ -1,9 +1,9 @@ @font-face { font-family: "iconfont"; /* Project id 2794390 */ - src: url('iconfont.woff2?t=1728543886557') format('woff2'), - url('iconfont.woff?t=1728543886557') format('woff'), - url('iconfont.ttf?t=1728543886557') format('truetype'), - url('iconfont.svg?t=1728543886557#iconfont') format('svg'); + src: url('iconfont.woff2?t=1732002934577') format('woff2'), + url('iconfont.woff?t=1732002934577') format('woff'), + url('iconfont.ttf?t=1732002934577') format('truetype'), + url('iconfont.svg?t=1732002934577#iconfont') format('svg'); } .iconfont { @@ -14,6 +14,26 @@ -moz-osx-font-smoothing: grayscale; } +.icon-a-shiyanpingshiyanyanjiu:before { + content: "\e9a0"; +} + +.icon-banji2:before { + content: "\e6c0"; +} + +.icon-set:before { + content: "\e691"; +} + +.icon-shouye:before { + content: "\e637"; +} + +.icon-gongzuotai:before { + content: "\e690"; +} + .icon-A1:before { content: "\e635"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index e5c0dbb..9d75b40 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2794390='',(c=>{var h=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var a,t,i,z,p,v=function(h,l){l.parentNode.insertBefore(h,l)};if(h&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}a=function(){var h,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2794390,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(h=document.body).firstChild?v(l,h.firstChild):h.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(i=a,z=c.document,p=!1,d(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,M())})}function M(){p||(p=!0,i())}function d(){try{z.documentElement.doScroll("left")}catch(h){return void setTimeout(d,50)}M()}})(window); \ No newline at end of file +window._iconfont_svg_string_2794390='',(c=>{var l=(h=(h=document.getElementsByTagName("script"))[h.length-1]).getAttribute("data-injectcss"),h=h.getAttribute("data-disable-injectsvg");if(!h){var a,t,i,z,p,v=function(l,h){h.parentNode.insertBefore(l,h)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}a=function(){var l,h=document.createElement("div");h.innerHTML=c._iconfont_svg_string_2794390,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(l=document.body).firstChild?v(h,l.firstChild):l.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(i=a,z=c.document,p=!1,d(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,M())})}function M(){p||(p=!0,i())}function d(){try{z.documentElement.doScroll("left")}catch(l){return void setTimeout(d,50)}M()}})(window); \ No newline at end of file diff --git a/src/renderer/src/assets/iconfont/iconfont.json b/src/renderer/src/assets/iconfont/iconfont.json index de96ea7..d2cf203 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -1,10 +1,45 @@ { "id": "2794390", - "name": "electron", + "name": "文枢2.1", "font_family": "iconfont", "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "41507853", + "name": "实验瓶", + "font_class": "a-shiyanpingshiyanyanjiu", + "unicode": "e9a0", + "unicode_decimal": 59808 + }, + { + "icon_id": "1017928", + "name": "班级", + "font_class": "banji2", + "unicode": "e6c0", + "unicode_decimal": 59072 + }, + { + "icon_id": "376364", + "name": "设置", + "font_class": "set", + "unicode": "e691", + "unicode_decimal": 59025 + }, + { + "icon_id": "5835474", + "name": "首页", + "font_class": "shouye", + "unicode": "e637", + "unicode_decimal": 58935 + }, + { + "icon_id": "19108133", + "name": "工作台", + "font_class": "gongzuotai", + "unicode": "e690", + "unicode_decimal": 59024 + }, { "icon_id": "11657531", "name": "A", diff --git a/src/renderer/src/assets/iconfont/iconfont.svg b/src/renderer/src/assets/iconfont/iconfont.svg index 105c931..76a5447 100644 --- a/src/renderer/src/assets/iconfont/iconfont.svg +++ b/src/renderer/src/assets/iconfont/iconfont.svg @@ -14,6 +14,16 @@ /> + + + + + + + + + + diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index efbbc57..1a9b595 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.ttf and b/src/renderer/src/assets/iconfont/iconfont.ttf differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff b/src/renderer/src/assets/iconfont/iconfont.woff index 8fd280e..8a98877 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff and b/src/renderer/src/assets/iconfont/iconfont.woff differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff2 b/src/renderer/src/assets/iconfont/iconfont.woff2 index f0667a9..6d80dc0 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff2 and b/src/renderer/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index 0bb3d08..e07e422 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -121,6 +121,12 @@ const headerMenus = [ id: 4, icon: '#icon-iconfontzhizuobiaozhunbduan3-1', disabled: true + }, + { + name: '实验室', + id: 5, + icon: '#icon-a-shiyanpingshiyanyanjiu', + path: '/experiment' } ] diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js index 2615d40..42260a1 100644 --- a/src/renderer/src/router/index.js +++ b/src/renderer/src/router/index.js @@ -49,6 +49,12 @@ export const constantRoutes = [ name: 'resource', meta: {title: '资源库'} }, + { + path: '/experiment', + component: () => import('@/views/experiment/index.vue'), + name: 'experiment', + meta: {title: '实验室'} + }, { path: '/prepare', component: () => import('@/views/prepare/index.vue'), diff --git a/src/renderer/src/utils/resourceDict.js b/src/renderer/src/utils/resourceDict.js index c86aaf8..07d1d44 100644 --- a/src/renderer/src/utils/resourceDict.js +++ b/src/renderer/src/utils/resourceDict.js @@ -117,4 +117,8 @@ export const coursewareTypeList = [ label:'素材', value:6 }, + { + label:'视频', + value:12 + }, ] diff --git a/src/renderer/src/views/experiment/components/experimentBook.vue b/src/renderer/src/views/experiment/components/experimentBook.vue new file mode 100644 index 0000000..a5b18a9 --- /dev/null +++ b/src/renderer/src/views/experiment/components/experimentBook.vue @@ -0,0 +1,330 @@ + + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/experiment/components/videoLog.vue b/src/renderer/src/views/experiment/components/videoLog.vue new file mode 100644 index 0000000..3842f41 --- /dev/null +++ b/src/renderer/src/views/experiment/components/videoLog.vue @@ -0,0 +1,25 @@ + + + \ No newline at end of file diff --git a/src/renderer/src/views/experiment/index.vue b/src/renderer/src/views/experiment/index.vue new file mode 100644 index 0000000..f33f8ff --- /dev/null +++ b/src/renderer/src/views/experiment/index.vue @@ -0,0 +1,238 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/resource/container/resoure-list.vue b/src/renderer/src/views/resource/container/resoure-list.vue index 517d97f..46e68d0 100644 --- a/src/renderer/src/views/resource/container/resoure-list.vue +++ b/src/renderer/src/views/resource/container/resoure-list.vue @@ -190,6 +190,8 @@ const handleRow = (item) => { }) curRow.value = item isShow.value = true + console.log(item,'item'); + }