Merge pull request '2.5init' (#5) from lyc-dev into main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "2.1.21",
+  "version": "2.5.0",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",

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";
 }

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": "下一页",

src/renderer/src/layout/components/Aside.vue

@@ -2,12 +2,17 @@
   <div class="page-aside">
     <div>
       <div>
-        <el-popover ref="popoverRef" placement="right" trigger="hover" :width="120" popper-class="popoverStyle" >
+        <el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" >
           <template #reference>
             <el-image class="user-img" :src="dev_api + userStore.user.avatar"  />
           </template>
           <div class="head-aside">
             <ul>
+              <li class="auth-li">
+                <i class="iconfont icon-renzheng-"></i>
+                <span class="mlr-5">学校认证</span>
+                <span class="gray">未认证</span>
+              </li>
               <li @click="onUserTo('/profile')">个人中心</li>
               <li @click="onUserTo('/class')">班级中心</li>
               <li  @click="logout">退出登录</li>
@@ -35,7 +40,9 @@
           </li>
         </ul>
       </div>
+      <div class="verson">V{{ version }}</div>
     </div>
+    
   </div>
 </template>
 
@@ -45,6 +52,7 @@ 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)
@@ -53,6 +61,9 @@ const router = useRouter()
 const currentRoute = ref('')
 const activeId = ref('/home')
 
+
+const version = ref(pkc.version)
+
 const popoverRef = ref('')
 
 const headerMenus = [
@@ -146,18 +157,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;
+      }
+    }
   }
 }
 </style>
@@ -224,5 +252,9 @@ const logout = () => {
     }
   }
 }
-
+.verson{
+  color: #fff;
+  font-size: 12px;
+  margin-top: 10px;
+}
 </style>

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;