Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite
This commit is contained in:
@@ -18,17 +18,17 @@
|
||||
<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'}">
|
||||
<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>
|
||||
<span>{{item.label}}</span>
|
||||
</div>
|
||||
<div class="right">
|
||||
<div class="right" v-if="item.value !== 'history111' ">
|
||||
<i class="fi fi-br-angle-small-down"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="detailBox" v-show="openType">
|
||||
<div class="detailBox" v-if="item.value != 'history111'" v-show="openType">
|
||||
<div class="detail" v-if="item.value != 'history' && item.value != 'cloud'" v-show="openType == item.value">
|
||||
<div class="detailItem" v-for="childItem in item.list" @click="setRouter(item,childItem)" :class="{active:openTypeChild == childItem.value}">
|
||||
<i v-show="childItem.icon" :class="['fi',childItem.icon]"></i>
|
||||
@@ -342,7 +342,8 @@ export default defineComponent({
|
||||
isWithinAWeek:false,
|
||||
isEarlier:false,
|
||||
},
|
||||
bathGenerationList:["poseTransfer","SERIES_DESIGN","toProduct","relight"]
|
||||
bathGenerationList: ["poseTransfer", "SERIES_DESIGN", "toProduct", "relight"],
|
||||
showHistory:false
|
||||
})
|
||||
let userDetail= computed(()=>{
|
||||
return store.state.UserHabit.userDetail
|
||||
@@ -366,6 +367,8 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
// watch(()=>locale.value,(newVal,oldVal)=>{
|
||||
// if(newVal == oldVal)return
|
||||
// console.log(newVal , oldVal)
|
||||
@@ -420,7 +423,21 @@ export default defineComponent({
|
||||
},
|
||||
{ immediate: true } // 立即触发一次以处理初始参数
|
||||
);
|
||||
// watch(()=>homeMainData.navTypeList,()=>{
|
||||
|
||||
// 监听路由,当路由地址为/home/history111时homeMainData.showHistory为true,改变左侧菜单颜色
|
||||
watch(() => route.path, () => {
|
||||
if(route.path == '/home/history111'){
|
||||
homeMainData.showHistory = true
|
||||
}else{
|
||||
homeMainData.showHistory = false
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
|
||||
|
||||
// watch(()=>homeMainData.openTypeList,()=>{
|
||||
// homeMainData.historyData.page = 1
|
||||
// })
|
||||
|
||||
@@ -547,16 +564,15 @@ 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)=>{
|
||||
const setOpenType = (type, list) => {
|
||||
|
||||
if(homeMainData.openType == type){
|
||||
homeMainData.openType = ''
|
||||
}else {
|
||||
homeMainData.openType = type
|
||||
// if(type == 'history'){
|
||||
// if(list.length == 0){
|
||||
|
||||
// }
|
||||
// }
|
||||
if (type === 'history111') {
|
||||
router.push('/home/history111')
|
||||
}
|
||||
}
|
||||
}
|
||||
let Observer = null
|
||||
@@ -1129,6 +1145,10 @@ export default defineComponent({
|
||||
// padding: 1.2rem;
|
||||
max-height: 5rem;
|
||||
border-radius: 2rem;
|
||||
&.show-history{
|
||||
background: #fff;
|
||||
border-radius: 0.8rem;
|
||||
}
|
||||
&.active{
|
||||
> .detailBox{
|
||||
flex: 1;
|
||||
@@ -1377,6 +1397,11 @@ export default defineComponent({
|
||||
overflow: hidden;
|
||||
max-height: 100%;
|
||||
background: #00000008;
|
||||
&.isHistory{
|
||||
background: #fff;
|
||||
border-radius: 0.8rem;
|
||||
max-height: 5rem;
|
||||
}
|
||||
> .titleBox{
|
||||
padding: 0;
|
||||
margin-bottom: 1.6rem;
|
||||
@@ -1388,6 +1413,7 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.language{
|
||||
> .titleBox{
|
||||
padding: .8rem;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user