页面调整
This commit is contained in:
@@ -31,18 +31,19 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="detail" v-else-if="item.value == 'history'">
|
||||
<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>
|
||||
<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 class="timeType" v-if="historyTypeItem == 'Earlierlist' && item.Earlierlist.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>
|
||||
<textarea v-model="historyData.historyTextarea" v-show="childItem.editName" @click.stop></textarea>
|
||||
</div>
|
||||
<div class="type">{{ childItem.process.replace(/_/g, ' ').toLowerCase().replace(/\b\w/g, char => char.toUpperCase()) }}</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="time">{{ childItem.updateTime.replace('T', ' ') }}</div>
|
||||
<div class="btn">
|
||||
<i class="fi fi-br-menu-dots-vertical" v-show="!childItem.editName" @click.stop="editHistory(childItem,index,$event,item[historyTypeItem])"></i>
|
||||
@@ -69,7 +70,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div v-show="!historyData.isNoData" class="material_content_list_loding">
|
||||
<span class="historyPage_loading" v-show="!historyData.isShowLoading"></span>
|
||||
<span v-show="historyData.isShowLoading">
|
||||
@@ -125,7 +125,7 @@
|
||||
<i @click="UpgradePlan" title="Purchase" class="fi fi-rr-shop"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="userDetail.systemUser != 0 || userDetail.systemUser == 3" @click="openUpgradeToPro" class="gallery_btn gallery_btn_radius" style="width: 100%;">Upgrade to Pro</div>
|
||||
<div v-if="userDetail.systemUser != 0 || userDetail.systemUser == 3" @click="openUpgradeToPro" class="gallery_btn gallery_btn_radius" style="width: 100%;">{{$t('Header.openUpgrade')}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rightBox">
|
||||
@@ -139,15 +139,15 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="trialApproval">
|
||||
<div class="message_iconItem">
|
||||
<div class="message_iconItem" style="display: flex;margin-left: .5rem">
|
||||
<a-badge :count="messageNum">
|
||||
<i class="fi fi-rr-envelope" @click="openMessage"></i>
|
||||
<i class="fi fi-rr-envelope" style="font-size: 2rem" @click="openMessage"></i>
|
||||
</a-badge>
|
||||
</div>
|
||||
<div class="message_iconItem">
|
||||
<div class="message_iconItem" style="display: flex;margin-left: .5rem">
|
||||
<a-badge :count="messageType?.newPosted">
|
||||
<!-- <i class="fi fi-rr-envelope" @click="openMessage"></i> -->
|
||||
<i class="fi fi-rr-bell" @click.stop="openNewPosted"></i>
|
||||
<i class="fi fi-rr-bell" style="font-size: 2rem" @click.stop="openNewPosted"></i>
|
||||
</a-badge>
|
||||
<div class="message_iconItem_value select_block" v-show="isNewPosted" style="width: 40rem">
|
||||
<newPosted ref="newPosted"></newPosted>
|
||||
@@ -302,11 +302,11 @@ export default defineComponent({
|
||||
projectSetting:null,
|
||||
historyData:{
|
||||
isNoData:false,
|
||||
isShowLoading:true,
|
||||
isShowLoading:false,
|
||||
isNull:false,
|
||||
searchCollectionName:'',
|
||||
historyTextarea:'',
|
||||
updateTimeType:['Todaylist','Yesterdaylist','WithinAWeeklist','EarlierTodaylist'],
|
||||
updateTimeType:['Todaylist','Yesterdaylist','WithinAWeeklist','Earlierlist'],
|
||||
selectHistoryId:-1,
|
||||
page:1,
|
||||
size:10,
|
||||
@@ -320,6 +320,18 @@ export default defineComponent({
|
||||
const historyData = reactive({
|
||||
|
||||
})
|
||||
const getIdExistToHistory = async ()=>{
|
||||
return await new Promise((resolve, reject) => {
|
||||
let value = {
|
||||
id:Number(route.query?.id || route.query?.history),
|
||||
}
|
||||
Https.axiosPost( Https.httpUrls.historyProject, value)
|
||||
.then((rv)=>{
|
||||
resolve(rv.content.length > 0)
|
||||
}).catch(()=>{resolve(false)})
|
||||
})
|
||||
|
||||
}
|
||||
watch(() => route.query,
|
||||
(query, oldQuery) => {
|
||||
nextTick(()=>{
|
||||
@@ -331,16 +343,20 @@ export default defineComponent({
|
||||
}else{
|
||||
homeMainData.openType = Object.keys(query)[0]
|
||||
homeMainData.openTypeChild = query[Object.keys(query)[0]]
|
||||
|
||||
}
|
||||
}else{
|
||||
homeMainData.openType = ''
|
||||
homeMainData.openTypeChild = ''
|
||||
}
|
||||
if(query.create == 'true')settingGetHistory()
|
||||
if(query.create == 'true' || query?.source == 'batch')settingGetHistory()
|
||||
})
|
||||
},
|
||||
{ immediate: true } // 立即触发一次以处理初始参数
|
||||
);
|
||||
watch(()=>homeMainData.openTypeList,()=>{
|
||||
homeMainData.historyData.page = 1
|
||||
})
|
||||
let userDetail= computed(()=>{
|
||||
return store.state.UserHabit.userDetail
|
||||
})
|
||||
@@ -419,6 +435,9 @@ export default defineComponent({
|
||||
renew.value.init()
|
||||
}
|
||||
onMounted(async ()=>{
|
||||
if((route.query?.id || route.query?.history) && !await getIdExistToHistory()){
|
||||
router.push('/home')
|
||||
}
|
||||
let test = getCookie('isTest')
|
||||
let isTest =JSON.parse(test)
|
||||
//判断账号剩余时间是否太短
|
||||
@@ -519,9 +538,11 @@ export default defineComponent({
|
||||
homeMainData.openTypeList.history.Todaylist = []
|
||||
homeMainData.openTypeList.history.Yesterdaylist = []
|
||||
homeMainData.openTypeList.history.WithinAWeeklist = []
|
||||
homeMainData.openTypeList.history.EarlierTodaylist = []
|
||||
homeMainData.openTypeList.history.Earlierlist = []
|
||||
homeMainData.historyData.isShowLoading = false
|
||||
homeMainData.historyData.isNoData = false
|
||||
isFound = 0//表示是否找到当前id的记录,
|
||||
existToHistoryIndex = -1
|
||||
}
|
||||
provide('settingGetHistory',settingGetHistory)
|
||||
const categorizeDate = (inputDate) => {
|
||||
@@ -541,8 +562,34 @@ export default defineComponent({
|
||||
return "Earlier";
|
||||
}
|
||||
}
|
||||
let isFound = 0
|
||||
let existToHistoryIndex = -1
|
||||
const setScrollTop = ()=>{
|
||||
setTimeout(()=>{
|
||||
let historyDateList = ['Todaylist','Yesterdaylist','WithinAWeeklist','Earlierlist']
|
||||
let num = 0
|
||||
let dateIndex = -1 //表示某个时间段
|
||||
let parent = document.querySelectorAll('.homeMain_max .navList .history .detail')
|
||||
let imgParent = document.querySelectorAll('.homeMain_max .navList .history .detail>div')
|
||||
if(existToHistoryIndex == -1){
|
||||
parent[0].parentNode.scrollTop = parent[0].offsetHeight
|
||||
}else{
|
||||
isFound++
|
||||
historyDateList.forEach((item,dateItemIndex)=>{
|
||||
let length = homeMainData.openTypeList.history[item].length
|
||||
if(existToHistoryIndex > length + num){
|
||||
num += length
|
||||
}else{
|
||||
if(dateIndex == -1)dateIndex = dateItemIndex
|
||||
}
|
||||
})
|
||||
let dateEl = imgParent[dateIndex].querySelectorAll('.history')
|
||||
parent[0].parentNode.scrollTop = dateEl[existToHistoryIndex - num-1].offsetTop
|
||||
}
|
||||
},0)
|
||||
|
||||
}
|
||||
const getHistory = ()=>{
|
||||
console.log(123)
|
||||
if(homeMainData.historyData.isShowLoading && !homeMainData.historyData.isNoData)return
|
||||
homeMainData.historyData.isShowLoading = true
|
||||
let data = {
|
||||
@@ -557,19 +604,22 @@ export default defineComponent({
|
||||
}
|
||||
Https.axiosPost( Https.httpUrls.historyProject, data).then(
|
||||
// Https.axiosPost( Https.httpUrls.queryUserGroup, data).then(
|
||||
(rv) => {
|
||||
(rv) => {
|
||||
if(data.page == 1 && rv.content.length == 0){
|
||||
homeMainData.historyData.isNull = true
|
||||
}else{
|
||||
homeMainData.historyData.isNull = false
|
||||
}
|
||||
if (rv.content.length > 0) {
|
||||
rv.content.forEach((item)=>{
|
||||
rv.content.forEach((item,index)=>{
|
||||
let str = categorizeDate(item.updateTime) + 'list'
|
||||
homeMainData.openTypeList.history[str].push(item)
|
||||
if(item.id == (route.query?.id || route.query?.history)){
|
||||
existToHistoryIndex = rv.page * rv.size + index + 1 - rv.size
|
||||
}
|
||||
})
|
||||
homeMainData.historyData.isNull = false
|
||||
// homeMainData.openTypeList.history.list.push(...rv.content)
|
||||
if((route.query?.id || route.query?.history) && isFound < 1)setScrollTop()
|
||||
} else {
|
||||
homeMainData.historyData.isNoData = true
|
||||
}
|
||||
@@ -612,7 +662,7 @@ export default defineComponent({
|
||||
const editName = (item)=>{
|
||||
homeMainData.historyData.selectHistoryId = -1
|
||||
for (const key in homeMainData.openTypeList.history) {
|
||||
let list = ['EarlierTodaylist','Todaylist','WithinAWeeklist','Yesterdaylist']
|
||||
let list = ['Earlierlist','Todaylist','WithinAWeeklist','Yesterdaylist']
|
||||
if(list.indexOf(key) == -1)continue
|
||||
homeMainData.openTypeList.history[key].forEach((item)=>{
|
||||
item.editName = false
|
||||
@@ -657,7 +707,7 @@ export default defineComponent({
|
||||
const bathGeneration = (item)=>{
|
||||
homeMainData.openType = ''
|
||||
homeMainData.historyData.selectHistoryId = -1
|
||||
router.push(`/home/cloud?type=creation&id=${item.id}&name=${item.name}`)
|
||||
router.push(`/home/cloud?type=creation&id=${item.id}&name=${item.name}&process=${item.process}`)
|
||||
}
|
||||
return {
|
||||
store,
|
||||
@@ -979,7 +1029,10 @@ export default defineComponent({
|
||||
margin-top: 2rem;
|
||||
}
|
||||
.marginB2{
|
||||
margin-bottom: 1rem;
|
||||
// margin-bottom: 1rem;
|
||||
&.active{
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
}
|
||||
.list{
|
||||
display: flex;
|
||||
@@ -1062,7 +1115,10 @@ export default defineComponent({
|
||||
border-radius: .8rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
// flex-wrap: wrap;
|
||||
flex-wrap: nowrap;
|
||||
|
||||
|
||||
> .time{
|
||||
font-size: 1.2rem;
|
||||
opacity: .5;
|
||||
@@ -1072,9 +1128,12 @@ export default defineComponent({
|
||||
display: flex;
|
||||
}
|
||||
> .text{
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
> span{
|
||||
//只在一行显示
|
||||
|
||||
width: 100%;
|
||||
display: block;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
@@ -1522,7 +1581,9 @@ export default defineComponent({
|
||||
&:hover {
|
||||
background: #f3f3f6;
|
||||
}
|
||||
|
||||
.fi{
|
||||
font-size: 1.8rem;
|
||||
}
|
||||
.iconfont ,.fi-rr-book-user {
|
||||
// font-size: 1.4rem;
|
||||
}
|
||||
@@ -1572,9 +1633,9 @@ export default defineComponent({
|
||||
cursor: pointer;
|
||||
}
|
||||
.attention_item_active:hover{
|
||||
color: #39215b;
|
||||
color: #000;
|
||||
span{
|
||||
color: #39215b;
|
||||
color: #000;
|
||||
}
|
||||
}
|
||||
div{
|
||||
|
||||
Reference in New Issue
Block a user