fix
This commit is contained in:
@@ -29,9 +29,11 @@
|
||||
|
||||
</div>
|
||||
<div class="my_material_header_right">
|
||||
<div class="content_search_block">
|
||||
<input class="search_input" :placeholder="$t('Material.inputContent1')" v-model="searchPictureName" @keydown.enter="getLibraryList('')">
|
||||
<div class="search_icon_block" @click.stop="getLibraryList('')"><span class="icon iconfont icon-sousuo"></span></div>
|
||||
<div class="content_search_block generalModel_state">
|
||||
<div class="generalModel_state_item">
|
||||
<input class="search_input" :placeholder="$t('Material.inputContent1')" v-model="searchPictureName" @keydown.enter="getLibraryList('')">
|
||||
<div class="gallery_btn" @click.stop="getLibraryList('')"><span class="icon iconfont icon-sousuo"></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -50,7 +52,7 @@
|
||||
<div v-show="!load.isNoData" class="material_content_list_loding">
|
||||
<span class="page_loading" v-show="!isShowLoading" v-observe></span>
|
||||
<span v-show="isShowLoading">
|
||||
<img src="@/assets/images/homePage/loading.gif" alt="">
|
||||
<a-spin size="large" />
|
||||
</span>
|
||||
</div>
|
||||
<!-- <div v-show="total > imgList?.length && total != 0" class="material_content_list_loding" v-observe>
|
||||
@@ -367,8 +369,8 @@ export default defineComponent({
|
||||
//选择所有的图片
|
||||
async getLibraryList(str:any){
|
||||
if(this.load.isShowMark && !this.load.isNoData)return
|
||||
let workspace = JSON.parse(JSON.stringify(this.store.state.Workspace.workspace))
|
||||
if(this.searchPictureName != this.isOldSearchPictureName || this.workspace?.sexEnum?.value != workspace.sexEnum.value){
|
||||
let probjects = JSON.parse(JSON.stringify(this.store.state.Workspace.probjects))
|
||||
if(this.searchPictureName != this.isOldSearchPictureName || this.workspace.sex != probjects.sex){
|
||||
this.imgList = []
|
||||
this.currentPage = 1
|
||||
}else{
|
||||
@@ -380,7 +382,7 @@ export default defineComponent({
|
||||
let data = {
|
||||
level1Type:this.selectCode,
|
||||
level2Type: this.selectCode == 'Moodboard'?'':this.disignType.value,
|
||||
modelSex:workspace?.sexEnum.value,
|
||||
modelSex:probjects?.sex,
|
||||
page: this.currentPage,
|
||||
// page:this.currentPage,
|
||||
pictureName:this.searchPictureName,
|
||||
@@ -427,7 +429,7 @@ export default defineComponent({
|
||||
}else{
|
||||
this.imgList.push(...aa)
|
||||
}
|
||||
this.workspace = workspace
|
||||
this.workspace = probjects
|
||||
// this.imgList = aa
|
||||
this.isShowLoading = false
|
||||
}
|
||||
@@ -486,7 +488,7 @@ export default defineComponent({
|
||||
.select_block{
|
||||
border: calc(0.1rem* 1.2) solid #F1F1F1;
|
||||
margin-right: calc(2.3rem*1.2);
|
||||
height: 4rem;
|
||||
height: auto;
|
||||
.ant-select-selector{
|
||||
height: 90%;
|
||||
}
|
||||
@@ -496,44 +498,13 @@ export default defineComponent({
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
.content_search_block{
|
||||
margin-right: calc(5rem*1.2);
|
||||
display: flex;
|
||||
|
||||
.search_input{
|
||||
width: calc(15rem*1.2);
|
||||
padding-left: calc(1.5rem*1.2);
|
||||
// height: 4rem*1.2);
|
||||
// line-height: 3.8rem*1.2);
|
||||
// background: #FFFFFF;
|
||||
border:calc( 0.1rem*1.2) solid #F1F1F1;
|
||||
// font-size: 1.6rem*1.2);
|
||||
font-size: calc(1.2rem*1.2);
|
||||
font-weight: 400;
|
||||
height: 4rem;
|
||||
|
||||
&::placeholder {
|
||||
color: #C2C2C2;
|
||||
}
|
||||
}
|
||||
|
||||
.search_icon_block{
|
||||
width: calc(5rem*1.2);
|
||||
// height: calc(3rem*1.2);
|
||||
height: 100%;
|
||||
line-height: calc(3rem*1.2);
|
||||
text-align: center;
|
||||
background: #343579;
|
||||
cursor: pointer;
|
||||
|
||||
.icon-sousuo{
|
||||
font-size: calc(2rem*1.2);
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.generalModel_state_item{
|
||||
margin: 0;
|
||||
.gallery_btn{
|
||||
margin-left: 2rem;
|
||||
}
|
||||
}
|
||||
|
||||
.icon_close{
|
||||
color: rgba(174, 178, 183, 1);
|
||||
font-size: calc(2.4rem*1.2);
|
||||
|
||||
Reference in New Issue
Block a user