fix
This commit is contained in:
@@ -274,20 +274,9 @@ export default defineComponent({
|
||||
endDate:endDate,
|
||||
intersection:this.intersection,
|
||||
}
|
||||
// console.log(this.value.labelValue);
|
||||
|
||||
// let data = {
|
||||
// classificationIdList:labelArr,
|
||||
// level1Type:this.selectCode,
|
||||
// level2Type:'',
|
||||
// page:1,
|
||||
// modelSex:'',
|
||||
// pictureName:this.searchCollectionName,
|
||||
// size:this.pageSize,
|
||||
// intersection:this.intersection,
|
||||
// }
|
||||
Https.axiosPost( Https.httpUrls.queryUserGroup, data).then(
|
||||
// Https.axiosPost( Https.httpUrls.queryLibraryPage, data).then(
|
||||
Https.axiosPost( Https.httpUrls.historyProject, data).then(
|
||||
// Https.axiosPost( Https.httpUrls.queryUserGroup, data).then(
|
||||
(rv: any) => {
|
||||
if(this.currentPage > 1 && rv.content.length == 0){
|
||||
this.currentPage = 1
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
<i :class="[menu.icon]"></i>
|
||||
<div>{{menu.title}}</div>
|
||||
</div>
|
||||
<!-- <div v-show="menu.children.length" :class="['icon','iconfont', 'icon-xiala', menu.showChildren?'icon_rotate':'']"></div> -->
|
||||
</div>
|
||||
<div v-show="menu.showChildren && menu.children.length">
|
||||
<div :class="['menu_item','child_menu_item', selectCode==child.code ? 'select_menu_item' :'']" v-for="child in menu.children" :key="child.title" @click="selectMenuItem(child,index)">
|
||||
@@ -25,10 +24,11 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="library_body_right">
|
||||
<div class="library_right_header">
|
||||
<div class="library_right_header" v-show="selectCode != 'MyBrand'">
|
||||
<div class="library_header_left">
|
||||
<div class="header_operate_item pointer" :class="{operate_select:uploadGenerate == 'Upload'}" @click="uploadGenerateOpen('Upload')">
|
||||
<div>{{ $t('LibraryPage.Organize') }}</div>
|
||||
@@ -36,7 +36,7 @@
|
||||
<div v-show="selectCode != 'Models' && selectCode != 'DesignElements'" class='header_operate_item pointer' :class="{operate_select:uploadGenerate == 'Generate'}" @click="uploadGenerateOpen('Generate')">{{ $t('LibraryPage.Generate') }}</div>
|
||||
</div>
|
||||
|
||||
<div class="librart_headr_right ">
|
||||
<div class="librart_headr_right " v-show="selectCode != 'MyBrand'">
|
||||
<div class="generalModel_state " v-show="selectCode == 'Sketchboard' || selectCode == 'Models'|| selectCode == 'DesignElements'|| selectCode == 'Printboard'" >
|
||||
<div class="generalModel_state_item smail" v-if="selectCode != 'DesignElements' && selectCode != 'Printboard'">
|
||||
<a-select
|
||||
@@ -114,8 +114,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="libray_right_content">
|
||||
<div class="right_content_body" v-show="uploadGenerate =='Upload'">
|
||||
<div class="libray_right_content" :class="{'myBrand':selectCode == 'MyBrand'}">
|
||||
<div class="right_content_body" v-show="uploadGenerate =='Upload' && selectCode != 'MyBrand'">
|
||||
<div class="content_body_header" v-show="selectCode == 'DesignElements'">
|
||||
<div style="font-size:1.5rem;">{{ $t('LibraryPage.generated') }}</div>
|
||||
</div>
|
||||
@@ -212,16 +212,12 @@
|
||||
</div>
|
||||
<div class="content_img_name">{{img.name}}</div>
|
||||
</div>
|
||||
|
||||
<div class="no_data_block" v-show="!imgList.length && !isShowMark">
|
||||
<img src="@/assets/images/homePage/null_img.png">
|
||||
</div>
|
||||
<!-- 蒙层 start-->
|
||||
<div class="mark_loading" v-show="isShowMark || getLangIsShowMark">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
<!-- 蒙层 end-->
|
||||
|
||||
</div>
|
||||
|
||||
<div class="table_pagination" v-show="imgList.length">
|
||||
<a-pagination
|
||||
|
||||
@@ -234,6 +230,37 @@
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 蒙层 start-->
|
||||
<div class="mark_loading" v-show="isShowMark || getLangIsShowMark">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
<!-- 蒙层 end-->
|
||||
<div v-show="selectCode == 'MyBrand'" class="right_content_body">
|
||||
<div v-show="!isBrandDetail" class="list">
|
||||
<div class="addBrand gallery_btn" @click="addBrand">Add brand</div>
|
||||
<div class="content_body_table scroll_style">
|
||||
<div class="myBrandItem content_img_item" v-for="item in brandDNAList" :key="item.id" @click="openBrandDetail(item)">
|
||||
<img :src="item.minioUrl" alt="">
|
||||
<div class="bg"></div>
|
||||
</div>
|
||||
<div class="no_data_block" v-show="!brandDNAList.length && !isShowMark">
|
||||
<img src="@/assets/images/homePage/null_img.png">
|
||||
</div>
|
||||
</div>
|
||||
<div class="table_pagination" v-show="brandDNAList.length">
|
||||
<a-pagination
|
||||
v-model:current="currentPage"
|
||||
v-model:pageSize="pageSize"
|
||||
:total="total"
|
||||
:showQuickJumper="true"
|
||||
:showSizeChanger="false"
|
||||
@change="changePage"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<brandDetail v-show="isBrandDetail" v-model:isShowMark="isShowMark" ref="brandDetail" @handleBack="()=>isBrandDetail = false"></brandDetail>
|
||||
|
||||
</div>
|
||||
<div class="right_content_body" v-show="uploadGenerate !='Upload'">
|
||||
<div class="content_body_header content_body_header_generate">
|
||||
<!-- <div v-show="selectCode == 'Printboard' && scene?.value == 'Pattern'" class="printModel">
|
||||
@@ -430,7 +457,7 @@
|
||||
</div>
|
||||
<div class="content_img_name"></div>
|
||||
</div>
|
||||
<div class="no_data_block" v-show="!generateList[selectCode].length && !isShowMark">
|
||||
<div class="no_data_block" v-show="!generateList[selectCode]?.length && !isShowMark">
|
||||
<img src="@/assets/images/homePage/null_img.png">
|
||||
</div>
|
||||
</div>
|
||||
@@ -442,14 +469,14 @@
|
||||
</div>
|
||||
</div>
|
||||
<searchLabel ref="searchLabel"></searchLabel>
|
||||
<scaleImage ref="scaleImage" :isCanvas="selectCode == 'Sketchboard'" :workspace="{sexEnum:{value:sex}}"></scaleImage>
|
||||
<scaleImage ref="scaleImage" :isCanvas="selectCode == 'Sketchboard'" :sex="workspace.sex"></scaleImage>
|
||||
<ModelPlacement ref="ModelPlacement" @submitModelPlacement="getLibraryList"></ModelPlacement>
|
||||
<ModelPlacementMobile ref="ModelPlacementMobile" @submitModelPlacement="getLibraryList"></ModelPlacementMobile>
|
||||
<setLabel ref="setLabel"></setLabel>
|
||||
<createSlogan ref="createSlogan" @setSloganData="setSloganData"></createSlogan>
|
||||
<UpgradePlan ref="UpgradePlan"></UpgradePlan>
|
||||
|
||||
|
||||
<createBrand ref="createBrand" @submitBrandAdd="getBrandDNAList"></createBrand>
|
||||
<!-- <RobotAssist></RobotAssist> -->
|
||||
|
||||
</div>
|
||||
@@ -462,6 +489,8 @@ import ModelPlacement from '@/component/LibraryPage/ModelPlacement.vue';
|
||||
// import ModelPlacement from '@/component/LibraryPage/ModelPlacementUpdata.vue';
|
||||
import setLabel from '@/component/LibraryPage/setLabel.vue';
|
||||
import ModelPlacementMobile from '@/component/LibraryPage/ModelPlacementMobile.vue';
|
||||
import brandDetail from '@/component/LibraryPage/brandDetail.vue';
|
||||
import createBrand from '@/component/LibraryPage/createBrand.vue';
|
||||
import searchLabel from '@/component/LibraryPage/searchLabel.vue';
|
||||
|
||||
// import RobotAssist from "@/component/HomePage/RobotAssist.vue";
|
||||
@@ -478,7 +507,6 @@ import { ElCascader } from 'element-plus'
|
||||
import { remove } from "jszip";
|
||||
import createSlogan from "@/component/HomePage/createSlogan.vue";
|
||||
import generalMenu from "@/component/HomePage/generalMenu.vue";
|
||||
import { id } from "element-plus/es/locale";
|
||||
import UpgradePlan from "@/component/HomePage/UpgradePlan.vue";
|
||||
export default defineComponent({
|
||||
components: {
|
||||
@@ -486,6 +514,8 @@ export default defineComponent({
|
||||
ModelPlacement,
|
||||
setLabel,
|
||||
ModelPlacementMobile,
|
||||
brandDetail,
|
||||
createBrand,
|
||||
searchLabel,
|
||||
// RobotAssist,
|
||||
ElCascader,
|
||||
@@ -513,6 +543,8 @@ export default defineComponent({
|
||||
// {title:'Market Sketch',code:'Elements',icon:'icon-fuwushichang',showChildren:false,children:[]},
|
||||
{title:useI18n().t('LibraryPage.DesignElements'),code:'DesignElements',icon:'fi fi-ss-puzzle-piece',showChildren:false,children:[]},
|
||||
{title:useI18n().t('LibraryPage.Mannequins'),code:'Models',icon:'fi fi-rs-people',showChildren:false,children:[]},
|
||||
{title:useI18n().t('LibraryPage.brandDNA'),code:'MyBrand',icon:'fi fi-ss-gem',showChildren:false,children:[]},
|
||||
// {title:useI18n().t('LibraryPage.MyBrand'),code:'MyBrand',icon:'fi fi-rs-people',showChildren:false,children:[]},
|
||||
|
||||
]
|
||||
})
|
||||
@@ -536,7 +568,14 @@ export default defineComponent({
|
||||
const positionType = computed(() => {
|
||||
return store.state.UserHabit.Position;
|
||||
});
|
||||
|
||||
const dataDom = reactive({
|
||||
createBrand:null as any,
|
||||
brandDetail:null as any,
|
||||
})
|
||||
const pageData = reactive({
|
||||
isBrandDetail:false,
|
||||
brandDNAList:[] as any,
|
||||
})
|
||||
let designTypeList:any = ref({
|
||||
Sketchboard:positionType,
|
||||
Moodboard:[],
|
||||
@@ -637,7 +676,7 @@ export default defineComponent({
|
||||
}
|
||||
let isTextarea = ref(false)
|
||||
let workspace:any = computed(()=>{
|
||||
return store?.state?.Workspace?.workspace
|
||||
return store?.state?.Workspace?.probjects
|
||||
})
|
||||
let generateLevel2:any = {}
|
||||
let isSloganHint:any = ref('')
|
||||
@@ -749,6 +788,13 @@ export default defineComponent({
|
||||
).catch((res)=>{
|
||||
});
|
||||
}
|
||||
const openBrandDetail = (item:any)=>{
|
||||
pageData.isBrandDetail = true
|
||||
dataDom.brandDetail.getBranDetailData(item)
|
||||
}
|
||||
const addBrand = ()=>{
|
||||
dataDom.createBrand.openAddBrand()
|
||||
}
|
||||
watch(
|
||||
() => props.getLangIsShowMark, // 这里使用了一个 getter 函数
|
||||
(newValue, oldValue) => {
|
||||
@@ -761,6 +807,8 @@ export default defineComponent({
|
||||
{immediate: true,}
|
||||
)
|
||||
return {
|
||||
...toRefs(dataDom),
|
||||
...toRefs(pageData),
|
||||
menuList,
|
||||
selectImgList,
|
||||
selectCode,
|
||||
@@ -817,6 +865,8 @@ export default defineComponent({
|
||||
...toRefs(speed),
|
||||
openSpeed,
|
||||
setSpeed,
|
||||
openBrandDetail,
|
||||
addBrand,
|
||||
}
|
||||
},
|
||||
data(this_) {
|
||||
@@ -908,10 +958,15 @@ export default defineComponent({
|
||||
if(menu.children?.length){ //证明是有子菜单
|
||||
menu.showChildren = !menu.showChildren
|
||||
}else{
|
||||
|
||||
if(menu.code != this.upload.level1Type){
|
||||
this.selectCode = menu.code
|
||||
this.currentPage = 1,
|
||||
this.total = 0,
|
||||
this.currentPage = 1
|
||||
this.total = 0
|
||||
if(menu.code == 'MyBrand'){
|
||||
this.getBrandDNAList()
|
||||
return
|
||||
}
|
||||
this.searchPictureName = ''
|
||||
this.imgList = [],
|
||||
this.selectImgList = []
|
||||
@@ -1028,9 +1083,30 @@ export default defineComponent({
|
||||
changePage(current: number, pageSize: number){
|
||||
this.currentPage = current
|
||||
this.pageSize = pageSize
|
||||
this.getLibraryList('page')
|
||||
if(this.selectCode == 'MyBrand'){
|
||||
this.currentPage = 1
|
||||
this.getBrandDNAList()
|
||||
}else{
|
||||
this.getLibraryList('page')
|
||||
}
|
||||
},
|
||||
|
||||
getBrandDNAList(){
|
||||
let data = {
|
||||
page:this.currentPage,
|
||||
size:this.pageSize,
|
||||
}
|
||||
this.isShowMark = true
|
||||
Https.axiosPost(Https.httpUrls.brandDNAPage,data).then(
|
||||
(rv: any) => {
|
||||
console.log(rv);
|
||||
this.brandDNAList = rv.content
|
||||
this.total = rv.total
|
||||
this.isShowMark = false
|
||||
}
|
||||
).catch((res)=>{
|
||||
this.isShowMark = false
|
||||
});
|
||||
},
|
||||
//选择图片
|
||||
selectImgItem(imgData:any){
|
||||
if(imgData.level2Type == "DesignElements")return
|
||||
@@ -1594,7 +1670,6 @@ export default defineComponent({
|
||||
let state = true
|
||||
this.generateTime[str] = setInterval(()=>{
|
||||
// let data = this.generateList[str].filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId);
|
||||
if(!this.isGenerate[this.selectCode] || !this.remGenerate[this.selectCode])return
|
||||
if(!state)return
|
||||
state = false
|
||||
Https.axiosPost(Https.httpUrls.generateResult, data).then(
|
||||
@@ -1940,9 +2015,13 @@ export default defineComponent({
|
||||
|
||||
.libray_right_content{
|
||||
width:100%;
|
||||
height:calc(100% - 8rem);
|
||||
height:calc(100% - 12rem);
|
||||
padding: 0.1rem 0 0 0.3rem;
|
||||
box-sizing: border-box;
|
||||
&.myBrand{
|
||||
height:calc(100% - 4rem);
|
||||
margin: 2rem 0;
|
||||
}
|
||||
.right_content_body{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
@@ -1952,6 +2031,17 @@ export default defineComponent({
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: relative;
|
||||
> .list{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
> .addBrand{
|
||||
display: inline-block;
|
||||
margin-left: auto;
|
||||
}
|
||||
}
|
||||
.content_body_header{
|
||||
// height: 10rem;
|
||||
margin-bottom: 1rem;
|
||||
@@ -1968,9 +2058,7 @@ export default defineComponent({
|
||||
}
|
||||
.content_body_header_right{
|
||||
display: flex;
|
||||
// width: 43rem;
|
||||
width: auto;
|
||||
margin-right: 2rem;
|
||||
width: 43rem;
|
||||
}
|
||||
.check_all_block{
|
||||
display: flex;
|
||||
@@ -2034,7 +2122,7 @@ export default defineComponent({
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
.content_body_table{
|
||||
width: 100%;
|
||||
height: calc(100% - 12rem);
|
||||
@@ -2057,6 +2145,34 @@ export default defineComponent({
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
&.myBrandItem{
|
||||
width: calc(100% / 5 - 1rem);
|
||||
margin: 1rem;
|
||||
border-radius: 2rem;
|
||||
border: 2px solid #000;
|
||||
position: relative;
|
||||
aspect-ratio: 1 / .566;
|
||||
cursor: pointer;
|
||||
background: #fff;
|
||||
> img{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: contain;
|
||||
}
|
||||
> .bg{
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(0,0,0,0);
|
||||
transition: all .3s;
|
||||
}
|
||||
&:hover{
|
||||
> .bg{
|
||||
background: rgba(0,0,0,0.2);
|
||||
}
|
||||
}
|
||||
}
|
||||
.content_img_item_block{
|
||||
border: 0.1rem solid transparent;
|
||||
// width: 16.5rem;
|
||||
|
||||
Reference in New Issue
Block a user