aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/StableVersion' into develop

Browse Source
This commit is contained in:
X1627315083
2024-08-23 10:18:55 +08:00
parent e4b3ebe88b 23fd48b00f
commit eff35d8a79
24 changed files with 760 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/HomeView/HomeView.vue
View File

@@ -77,7 +77,7 @@
</div>
<div class="right_content_body">
<div class="right_content_img_block scroll_style Guide_1_17" v-mousewheel :class="[designCollectionList.length != 0?'active':'',driver__.driver?'showEvents':'']">
<div class="right_content_img_block scroll_style Guide_1_17 active" v-mousewheel :class="[driver__.driver?'showEvents':'']">
<div class="right_content_img_item">
<!-- <draggable
group="people" > -->
@@ -85,7 +85,7 @@
design, index
) in designCollectionList" :key="design?.designItemId">
<div class="content_img_flex"
:class="[driver__.driver?driver__.index == 37?'hideEvents':'':'']"
:class="[(driver__.driver && driver__.index == 32)?'hideEvents':'']"
@click="
designDetail(
design,
@@ -95,8 +95,8 @@
)
">
<img class="content_img" :src="design.designOutfitUrl" />
</div>
<div class="icon iconfont icon-jushoucang icon_like" :class="[driver__.driver?index == 0?driver__.index == 37?'Guide_active showEvents':'hideEvents':'hideEvents':'']" @click.stop="
</div>
<div class="icon iconfont icon-jushoucang icon_like" :class="[driver__.driver?index == 0?driver__.index == 32?'Guide_img showEvents':'':'':'']" @click.stop="
likeDesignCollection(
design,
index
@@ -934,9 +934,9 @@ export default defineComponent({
"deleteLikeDesignCollectionList",
index
);
if (!this.likeDesignCollectionList.length) {
this.store.commit("deleteUserGroupId");
}
// if (!this.likeDesignCollectionList.length) {
// this.store.commit("deleteUserGroupId");
// }
}
this.disLikeLoading = false;
})
@@ -1115,10 +1115,10 @@ export default defineComponent({
document.removeEventListener("click", this.closeShowOperateContent);
},
exportModel(){
let productImg:any = this.$refs.productImg
productImg.productImgMask = true
productImg.init(this.userGroupId)
},
//打开图片详情

16
src/views/HomeView/history.vue
View File

@@ -99,6 +99,7 @@ import { ElCascader } from 'element-plus'
import { useI18n } from 'vue-i18n';
import setLabel from '@/component/LibraryPage/setLabel.vue';
import searchLabel from '@/component/LibraryPage/searchLabel.vue';
import { useStore } from "vuex";
export default defineComponent({
components: {
@@ -110,6 +111,7 @@ export default defineComponent({
searchLabel,
},
setup() {
const store = useStore();
let rangePickerValue:any = ref([])
let renameData:any = ref({}) //修改名字选中的数据
let isShowMark:any = ref(false)
@@ -171,6 +173,7 @@ export default defineComponent({
}
provide('type',type)
return {
store,
rangePickerValue,
columns,
collectionList,
@@ -310,6 +313,19 @@ export default defineComponent({
(rv: any) => {
message.success(this.t('HistoryPage.jsContent1'))
this.collectionList.splice(index,1)
// let userGroupId: any = computed(() => {
// return
// });
if(record.id == this.store.state.HomeStoreModule.userGroupId){
this.store.commit('deleteUserGroupId')
this.store.commit("setLikeDesignCollectionList", []);
this.store.commit("clearAllData");
this.store.commit("clearAllCollection");
this.store.commit("setAllBoardDataChoose",{});
this.store.commit("clearShowSketchboard",{});
}
console.log(this.store.state.HomeStoreModule.userGroupId,record);
}
);
}