From 45159e635bfc3a9bd6f55b880a904c18e51dafaa Mon Sep 17 00:00:00 2001
From: zhangyh <zhangyahui@haier.com>
Date: Wed, 24 Sep 2025 14:28:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A6=E4=BE=A7=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=9C=A8=E8=B7=B3=E8=BD=AC=E5=88=B0design?=
 =?UTF-8?q?=E6=97=B6=E9=9C=80=E8=A6=81=E7=82=B9=E5=87=BB=E4=B8=A4=E6=AC=A1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/HomeMain.vue | 54 +++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index c6402e3e..28fe6c47 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -18,8 +18,15 @@
 					<p>{{$t('Header.NewProject')}}</p>
 				</div>
 				<div class="navList ">
-					<div class="tools list" v-for="item in navTypeList" :class="{active:openType == item.value,history:item.value == 'history','show-history' : showHistory && item.value === 'history','isHistory' : item.value === 'history'}">
-						<div class="titleBox" @click="setOpenType(item.value,item.list)">
+					<div class="tools list" 
+					v-for="item in navTypeList"
+					 :class="{
+							active:openType == item.value,
+							history:item.value == 'history',
+							'show-history' : showHistory && item.value === 'history',
+							'isHistory' : item.value === 'history'
+						}">
+						<div class="titleBox" @click="setOpenType(item)">
 							<div class="left">
 								<i :class="['fi',item.icon]"></i>
 								<span>{{item.label}}</span>
@@ -37,7 +44,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="detail" v-else-if="item.value == 'history'" style="height: auto;">
+							<!-- <div class="detail" v-else-if="item.value == 'history'" style="height: auto;">
 								<div v-for="historyTypeItem in historyData.updateTimeType" :key="historyTypeItem">
 									<div class="timeType" v-if="historyTypeItem == 'Todaylist' && item.Todaylist.length>0">{{$t('Header.Today')}}</div>
 									<div class="timeType" v-if="historyTypeItem == 'Yesterdaylist' && item.Yesterdaylist.length>0">{{$t('Header.Yesterday')}}</div>
@@ -48,8 +55,6 @@
 											<span :title="childItem.name" v-show="!childItem.editName">{{ childItem.name }}</span>
 											<textarea v-model="historyData.historyTextarea" v-show="childItem.editName" @click.stop></textarea>
 										</div>
-										<!-- <div class="type" v-if="childItem.process == 'THREE_D_PLATE_MAKING'">3D Pattern Making</div>
-										<div class="type" v-else>{{ childItem.process.replace(/_/g, ' ').toLowerCase().replace(/\b\w/g, char => char.toUpperCase()) }}</div> -->
 										<div class="type">{{ $t(`Header.${childItem.process}`) }}</div>
 										<div class="time">{{ childItem?.updateTime?.replace('T', ' ') }}</div>
 										<div class="btn">
@@ -64,10 +69,6 @@
 													<i class="fi fi-rr-settings-sliders"></i>
 													<span>{{$t('Header.Setting')}}</span>
 												</div>
-												<!-- <div class="item" v-if="bathGenerationList.indexOf(childItem.process)>-1" @click.stop="bathGeneration(childItem)">
-													<i class="fi fi-rr-cloud-upload-alt"></i>
-													<span>{{$t('Header.BatchGeneration')}}</span>
-												</div> -->
 												<div class="item" @click.stop="deleteItem(childItem)">
 													<i class="icon iconfont icon-shanchu operate_icon"></i>
 													<span>{{$t('Header.Delete')}}</span>
@@ -84,7 +85,7 @@
 									</span>
 								</div>
 								<img v-show="historyData.isNoData && historyData.isNull" src="@/assets/images/homePage/null_img.png">
-							</div>
+							</div> -->
 						</div>
 					</div>
 				</div>
@@ -402,10 +403,12 @@ export default defineComponent({
 							homeMainData.openType = Object.keys(query)[0]
 							homeMainData.openTypeChild = query[Object.keys(query)[0]]
 						}
-						// if((query?.id || query?.history) && !await getIdExistToHistory()){
-						// 	router.push('/home')
-						// 	return
-						// }
+						console.log('homeMainData.openType',homeMainData.openType,'route.path',route.path)
+						if (homeMainData.openType == 'history' && route.path !== '/home/history') { 
+							homeMainData.openType = ''
+							homeMainData.openTypeChild = ''
+						}
+						
 					}else{
 						homeMainData.openType = ''
 						homeMainData.openTypeChild = ''
@@ -432,14 +435,8 @@ export default defineComponent({
 				homeMainData.showHistory = false
 			}
 		},
-		{ immediate: true }
+		{ immediate: true}
 		)
-
-
-
-		// watch(()=>homeMainData.openTypeList,()=>{
-		// 	homeMainData.historyData.page = 1
-		// })
 		
 		let isMurmur = ref()
 		let credits = computed(()=>{
@@ -564,16 +561,13 @@ export default defineComponent({
 			let imgParent = document.querySelector('.homeMain_max .detail .material_content_list_loding .historyPage_loading')
 			if(Observer?.unobserve)Observer.unobserve(imgParent);
 		})
-		const setOpenType = (type, list) => {
-			
-			if(homeMainData.openType == type){
-				homeMainData.openType = ''
-			}else {
-				homeMainData.openType = type
-				if (type === 'history') {
-					router.push('/home/history')
-				}
+		const setOpenType = (item) => {
+			const { value, list } = item
+			if (!list?.length) {
+				router.push(item.router)
+				return
 			}
+			homeMainData.openType = homeMainData.openType === value ? '' : value
 		}
 		let Observer = null
 		let setPorfolioDom = ()=>{