合并画布,部分样式调整
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
</div>
|
||||
<div class="newObj marginT2" @click="newProject">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 25 24"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12.5 5v14m-7-7h14"></path></svg>
|
||||
<p>New Project</p>
|
||||
<p>{{$t('Header.NewProject')}}</p>
|
||||
</div>
|
||||
<div class="navList marginT2">
|
||||
<div class="tools list" v-for="item in openTypeList" :class="{active:openType == item.value,history:item.value == 'history'}">
|
||||
@@ -33,10 +33,10 @@
|
||||
</div>
|
||||
<div class="detail" v-else-if="item.value == 'history'">
|
||||
<div v-for="historyTypeItem in historyData.updateTimeType" :key="historyTypeItem">
|
||||
<div class="timeType" v-if="historyTypeItem == 'Todaylist' && item.Todaylist.length>0">Today</div>
|
||||
<div class="timeType" v-if="historyTypeItem == 'Yesterdaylist' && item.Yesterdaylist.length>0">Yesterday</div>
|
||||
<div class="timeType" v-if="historyTypeItem == 'WithinAWeeklist' && item.WithinAWeeklist.length>0">Within a week</div>
|
||||
<div class="timeType" v-if="historyTypeItem == 'EarlierTodaylist' && item.EarlierTodaylist.length>0">Earlier</div>
|
||||
<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>
|
||||
<div class="timeType" v-if="historyTypeItem == 'WithinAWeeklist' && item.WithinAWeeklist.length>0">{{$t('Header.WithinAWeek')}}</div>
|
||||
<div class="timeType" v-if="historyTypeItem == 'EarlierTodaylist' && item.EarlierTodaylist.length>0">{{$t('Header.Earlier')}}</div>
|
||||
<div v-for="childItem,index in item[historyTypeItem]" class="detailItem history" @click="setHistory(item,childItem)" :class="{active:openTypeChild == childItem.id}">
|
||||
<div class="text" style="width: 100%;">
|
||||
<span :title="childItem.name" v-show="!childItem.editName">{{ childItem.name }}</span>
|
||||
@@ -50,19 +50,19 @@
|
||||
<div class="operation" v-show="historyData.selectHistoryId == childItem.id">
|
||||
<div class="item" @click.stop="editName(childItem)">
|
||||
<i class="fi fi-rr-edit"></i>
|
||||
<span>Rename</span>
|
||||
<span>{{$t('Header.Rename')}}</span>
|
||||
</div>
|
||||
<div class="item" v-if="childItem.process == 'SINGLE_DESIGN' || childItem.process == 'SERIES_DESIGN'" @click.stop="setting(childItem)">
|
||||
<i class="fi fi-rr-settings-sliders"></i>
|
||||
<span>Setting</span>
|
||||
<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-settings-sliders"></i>
|
||||
<span>Batch Generation</span>
|
||||
<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>Delete</span>
|
||||
<span>{{$t('Header.Delete')}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -82,19 +82,19 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="navListBottom">
|
||||
<div class="tools marginT2 list" :class="{active:$route.name == 'cloud'}" @click="()=>$router.push('/home/cloud')">
|
||||
<div class="tools marginT2 marginB2 list" :class="{active:$route.name == 'cloud'}" @click="()=>$router.push('/home/cloud')">
|
||||
<div class="titleBox" style="margin-bottom: 0;">
|
||||
<div class="left">
|
||||
<i class="fi fi-rr-cloud-upload-alt"></i>
|
||||
<span>Batch Generation</span>
|
||||
<span>{{$t('Header.BatchGeneration')}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tools list language" :class="{active:isLanguage}">
|
||||
<div class="tools list" :class="{active:isLanguage}">
|
||||
<div class="titleBox" @click="()=>isLanguage = !isLanguage">
|
||||
<div class="left">
|
||||
<i class="fi fi-br-globe"></i>
|
||||
<span>Language</span>
|
||||
<span>{{$t('Header.Language')}}</span>
|
||||
</div>
|
||||
<div class="right">
|
||||
<i class="fi fi-br-angle-small-down"></i>
|
||||
@@ -117,7 +117,8 @@
|
||||
{{$t('Header.Credits')}}:
|
||||
<span :title="credits">
|
||||
<div class="credits_item" v-for="item in String(credits)" :style="{'transform': 'translateY('+item*-100+'%)'}">
|
||||
<div v-for="numItem in 10">{{ numItem-1 }}</div>
|
||||
<div v-if="item != '.'" v-for="numItem in 10">{{ numItem-1 }}</div>
|
||||
<div v-else>{{item}}</div>
|
||||
</div>
|
||||
</span>
|
||||
<i @click="getCredits" class="fi fi-br-refresh" :class="[activeCredits?'active':'']"></i>
|
||||
@@ -134,7 +135,7 @@
|
||||
<svg @click="()=>leftShow=!leftShow" class="leftShowOrHide" xmlns="http://www.w3.org/2000/svg" width="2rem" height="2rem" fill="currentColor" viewBox="0 0 24 24" data-v-1c7326d6=""><path fill-rule="evenodd" d="M6 5a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h2V5H6Zm4 0v14h8a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-8ZM3 6a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V6Z" clip-rule="evenodd" data-v-1c7326d6=""></path></svg>
|
||||
<div class="newObj marginT2" @click="newProject">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 25 24"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12.5 5v14m-7-7h14"></path></svg>
|
||||
<p>New Project</p>
|
||||
<p>{{$t('Header.NewProject')}}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="trialApproval">
|
||||
@@ -202,11 +203,11 @@
|
||||
</div>
|
||||
<router-link class="select_item" v-if="userDetail.systemList.indexOf(3) >= 0" :to="`/administrator`">
|
||||
<span class="icon iconfont icon-yonghu"></span>
|
||||
<span class="select_item_des">Administrator</span>
|
||||
<span class="select_item_des">{{$t('Header.Administrator')}}</span>
|
||||
</router-link>
|
||||
<router-link class="select_item" :to="`/Affiliate`" v-if="userDetail.systemList.indexOf(2) >= 0">
|
||||
<span class="icon iconfont icon-yonghu"></span>
|
||||
<span class="select_item_des">Affiliate</span>
|
||||
<span class="select_item_des">{{$t('Header.Affiliate')}}</span>
|
||||
</router-link>
|
||||
<div class="select_item" @click="getTutorial()">
|
||||
<span class="fi fi-rr-book-user"></span>
|
||||
@@ -222,7 +223,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="userSystem" v-if="userDetail.systemList.indexOf(1) == -1">
|
||||
You can use these features only after becoming a regular user~
|
||||
{{$t('Header.pastDue')}}
|
||||
</div>
|
||||
<div class="router" v-else-if="!getLangIsShowMark">
|
||||
<home ref="home" @setNewProject="()=>leftShow=true" @setTask="setTask"></home>
|
||||
@@ -301,7 +302,7 @@ export default defineComponent({
|
||||
projectSetting:null,
|
||||
historyData:{
|
||||
isNoData:false,
|
||||
isShowLoading:false,
|
||||
isShowLoading:true,
|
||||
isNull:false,
|
||||
searchCollectionName:'',
|
||||
historyTextarea:'',
|
||||
@@ -455,9 +456,6 @@ export default defineComponent({
|
||||
}
|
||||
getUnreadCount()
|
||||
nextTick(()=>{
|
||||
homeMainData.historyData.isShowLoading = false
|
||||
homeMainData.historyData.isNoData = false
|
||||
homeMainData.historyData.page = 1
|
||||
setPorfolioDom()
|
||||
})
|
||||
})
|
||||
@@ -476,6 +474,7 @@ export default defineComponent({
|
||||
let setPorfolioDom = ()=>{
|
||||
homeMainData.historyData.isShowLoading = false
|
||||
homeMainData.historyData.isNoData = false
|
||||
homeMainData.historyData.page = 1
|
||||
let imgParent = document.querySelector('.homeMain_max .detail .material_content_list_loding .historyPage_loading')
|
||||
new IntersectionObserver(
|
||||
(entries, observer) => {
|
||||
@@ -979,12 +978,20 @@ export default defineComponent({
|
||||
.marginT2{
|
||||
margin-top: 2rem;
|
||||
}
|
||||
.marginB2{
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.list{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
// padding: 1.2rem;
|
||||
max-height: 5rem;
|
||||
border-radius: 2rem;
|
||||
&.active{
|
||||
> .detailBox{
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
&.history{
|
||||
flex: 1;
|
||||
> .detailBox{
|
||||
@@ -1032,7 +1039,7 @@ export default defineComponent({
|
||||
> .detailBox{
|
||||
overflow: auto;
|
||||
scrollbar-width: none;
|
||||
flex: 1;
|
||||
flex: 0;
|
||||
> .detail{
|
||||
position: relative;
|
||||
height: 100%;
|
||||
@@ -1148,13 +1155,13 @@ export default defineComponent({
|
||||
padding: .8rem;
|
||||
box-shadow: 0 0 3.2rem -.8rem #1a1b1e33;
|
||||
position: absolute;
|
||||
height: min-content;
|
||||
&.active{
|
||||
top: auto;
|
||||
bottom: 3rem;
|
||||
}
|
||||
&.activeLeft{
|
||||
bottom: 0;
|
||||
right: 3rem;
|
||||
}
|
||||
> .item{
|
||||
padding: .8rem;
|
||||
@@ -1423,11 +1430,13 @@ export default defineComponent({
|
||||
height: 6rem;
|
||||
width: 6rem;
|
||||
// margin-left: auto;
|
||||
|
||||
display: flex;
|
||||
position: relative;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
.homeMain_user_icon{
|
||||
height: 6rem;
|
||||
width: 6rem;
|
||||
height: 5rem;
|
||||
width: 5rem;
|
||||
position: relative;
|
||||
// transform-origin: top;
|
||||
overflow: hidden;
|
||||
|
||||
Reference in New Issue
Block a user