提交准备 写的 密码过期的登录

src/api/college/index.js

@@ -1,6 +1,7 @@
 import { baseRequest } from '@/utils/request'
 import {moduleRequest} from "@/utils/reSourceRequest";
 const requests = moduleRequest(`/api/webapp/`)
+const requestss = moduleRequest(`/`)
 const request = (url, ...arg) => baseRequest(`/api/webapp/disk/college/` + url, ...arg)
 
 export default {
@@ -9,8 +10,11 @@ export default {
 		return request('tree', data, 'get')
 	},
 
+	// treeAll(data) {
+	// 	return request('treeAll', data, 'get')
+	// },
 	treeAll(data) {
-		return request('treeAll', data, 'get')
+		return requests('/bus/org/treeAll', data, 'get')
 	},
 	getUser(p){
 		return requests('disk/CollegeUser/getUser', p, 'get')

src/views/portal/components/UserHeader.vue

@@ -66,6 +66,7 @@
 	import {ExclamationCircleOutlined, FolderOutlined} from '@ant-design/icons-vue'
 	import { Modal } from 'ant-design-vue'
 	import loginApi from '@/api/auth/loginApi'
+	import { getCount } from '@/api/portal'
 	import { message } from 'ant-design-vue'
 	import { ref } from 'vue'
 	import { useRouter, useRoute } from 'vue-router'
@@ -162,14 +163,17 @@
 		const currentPath = window.location.pathname;
 		console.log('当前路径',' currentPath ',currentPath)
 		if(currentPath != '/tlogin' && currentPath != '/jump'){
-			//站内信
-			let funcType1 = await getCount({funcType : 1})
-			console.log('获取未读数量 站内信',funcType1)
-			let funcType2 = await getCount({funcType : 2})
-			console.log('获取未读数量 公告',funcType2)
-			myMsgCount.value = funcType1.data.unreadCount
-			announcementLookManagementCount.value = funcType2.data.unreadCount
-			allCount.value = funcType1.data.unreadCount+ funcType2.data.unreadCount
+			if(tool.data.get('TOKEN')){
+				//站内信
+				let funcType1 = await getCount({funcType : 1})
+				console.log('获取未读数量 站内信',funcType1)
+				let funcType2 = await getCount({funcType : 2})
+				console.log('获取未读数量 公告',funcType2)
+				myMsgCount.value = funcType1.data.unreadCount
+				announcementLookManagementCount.value = funcType2.data.unreadCount
+				allCount.value = funcType1.data.unreadCount+ funcType2.data.unreadCount
+			}
+
 		}
 
 

src/views/resourceCenter/components/ComplexChoices.vue

@@ -540,7 +540,7 @@
 		// Format.value.setClean('全部')
 		spinningSelectedDepts.value = true
 		collegeApi.treeAll().then((data) => {
-			selectedDepts.value = data
+			selectedDepts.value = data.data
 			selectedDepts.value.forEach((item) => {
 				selectedDeptBigsList.value.push(item.children)
 				if (item.children) {

src/views/resourceCenter/components/ResourceList.vue

@@ -64,7 +64,7 @@
 							<a-tooltip>
 								<template #title>{{ item.fileName }}</template>
 								<span style="font-size: 15px; font-weight: bold">{{
-										tool.truncateString(item.fileName, 30)
+										tool.truncateString(item.fileName, 18)
 									}}</span>
 							</a-tooltip>
 							<span style="font-size: 12px; margin-top: 10px"> {{ item.collegeIdName }}</span>