fix

src/views/Administrator.vue

@@ -18,21 +18,21 @@
 				@click="handleClick"
             >
 
-                <div v-for="(menu) in rootSubmenuKeys" :key="menu.key" >
+				<div v-for="(menu) in rootSubmenuKeys" :key="menu.key" >
                     <a-menu-item :key="menu.key" :name="menu.name" :route="menu.route" v-if="!menu.children">
                         <template #icon>
 							<span :class="['icon','iconfont', 'menu_icon', menu.icon]"></span>
 						</template>
-                        <span class="menu_title">{{menu.name}}</span>
+                        <span class="menu_title" :title="menu.name">{{menu.name}}</span>
                     </a-menu-item>
                     <a-sub-menu :key="menu.key" v-else> 
                         <template #icon>
                             <span :class="['icon','iconfont', 'menu_icon', menu.icon]"></span>
                         </template>
                         <template #expandIcon><span :class="['icon','iconfont', 'menu_icon', menu.expandIcon]"></span></template>
-                        <template #title><span class="menu_title">{{menu.name}}</span></template>
+                        <template #title><span class="menu_title" :title="menu.name">{{menu.name}}</span></template>
                         <div >
-                            <a-menu-item v-for="child in menu.children" :key="child.key" :name="child.name" :route="child.route"><span class="menu_title">{{child.name}}</span></a-menu-item>
+                            <a-menu-item v-for="child in menu.children" :key="child.key" :name="child.name" :route="child.route"><span class="menu_title" :title="child.name">{{child.name}}</span></a-menu-item>
                         </div>
                     </a-sub-menu>
                 </div>
@@ -75,6 +75,7 @@ import { useStore } from "vuex";
 import { useRouter,useRoute } from 'vue-router'
 import GO from "@/tool/GO";
 import { getCookie } from "@/tool/cookie";
+import { country } from "@/tool/country";
 import { getUploadUrl } from "@/tool/util";
 // import { forEach } from "jszip";
 import scaleImage from "@/component/HomePage/scaleImage.vue";
@@ -92,7 +93,7 @@ export default defineComponent({
         const route:any = useRoute()
 		const state:any = reactive({
 		rootSubmenuKeys: [{
-			name:'Trial User',
+			name:'All User',
 			route:'/administrator/allUser',
 			icon:'yonghu',
 			expandIcon:'icon-xiala',
@@ -123,16 +124,75 @@ export default defineComponent({
 			key:'sub2',
 			isShow:true,
 		},{
-			name:'Trial User Approval',
-			route:'/administrator/trialApproval',
+			name:'Trial User',
 			icon:'usetime',
-			key:'sub3',
 			expandIcon:'icon-xiala',
+			key:'sub3',
 			isShow:true,
+			children:[
+				{
+					name:'Trial All User',
+					route:'/administrator/trialAllUser',
+					icon:'usetime',
+					key:'sub3-1',
+					isShow:true,
+				},{
+					name:'Trial User Approval',
+					route:'/administrator/trialApproval',
+					icon:'usetime',
+					key:'sub3-2',
+					isShow:true,
+				},{
+					name:'Trial User CHART',
+					route:'/administrator/trialUserCountry',
+					icon:'',
+					key:'sub3-3',
+					isShow:true,
+				},{
+					name:'Conversion Rate',
+					route:'/administrator/trialUserConversionRateChart',
+					icon:'',
+					key:'sub3-4',
+					isShow:true,
+				},
+			]
+		},{
+			name:'Function Use CHART',
+			route:'/administrator/recentActiveChart',
+			icon:'usetime',
+			key:'sub4',
+			isShow:true,
+		},{
+			name:'Active User',
+			icon:'usetime',
+			route:'/administrator/recentActiveUser',
+			key:'sub5',
+			isShow:true,
+		},{
+			name:'New User',
+			icon:'usetime',
+			expandIcon:'icon-xiala',
+			key:'sub6',
+			isShow:true,
+			children:[
+				{
+					name:'New User List',
+					route:'/administrator/recentNewUser',
+					icon:'',
+					key:'sub6-1',
+					isShow:true,
+				},{
+					name:'New User CHART',
+					route:'/administrator/recentNewUserChart',
+					icon:'',
+					key:'sub6-2',
+					isShow:true,
+				},
+			]
 		},{
 			name:'Events',
 			icon:'usetime',
-			key:'sub4',
+			key:'sub9',
 			expandIcon:'icon-xiala',
 			isShow:true,
 			children: [
@@ -140,7 +200,7 @@ export default defineComponent({
 					name:'Questionnaire Survey',
 					route:'/administrator/questionnaire',
 					icon:'',
-					key:'sub4-1',
+					key:'sub9-1',
 					isShow:true,
 				},
 				// {
@@ -200,6 +260,14 @@ export default defineComponent({
 					}
 				}
 			});
+			//储存所有用户id和name
+			Https.axiosGet(Https.httpUrls.getAllUserId,).then((rv: any) => {
+				if (rv) {
+					sessionStorage.setItem('allUserList',JSON.stringify(rv));
+				}
+			})
+			let allCountry = country
+			sessionStorage.setItem('allCountry',JSON.stringify(allCountry));
 			// state.nowPageName = state.rootSubmenuKeys[0].name
 			// router.push(state.rootSubmenuKeys[0].route)
             
@@ -268,6 +336,7 @@ export default defineComponent({
 		}
 	}
 	.administrator_page_left{
+		width: 20%;
 		padding-top: 20px;
 		.modal_title_text{
 			// font-size: var(--aida-fsize1-8);
@@ -276,11 +345,15 @@ export default defineComponent({
 		}
 		.ant-menu-dark.menu_list_content{
             padding-left: 1.8rem;
-            width: 30rem;
-            height: calc(100% - 59px);
+            // width: 30rem;
+			width: 100%;
+            height: calc(100% - 16rem);
             background: #FFFFFF;
             flex-shrink: 0;
-
+			overflow-y: auto;
+			&::-webkit-scrollbar{
+				width: 0;
+			}
             .menu_icon{
                 font-size: 2.4rem;
                 color: #808185;
@@ -331,6 +404,7 @@ export default defineComponent({
 	}
 	.administrator_page_right{
 		flex: 1;
+		width: 80%;
 		.administrator_page_right_header{
 			display: flex;
             justify-content: space-between;

src/views/HomeMain.vue

@@ -3,18 +3,20 @@
         <header class="homeMain_heade">
             <div class="homeMain_right_content">
                 <div class="homeMain_user">
-					<div class="homeMain_user_icon">
+					<div class="homeMain_user_icon" @click="openAccount">
 
 					</div>
 					<div class="homeMain_user_detail">
 						<div v-if="isTest" class="username">{{$t('Header.hello')}}@{{ $t('isTest.userName') }}</div>
 						<div v-else class="username">{{$t('Header.hello')}}@{{ userInfo?.userName }}</div>
 						<div class="homeMain_user_detail_item homeMain_user_detail_attention">
-							<div class="attention_item attention_item_active">
+							<div class="attention_item">
+							<!-- 点击事件就用下面的div -->
+							<!-- <div class="attention_item attention_item_active"> -->
 								<div>123</div>
 								<span>关注</span>
 							</div>
-							<div class="attention_item attention_item_active">
+							<div class="attention_item">
 								<div>321</div>
 								<span>粉丝</span>
 							</div>
@@ -23,7 +25,7 @@
 								<span>作品数</span>
 							</div>
 						</div>
-						<div class="homeMain_user_detail_item homeMain_user_detail_setUser">
+						<div class="homeMain_user_detail_item homeMain_user_detail_setUser" @click="openAccount">
 							<i class="fi fi-rr-user"></i>
 							<div>个人中心</div>
 							<i class="icon iconfont icon-xiala"></i>
@@ -318,6 +320,9 @@ export default defineComponent({
 			}, 500);
 		})
 		heradeRight.addEventListener('mouseleave',(event)=>{
+			if(overTime){
+				clearTimeout(overTime)
+			}
 			if(!state)return
 			clearTimeout(outTime)
 			outTime = setTimeout(() => {
@@ -522,8 +527,11 @@ export default defineComponent({
 			let taskPage = this.$refs.TaskPage
 			taskPage.init(data)
 		},
+		openAccount(){
+			this.$router.push("/home/account")
+		},
 		openMessage(){
-
+			this.$router.push("/home/account/accountMessage")
 		},
     },
 });
@@ -626,6 +634,8 @@ export default defineComponent({
 						display: flex;
 						flex-direction: column;
 						align-items: center;
+					}
+					.attention_item_active{
 						cursor: pointer;
 					}
 					.attention_item_active:hover{
@@ -634,9 +644,6 @@ export default defineComponent({
 							color: #39215b;
 						}
 					}
-					.attention_item:last-child{
-						cursor: auto;
-					}
 					span{
 						font-size: 1.4rem;
 						color: #949eae;