diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index 6f0ef3c..34124e7 100644 --- a/src/renderer/src/assets/iconfont/iconfont.css +++ b/src/renderer/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2794390 */ - src: url('iconfont.woff2?t=1720613279441') format('woff2'), - url('iconfont.woff?t=1720613279441') format('woff'), - url('iconfont.ttf?t=1720613279441') format('truetype'); + src: url('iconfont.woff2?t=1720677380684') format('woff2'), + url('iconfont.woff?t=1720677380684') format('woff'), + url('iconfont.ttf?t=1720677380684') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-shenglvehao:before { + content: "\e64f"; +} + .icon-jiahao:before { content: "\e602"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index fa0c500..0b5fd46 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2794390='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],t=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var i,h,c,e,o,d=function(l,t){t.parentNode.insertBefore(l,t)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}i=function(){var l,t=document.createElement("div");t.innerHTML=a._iconfont_svg_string_2794390,(t=t.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",t=t,(l=document.body).firstChild?d(t,l.firstChild):l.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),i()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(c=i,e=a.document,o=!1,n(),e.onreadystatechange=function(){"complete"==e.readyState&&(e.onreadystatechange=null,p())})}function p(){o||(o=!0,c())}function n(){try{e.documentElement.doScroll("left")}catch(l){return void setTimeout(n,50)}p()}}(window); \ No newline at end of file +window._iconfont_svg_string_2794390='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],t=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var i,h,e,c,o,d=function(l,t){t.parentNode.insertBefore(l,t)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}i=function(){var l,t=document.createElement("div");t.innerHTML=a._iconfont_svg_string_2794390,(t=t.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",t=t,(l=document.body).firstChild?d(t,l.firstChild):l.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),i()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(e=i,c=a.document,o=!1,n(),c.onreadystatechange=function(){"complete"==c.readyState&&(c.onreadystatechange=null,p())})}function p(){o||(o=!0,e())}function n(){try{c.documentElement.doScroll("left")}catch(l){return void setTimeout(n,50)}p()}}(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 9bd97e3..4a6a467 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -1,10 +1,17 @@ { "id": "2794390", - "name": "test", + "name": "electron", "font_family": "iconfont", "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "34273050", + "name": "省略号", + "font_class": "shenglvehao", + "unicode": "e64f", + "unicode_decimal": 58959 + }, { "icon_id": "8721197", "name": "加号", diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index 770b133..c0ed1b5 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 5091a71..b97a0e2 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 1c9cddc..4e03626 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/views/login/index.vue b/src/renderer/src/views/login/index.vue index a90d3a5..4f02fb0 100644 --- a/src/renderer/src/views/login/index.vue +++ b/src/renderer/src/views/login/index.vue @@ -46,7 +46,7 @@ import leftBg2 from '@/assets/images/login/left-bg2.png' const formRef = ref() const userStore = useUserStore() const router = useRouter() -// const { ipcRenderer } = window.electron +const { ipcRenderer } = window.electron || {} const isMaxSize = ref(false) const btnLoading = ref(false) //表单 @@ -101,6 +101,7 @@ const getCookie = () => { } onMounted(()=>{ + ipcRenderer.send('set-winsize',{x:888,y: 520}) getCookie() }) // 最小化 diff --git a/src/renderer/src/views/resource/container/resoure-list.vue b/src/renderer/src/views/resource/container/resoure-list.vue index 32c81f3..3b42007 100644 --- a/src/renderer/src/views/resource/container/resoure-list.vue +++ b/src/renderer/src/views/resource/container/resoure-list.vue @@ -14,7 +14,16 @@
- + + +
+

预览

+

编辑

+
+ + 备课 @@ -83,11 +92,29 @@ const handleCurrentChange = () => { } border-bottom: none; } - .icon-jiahao { - font-size: 12px; - margin-right: 3px; - font-weight: bold; + .item-btns { + display: flex; + align-items: center; + .item-popover{ + font-size: 12px; + p{ + text-align: center; + } + } + .icon-shenglvehao { + cursor: pointer; + font-size: 18px; + font-weight: bold; + margin-right:10px; + } + + .icon-jiahao { + font-size: 12px; + margin-right: 3px; + font-weight: bold; + } } + } .pagination-box { diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue index a466881..798e722 100644 --- a/src/renderer/src/views/resource/index.vue +++ b/src/renderer/src/views/resource/index.vue @@ -15,8 +15,8 @@ import ChooseTextbook from '@/components/choose-textbook/index.vue' import ResoureSearch from './container/resoure-search.vue'; import ResoureList from './container/resoure-list.vue'; -// const { ipcRenderer } = window.electron -// ipcRenderer.send('set-winsize',{x:1000,y: 700}) +const { ipcRenderer } = window.electron || {} +// ipcRenderer.send('set-winsize',{x:1100,y: 700}) const nodeClick = (data) => { // console.log(toRaw(data))