yzx 4 달 전
부모
커밋
4799937d74

+ 1 - 6
src/layout/components/ToolHeader.vue

@@ -1,6 +1,5 @@
 <script lang="tsx">
 import { defineComponent, computed } from 'vue'
-import { Message } from '@/layout/components//Message'
 import { Collapse } from '@/layout/components/Collapse'
 import { UserInfo } from '@/layout/components/UserInfo'
 import { Screenfull } from '@/layout/components/Screenfull'
@@ -38,8 +37,6 @@ const layout = computed(() => appStore.getLayout)
 // 多语言图标
 const locale = computed(() => appStore.getLocale)
 
-// 消息图标
-const message = computed(() => appStore.getMessage)
 
 export default defineComponent({
   name: 'ToolHeader',
@@ -75,9 +72,7 @@ export default defineComponent({
               color="var(--top-header-text-color)"
             ></LocaleDropdown>
           ) : undefined}
-          {message.value ? (
-            <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
-          ) : undefined}
+
           <UserInfo></UserInfo>
         </div>
       </div>

+ 12 - 1
src/router/modules/remaining.ts

@@ -142,7 +142,18 @@ const remainingRouter: AppRouteRecordRaw[] = [
           noCache: false,
           affix: true
         }
-      }
+      },
+      // {
+      //   path: 'index2',
+      //   component: () => import('@/views/Home/Index2.vue'),
+      //   name: 'Index2',
+      //   meta: {
+      //     title: '个人中心',
+      //     icon: 'ep:user',
+      //     noCache: false,
+      //     affix: true
+      //   }
+      // },
     ]
   },
   {

+ 0 - 1
src/views/Login/Login.vue

@@ -172,7 +172,6 @@ const { t } = useI18n()
 const appStore = useAppStore()
 const { getPrefixCls } = useDesign()
 const prefixCls = getPrefixCls('login')
-
 </script>
 
 <style lang="scss" scoped>

+ 3 - 7
src/views/Login/components/LoginForm.vue

@@ -147,9 +147,9 @@
 import { ElLoading } from 'element-plus'
 import LoginFormTitle from './LoginFormTitle.vue'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
-import SHome from '@/views/system/Home/Index.vue'
+
 import { useIcon } from '@/hooks/web/useIcon'
-import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
+
 import * as authUtil from '@/utils/auth'
 import { usePermissionStore } from '@/store/modules/permission'
 import * as LoginApi from '@/api/login'
@@ -239,7 +239,6 @@ const getTenantByWebsite = async () => {
     authUtil.setTenantId(res.id)
   }
 }
-
 const loading = ref() // ElLoading.service 返回的实例
 // 登录
 const handleLogin = async (params) => {
@@ -253,7 +252,6 @@ const handleLogin = async (params) => {
     const loginDataLoginForm = { ...loginData.loginForm }
     loginDataLoginForm.captchaVerification = params.captchaVerification
     const res = await LoginApi.login(loginDataLoginForm)
-
     if (!res) {
       return
     }
@@ -268,10 +266,9 @@ const handleLogin = async (params) => {
       authUtil.removeLoginForm()
     }
     authUtil.setToken(res)
-    
     if (!redirect.value) {
       redirect.value = '/'
-    } 
+    }
     // 判断是否为SSO登录
     if (redirect.value.indexOf('sso') !== -1) {
       window.location.href = window.location.href.replace('/login?redirect=', '')
@@ -332,7 +329,6 @@ watch(
 onMounted(() => {
   getLoginFormCache()
   getTenantByWebsite()
-
 })
 </script>
 

+ 2 - 1
src/views/system/studentAttendanceManage/studentAttendance/index.vue

@@ -253,7 +253,7 @@ const getCount = async () => {
   totalSate.excuseNum = data.excuseNum
 }
 
-const loading = ref(true) // 列表的加载中
+const loading = ref(false) // 列表的加载中
 const list = ref<StudentAttendanceVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
@@ -419,4 +419,5 @@ onMounted(async () => {
   font-size: 16px; 
   font-weight: bold;
 }
+
 </style>