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

src/views/HomeView/Works.vue

@@ -7,8 +7,8 @@
 			<div v-show="isScroll" v-for="item in worksType" :key="item" class="modal_title_text_assistant" @click="setWorksSelect(item)" :class="{active:item.value == worksSelect}">
 				{{ item.name }}
 			</div>
-			<!-- <div v-show="!isScroll" class="modal_title_text_assistant active">All</div> -->
-			 
+			<div v-show="!isScroll" class="modal_title_text_assistant" :class="{active:'all' == worksSelect}" @click="setWorksSelect({value:'all'})">All</div>
+			<div v-show="!isScroll" class="modal_title_text_assistant" :class="{active:'RCAworkshop_2024' == worksSelect}" @click="setWorksSelect({value:'RCAworkshop_2024'})">AiDA Workshop 2024</div>
 			<!-- <div class="modal_search_menu">
 				<generalMenu :dataList="menuList" @setprintModel="setprintModel" :item="selectMenu"></generalMenu>
 			</div> -->
@@ -90,8 +90,8 @@ export default defineComponent({
 					value: 'myWorks'
 				},
 				{
-					name: 'RCA Workshop',
-					value: 'myWorks'
+					name: useI18n().t('works.RCAworkshop_2024'),
+					value: 'RCAworkshop_2024'
 				},
 			],
 			worksList: [
@@ -101,6 +101,7 @@ export default defineComponent({
 				"getMyPortfolio": 0,
 				page:1,
 				size:10,
+				tagId:'',
 			},
 			isShowMark:false,
 			isNoData:false,//如果数据为空就不加载
@@ -137,12 +138,16 @@ export default defineComponent({
 			filter.worksSelect = val.value
 			filter.getListDate.getLikePortfolio = 0
 			filter.getListDate.getMyPortfolio = 0
+			filter.getListDate.tagId = ''
 			if(val.value == 'all'){
 			}else if(val.value == 'favoriteWorks'){
 				filter.getListDate.getLikePortfolio = 1
 			}else if(val.value == 'myWorks'){
 				filter.getListDate.getMyPortfolio = 1
+			}else if(val.value == 'RCAworkshop_2024'){
+				filter.getListDate.tagId = 1
 			}
+			
 			filter.getListDate.page = 0
 			fall.value.clearData()
 			filter.isShowMark = false