Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/views/HomeMain.vue

@@ -18,7 +18,7 @@
 					<p>{{$t('Header.NewProject')}}</p>
 				</div>
 				<div class="navList ">
-					<div class="tools list" v-for="item in openTypeList" :class="{active:openType == item.value,history:item.value == 'history','show-history' : showHistory && item.value === 'history111','isHistory' : item.value === 'history111'}">
+					<div class="tools list" v-for="item in navTypeList" :class="{active:openType == item.value,history:item.value == 'history','show-history' : showHistory && item.value === 'history111','isHistory' : item.value === 'history111'}">
 						<div class="titleBox" @click="setOpenType(item.value,item.list)">
 							<div class="left">
 								<i :class="['fi',item.icon]"></i>
@@ -291,7 +291,7 @@ import { ScrollTrigger } from "gsap/ScrollTrigger";
 import MyWs from "@/tool/webSocket";
 import MyEvent from "@/tool/myEvents";
 import { useRouter,useRoute } from 'vue-router'
-import {openTypeList} from "@/tool/listData.js";
+import {navTypeList} from "@/tool/listData.js";
 import home from "@/component/home/index.vue";
 import projectSetting from '@/component/home/newProject/setting.vue'
 import bindEmail from "@/component/HomePage/bindEmail.vue";
@@ -325,7 +325,7 @@ export default defineComponent({
 			openTypeChild:'',
 			isLanguage:false,
 			userDetailLanguage:computed(()=>store.state.UserHabit.userDetail.language),
-			openTypeList:openTypeList(t),
+			navTypeList:navTypeList(t),
 			projectSetting:null,
 			historyData:{
 				isNoData:false,
@@ -356,13 +356,13 @@ export default defineComponent({
 		watch(()=>homeMainData.userDetailLanguage,(newVal)=>{
 			if(locale.value == newVal || !newVal)return
 			locale.value = newVal
-			let opTypeList = openTypeList(t)
-			for (const key in opTypeList) {
-				const element = opTypeList[key];
-				homeMainData.openTypeList[key].label = element.label
+			let navList = navTypeList(t)
+			for (const key in navList) {
+				const element = navList[key];
+				homeMainData.navTypeList[key].label = element.label
 				if(element.list?.length > 0){
 					element.list.forEach((item,index)=>{
-						homeMainData.openTypeList[key].list[index].label = item.label
+						homeMainData.navTypeList[key].list[index].label = item.label
 					})
 				}
 			}
@@ -372,7 +372,7 @@ export default defineComponent({
 		// watch(()=>locale.value,(newVal,oldVal)=>{
 		// 	if(newVal == oldVal)return
 		// 	console.log(newVal , oldVal)
-		// 	// homeMainData.openTypeList = 
+		// 	// homeMainData.navTypeList = 
 		// })
 
 		const historyData = reactive({
@@ -625,7 +625,7 @@ export default defineComponent({
 				return
 			}
 			homeMainData.historyData.page = 1
-			// homeMainData.openTypeList.history = {
+			// homeMainData.navTypeList.history = {
 			// 	icon:"fi-br-time-past",
 			// 	label:"History",
 			// 	value:"history",
@@ -634,10 +634,10 @@ export default defineComponent({
 			// 	WithinAWeeklist:[],
 			// 	Earlierlist:[],
 			// }
-			homeMainData.openTypeList.history.Todaylist = []
-			homeMainData.openTypeList.history.Yesterdaylist = []
-			homeMainData.openTypeList.history.WithinAWeeklist = []
-			homeMainData.openTypeList.history.Earlierlist = []
+			homeMainData.navTypeList.history.Todaylist = []
+			homeMainData.navTypeList.history.Yesterdaylist = []
+			homeMainData.navTypeList.history.WithinAWeeklist = []
+			homeMainData.navTypeList.history.Earlierlist = []
 			homeMainData.historyData.isShowLoading = false
 			homeMainData.historyData.isNoData = false
 			isFound = 0//表示是否找到当前id的记录，
@@ -675,7 +675,7 @@ export default defineComponent({
 				}else{
 					isFound++
 					historyDateList.forEach((item,dateItemIndex)=>{
-						let length = homeMainData.openTypeList.history[item].length
+						let length = homeMainData.navTypeList.history[item].length
 						if(existToHistoryIndex > length + num){
 							num += length
 						}else{
@@ -712,7 +712,7 @@ export default defineComponent({
 					if (rv.content.length > 0) {
 							rv.content.forEach((item,index)=>{
 								let str = categorizeDate(item.updateTime) + 'list'
-								homeMainData.openTypeList.history[str].push(item)
+								homeMainData.navTypeList.history[str].push(item)
 								if(item.id == (route.query?.id || route.query?.history)){
 									existToHistoryIndex = rv.page * rv.size + index + 1 - rv.size
 								}
@@ -760,10 +760,10 @@ export default defineComponent({
 		}
 		const editName = (item)=>{
 			homeMainData.historyData.selectHistoryId = -1
-			for (const key in homeMainData.openTypeList.history) {
+			for (const key in homeMainData.navTypeList.history) {
 				let list = ['Earlierlist','Todaylist','WithinAWeeklist','Yesterdaylist']
 				if(list.indexOf(key) == -1)continue
-				homeMainData.openTypeList.history[key].forEach((item)=>{
+				homeMainData.navTypeList.history[key].forEach((item)=>{
 					item.editName = false
 				})
 			}

src/views/Login.vue

@@ -40,7 +40,7 @@
           <div class="title">
 			<i class="fi fi-br-angle-left" @click="loginBack"></i>
             <!-- <i class="fi fi-rr-arrow-left" @click="()=>loginType = ''"></i> -->
-            <span>Log on to AiDA</span>
+            <span>Log on to AiDA 3.1</span>
           </div>
 		  <div class="info" v-show="!loginType">Please fill your information below</div>
           <personal ref="personal" v-if="loginType == 'personal'" v-model:isMask="isMask"></personal>
@@ -171,7 +171,6 @@ export default defineComponent({
     }
 	onMounted(()=>{
 		const data = route.query;
-		console.log(data)
 		if (data?.state == "weiXin") {
 			wechatLogin(data);
 		}