diff --git a/package.json b/package.json index ada67fe..ecf3b97 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.1.21", + "version": "2.5.0", "description": "", "main": "./out/main/index.js", "author": "上海交大重庆人工智能研究院", diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue index 0f33ba6..fe4154b 100644 --- a/src/renderer/src/App.vue +++ b/src/renderer/src/App.vue @@ -18,6 +18,5 @@ const size = ref('default') text-align: center; color: #2c3e50; width: 100%; - /* height: 100vh; */ } diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index 99e1585..778f7b4 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 4723712 */ - src: url('iconfont.woff2?t=1730183338081') format('woff2'), - url('iconfont.woff?t=1730183338081') format('woff'), - url('iconfont.ttf?t=1730183338081') format('truetype'); + src: url('iconfont.woff2?t=1730189025078') format('woff2'), + url('iconfont.woff?t=1730189025078') format('woff'), + url('iconfont.ttf?t=1730189025078') format('truetype'); } .iconfont { @@ -13,6 +13,66 @@ -moz-osx-font-smoothing: grayscale; } +.icon-renzheng-:before { + content: "\e623"; +} + +.icon-yijianfankui:before { + content: "\e8a1"; +} + +.icon-zuoyesheji:before { + content: "\e619"; +} + +.icon-jihua:before { + content: "\e601"; +} + +.icon-jiaocaixuanze:before { + content: "\e642"; +} + +.icon-xueqingfenxi:before { + content: "\e68a"; +} + +.icon-zuoyebuzhi:before { + content: "\e607"; +} + +.icon-zuoyepigai:before { + content: "\ec35"; +} + +.icon-tongji:before { + content: "\e68f"; +} + +.icon-zuzhi:before { + content: "\e63b"; +} + +.icon-zhiliang:before { + content: "\e643"; +} + +.icon-jiaoxueshijian:before { + content: "\e676"; +} + +.icon-kebiao:before { + content: "\e67a"; +} + +.icon-kaoshi:before { + content: "\eb14"; +} + +.icon-a-1_jiaoxuefansi:before { + content: "\e6cd"; +} + .icon-xiayiye:before { content: "\e68b"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index c071052..7eb661c 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4723712='',(c=>{var h=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var v,a,t,i,z,p=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)}}v=function(){var h,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_4723712,(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?p(l,h.firstChild):h.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(v,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),v()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(t=v,i=c.document,z=!1,d(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){z||(z=!0,t())}function d(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(d,50)}M()}})(window); \ No newline at end of file +window._iconfont_svg_string_4723712='',(l=>{var h=(c=(c=document.getElementsByTagName("script"))[c.length-1]).getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var v,a,t,z,i,p=function(h,c){c.parentNode.insertBefore(h,c)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}v=function(){var h,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4723712,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(h=document.body).firstChild?p(c,h.firstChild):h.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(v,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),v()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(t=v,z=l.document,i=!1,o(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,M())})}function M(){i||(i=!0,t())}function o(){try{z.documentElement.doScroll("left")}catch(h){return void setTimeout(o,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 44d55b2..69393d7 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -5,6 +5,111 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "7447571", + "name": "认证-01", + "font_class": "renzheng-", + "unicode": "e623", + "unicode_decimal": 58915 + }, + { + "icon_id": "2076317", + "name": " 意见反馈", + "font_class": "yijianfankui", + "unicode": "e8a1", + "unicode_decimal": 59553 + }, + { + "icon_id": "2468169", + "name": "作业指导书", + "font_class": "zuoyesheji", + "unicode": "e619", + "unicode_decimal": 58905 + }, + { + "icon_id": "3865266", + "name": "计划", + "font_class": "jihua", + "unicode": "e601", + "unicode_decimal": 58881 + }, + { + "icon_id": "4287869", + "name": "教材选择", + "font_class": "jiaocaixuanze", + "unicode": "e642", + "unicode_decimal": 58946 + }, + { + "icon_id": "4308245", + "name": "学情概览", + "font_class": "xueqingfenxi", + "unicode": "e68a", + "unicode_decimal": 59018 + }, + { + "icon_id": "5113507", + "name": "教学中心_作业批改", + "font_class": "zuoyebuzhi", + "unicode": "e607", + "unicode_decimal": 58887 + }, + { + "icon_id": "5767879", + "name": "执行反馈", + "font_class": "zuoyepigai", + "unicode": "ec35", + "unicode_decimal": 60469 + }, + { + "icon_id": "8455509", + "name": "统计", + "font_class": "tongji", + "unicode": "e68f", + "unicode_decimal": 59023 + }, + { + "icon_id": "12732492", + "name": "组织", + "font_class": "zuzhi", + "unicode": "e63b", + "unicode_decimal": 58939 + }, + { + "icon_id": "18909227", + "name": "质量管理", + "font_class": "zhiliang", + "unicode": "e643", + "unicode_decimal": 58947 + }, + { + "icon_id": "21156217", + "name": "培训", + "font_class": "jiaoxueshijian", + "unicode": "e676", + "unicode_decimal": 58998 + }, + { + "icon_id": "33378945", + "name": "课程标准", + "font_class": "kebiao", + "unicode": "e67a", + "unicode_decimal": 59002 + }, + { + "icon_id": "35203493", + "name": "考试 (3)", + "font_class": "kaoshi", + "unicode": "eb14", + "unicode_decimal": 60180 + }, + { + "icon_id": "37027693", + "name": "教学反思", + "font_class": "a-1_jiaoxuefansi", + "unicode": "e6cd", + "unicode_decimal": 59085 + }, { "icon_id": "694110", "name": "下一页", diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index 58c0807..4c6ba15 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 e360258..97d73a1 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 578025d..845de8c 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/Aside.vue b/src/renderer/src/layout/components/Aside.vue index fa3cdf6..d2188a0 100644 --- a/src/renderer/src/layout/components/Aside.vue +++ b/src/renderer/src/layout/components/Aside.vue @@ -2,15 +2,23 @@
- +
    +
  • + + 学校认证 + 未认证 +
  • 个人中心
  • 班级中心
    • -
  • 退出登录
    • +
  • 退出登录
 @@ -35,7 +43,9 @@
+
V{{ version }}
+
@@ -45,14 +55,19 @@ import { useRouter } from 'vue-router' import { ElMessageBox, ElMessage } from 'element-plus' import useUserStore from '@/store/modules/user' import { sessionStore } from '@/utils/store' +import pkc from "../../../../../package.json" const { ipcRenderer } = window.electron || {} const dev_api = ref(import.meta.env.VITE_APP_BASE_API) const userStore = useUserStore() +console.log(userStore,'userStore') const router = useRouter() const currentRoute = ref('') const activeId = ref('/home') + +const version = ref(pkc.version) + const popoverRef = ref('') const headerMenus = [ @@ -146,18 +161,35 @@ const logout = () => { justify-content: center; flex-direction: column; align-items: center; + font-size: 12px; + -webkit-app-region: no-drag; ul{ width: 100%; li{ + display: flex; + align-items: center; + justify-content: center; width: 100%; padding: 10px 0; cursor: pointer; text-align: center; border-bottom: solid #d9dce2 1px; + .mlr-5{ + margin: 0 5px; + } + .gray{ + color: #a8aab1; + } &:hover{ background: #d9dce2; } } + .auth-li{ + cursor: auto; + &:hover{ + background: #fff; + } + } } } @@ -171,11 +203,19 @@ const logout = () => { display: flex; flex-direction: column; justify-content: space-between; - .user-img{ - width: 56px; - height: 56px; - border-radius: 50%; - cursor: pointer; + .user-info{ + display: flex; + flex-direction: column; + color: #fff; + align-items: center; + font-size: 12px; + .user-img{ + width: 56px; + height: 56px; + border-radius: 50%; + cursor: pointer; + margin-bottom: 10px; + } } .aside-tab { @@ -188,12 +228,12 @@ const logout = () => { width: 100%; cursor: pointer; flex-direction: column; - padding: 5px 0; + padding: 8px 0; align-items: center; color: #fff; .text { - font-size: 11px; + font-size: 12px; } .iconfont { @@ -224,5 +264,9 @@ const logout = () => { } } } - +.verson{ + color: #fff; + font-size: 12px; + margin-top: 5px; +} \ No newline at end of file diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index 4b738bc..d827775 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -233,6 +233,7 @@ onMounted(() => { justify-content: space-between; align-items: center; width: 100%; + -webkit-app-region: drag; .header-center{ margin-left: auto; margin-right: auto; diff --git a/src/renderer/src/layout/index.vue b/src/renderer/src/layout/index.vue index 19546a5..9bcf801 100644 --- a/src/renderer/src/layout/index.vue +++ b/src/renderer/src/layout/index.vue @@ -1,14 +1,4 @@