From 601e68bcff64472e772ab12a19be505d4bfe92c5 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 16 May 2024 17:14:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=B9=BF=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                    |   3 +-
 src/assets/style/style.css                  |   4 +
 src/assets/style/style.less                 |   5 +
 src/component/HomePage/ColorboardUpload.vue |   4 +
 src/component/HomePage/ExportModel.vue      |   2 -
 src/component/HomePage/collectionModal.vue  |   2 +
 src/component/WorksPage/newScaleImage.vue   |  58 ++++++++----
 src/component/WorksPage/publish.vue         | 100 ++++++++++++++------
 src/tool/https.js                           |   6 ++
 src/views/HomeView/HomeView.vue             |  33 ++++++-
 src/views/HomeView/Works.vue                |  38 ++++++--
 src/views/HomeView/history.vue              |   2 +-
 src/views/Upgrade.vue                       |   6 +-
 13 files changed, 200 insertions(+), 63 deletions(-)

diff --git a/.env.dev b/.env.dev
index d429345a..fca07508 100644
--- a/.env.dev
+++ b/.env.dev
@@ -3,6 +3,7 @@ NODE_ENV = 'development'
 # VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 
 # VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
-VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
+# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VUE_APP_BASE_URL = 'http://192.168.1.9:17088'
 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
+VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index bab09fce..e5a77f2b 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -1223,6 +1223,10 @@ i {
   width: 100%;
   height: 100%;
 }
+.selectActive {
+  opacity: 0.5;
+  transform: scale(0.9);
+}
 .collection_modal_body .input_border,
 .design_detail_modal_component .input_border,
 .library_page .input_border {
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 48efec0e..b47b6ac7 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -1320,6 +1320,11 @@ i{
 		height: 100%;
 	}
 }
+//设置选中样式
+.selectActive{
+	opacity: .5;
+	transform: scale(.9);
+}
 
 //设计input和上传按钮样式
 .collection_modal_body,.design_detail_modal_component,.library_page{
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index d747612c..ba5b8ff4 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -407,6 +407,10 @@ export default defineComponent({
             // this.fileList = []
 			this.reviewColor={}
             this.pantongName = ''
+			this.colorList[this.selectIndex] = {}
+			let colorList =this.colorList.filter((v) => Object.keys(v).length)
+			this.setColorboardList(colorList)
+
             // this.pantongNameList = []
             this.tcxColor = ''
         },
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index 4119ca77..b30385e7 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -401,8 +401,6 @@ export default defineComponent({
                     "sketchboardFiles",
                     "likeDesignCollectionList",
                 ];
-                
-                
                 let oldKey = "";
                 let margin = 20; //每个图形边距
 				let maxHeight = 0
diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue
index 7d1b8460..251dd8bd 100644
--- a/src/component/HomePage/collectionModal.vue
+++ b/src/component/HomePage/collectionModal.vue
@@ -136,6 +136,8 @@ export default defineComponent({
     methods:{
         nextStep(){
 			let colorBoards = this.store.state.UploadFilesModule.colorBoards
+			console.log(colorBoards);
+			
 			if(this.collectionStep == 1){
 				let disposeMoodboard = this.store.state.UploadFilesModule.disposeMoodboard
 				let moodboard = this.store.state.UploadFilesModule.moodboard
diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue
index bb7df1aa..3f4e7fb1 100644
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -23,17 +23,17 @@
 			<div class="newScaleImage_left">
 				<div class="newScaleImage_content_right">
 					<div class="newScaleImage_content_right_img">
-						<img :src="scaleImageList[scaleImageIndex]?.imgUrl">
+						<img :src="scaleImageList[scaleImageIndex]?.designPythonOutfitUrl">
 					</div>
 					<div class="nav_centent" v-mousewheel="{allLength:scaleImageList.length}" :style="{'margin-top':scaleImageMarginTop}">
-						<img class="nav_centent_img" v-for="item,index in scaleImageList" @click="setScaleImageIndex(index)" :class="{active2:index == scaleImageIndex, active3:index == scaleImageIndex+1, active1:index == scaleImageIndex-1}" :title="scaleImageIndex" :src="item?.imgUrl" :key="item.id">
+						<img class="nav_centent_img" v-for="item,index in scaleImageList" @click="setScaleImageIndex(index)" :class="{active2:index == scaleImageIndex, active3:index == scaleImageIndex+1, active1:index == scaleImageIndex-1}" :title="scaleImageIndex" :src="item?.designPythonOutfitUrl" :key="item.id">
 					</div>
 				</div>
 			</div>
 			<div class="newScaleImage_right">
 				<div class="newScaleImage_right_content">
 					<div class="newScaleImage_right_content_type">
-						<div class="generate_item_title_left scaleImage_chunk_title">类型：collection/generate</div>
+						<div class="generate_item_title_left scaleImage_chunk_title">type：{{ scaleImageList[scaleImageIndex]?.portfolioType=='History'? 'collection' : 'generate' }}</div>
 					</div>
 					<div v-if="true" class="newScaleImage_right_content_collection">
 						<!-- <div class="scaleImage_chunk_item content_left_collection_detail">
@@ -45,12 +45,13 @@
 						<div class="scaleImage_chunk_item content_left_collection_content">
 							<div class="scaleImage_chunk_title">Finished Products</div>
 							<div class="content_left_collection_content_list">
-								<img v-lazy="scaleImageList[scaleImageIndex]?.imgUrl">
-								<img v-lazy="scaleImageList[scaleImageIndex]?.imgUrl">
-								<img v-lazy="scaleImageList[scaleImageIndex]?.imgUrl">
+								<!-- <img v-for="item in scaleImageData.collectionElementList" v-lazy="item.url"> -->
+								<img v-lazy="scaleImageList[scaleImageIndex]?.designPythonOutfitUrl">
+								<img v-lazy="scaleImageList[scaleImageIndex]?.designPythonOutfitUrl">
+								<img v-lazy="scaleImageList[scaleImageIndex]?.designPythonOutfitUrl">
 							</div>
 						</div>
-						<div class="started_btn">二创</div>
+						<div class="started_btn" @click="setChoose">二创</div>
 					</div>
 					<div v-else class="newScaleImage_right_content_generate">
 						<div class="scaleImage_chunk_item content_left_generate_item">
@@ -85,17 +86,17 @@
 							</div>
 						</div>
 						<div class="detail_right_work_detail detail_left_right_item">
-							<div class="scaleImage_chunk_title">这是一套合成图</div>
-							<div class="scaleImage_chunk_title_intro">1111111111111111111111111111</div>
+							<div class="scaleImage_chunk_title">{{ scaleImageData.portfolioName }}</div>
+							<div class="scaleImage_chunk_title_intro">{{ scaleImageData.portfolioDes }}</div>
 						</div>
 						<div class="detail_right_date detail_left_right_item">
 							<div class="detail_right_date_setUp">
 								<div>创建时间</div>
-								<span>2024/11/1/1</span>
+								<span>{{ scaleImageList[scaleImageIndex].createDate }}</span>
 							</div>
 							<div class="detail_right_date_upData">
 								<div>更新时间</div>
-								<span>2024/11/1/1</span>
+								<span>{{ scaleImageList[scaleImageIndex].updateDate }}</span>
 							</div>
 						</div>
 						<div class="detail_right_look_operation detail_left_right_item">
@@ -203,13 +204,16 @@
 
 <script lang="ts">
 import { defineComponent,watch,getCurrentInstance, h, ref ,toRefs,computed,reactive,triggerRef, nextTick} from "vue";
-// import { Https } from "@/tool/https";
+import { Https } from "@/tool/https";
 // import { getCookie } from "@/tool/cookie";
 // import domTurnImg from '@/tool/domTurnImg'
+import { useRouter } from 'vue-router'
 import { downloadIamge } from "@/tool/util";
 
 export default defineComponent({
     setup() {
+		//首先在setup中定义
+ 		const router = useRouter()
         let scaleImage: any = ref(false);//弹窗
 		let scaleImageMask:any = ref(false)//弹窗遮罩
 		let imgData:any = reactive({
@@ -218,6 +222,7 @@ export default defineComponent({
 			scaleImageMarginTop:0,
 			scaleImageList:[],
 			scaleImageIndex:0,//当前图片索引
+			scaleImageData:{},//当前图片内容
 		})
 		let textarea: any = ref(null)
 		let setCopy = ()=>{
@@ -228,12 +233,15 @@ export default defineComponent({
 			scaleImage.value = true
 			imgData.scaleImageList = list
 			imgData.scaleImageIndex = index
+			let data = list[index]
+			getDetail(data)
+
 			// let scaleImageList = this.store.state.UploadFilesModule.moodboard
 		}
 		let cancelDsign = ()=>{
 			scaleImage.value = false
-			imgData.scaleImageList = []
 			imgData.scaleImageIndex = 0
+			imgData.scaleImageData = {}
 		}
 		let download = ()=>{
 			downloadIamge(imgData.scaleImageList[imgData.scaleImageIndex].imgUrl)
@@ -244,8 +252,6 @@ export default defineComponent({
 		let LikeFile = (item:any,str:string)=>{
 			const currentInstance = getCurrentInstance();
 			let parent:any = currentInstance?.parent
-			console.log(parent);
-			
 			parent.likeFile(item,str)
 		}
 	
@@ -253,6 +259,20 @@ export default defineComponent({
 		// 	let parent:any = this.$parent
 		// 	parent.likeFile(item,str)
 		// },
+		let getDetail = (value:any)=>{
+			let data = value
+		    Https.axiosPost(Https.httpUrls.getPorfolioDetail,data).then(
+				(rv: any) => {
+						console.log(rv);
+						imgData.scaleImageData = rv
+					}
+				).catch((res)=>{
+				}
+			)
+		}
+		let setChoose = () =>{
+        	router.push({name:'homePage',params: {id:imgData.scaleImageList[imgData.scaleImageIndex].userLikeGroupSourceId.id,type:'Works'}})
+		}
 		watch(()=>imgData.scaleImageIndex,
 			(newVal,oldVal)=>{
 				let dom:any = document.querySelector('.newScaleImage_left .nav_centent')
@@ -272,6 +292,7 @@ export default defineComponent({
 			download,
 			setScaleImageIndex,
 			LikeFile,
+			setChoose,
         };
     },
 	directives:{
@@ -499,9 +520,11 @@ export default defineComponent({
 			.nav_centent_img{
 				max-width: calc(var(--snap-size) - 2rem);
 				height: calc(var(--snap-size) - 2rem);
+				width: calc(var(--snap-size) - 2rem);
 				object-fit: contain;
-				width: auto;
-				background-color: #fff;
+				padding: .5rem 0;
+				background-color: #ffffff;
+				border: 1px solid #777777;
 				object-position: 50%,50%;
 				border-radius: calc(1rem*1.2);
 				cursor: pointer;
@@ -820,6 +843,7 @@ export default defineComponent({
 				display: flex;
 				justify-content: space-between;
 				.detail_right_date_setUp,.detail_right_date_upData{
+					width: 45%;
 					div{
 						font-size: 2rem;
 						font-weight: 600;
diff --git a/src/component/WorksPage/publish.vue b/src/component/WorksPage/publish.vue
index 90fcef17..77379081 100644
--- a/src/component/WorksPage/publish.vue
+++ b/src/component/WorksPage/publish.vue
@@ -26,36 +26,30 @@
 					<div class="publidh_content_item">
 						<div class="publidh_content_item_title">Cover Picture</div>
 						<div class="publish_content_shrink publish_content_item">
-							<img v-lazy="'https://www.minio.aida.com.hk:9000/aida-results/result_eabc59d4-110a-11ef-bb36-0242ac160002.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20240514%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240514T093050Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=64f2098d15a2ebf5883946c472bbeecaed1a443c618e1f15d92f44b97cb63542'" alt="">
+							<img v-lazy="selectDate.url" alt="">
 						</div>
 					</div>
 					<div class="publidh_left_thubnai publidh_content_item">
 						<div class="publidh_content_item_title">Select Cover Picture</div>
 						<div class="publidh_left_thubnail_list publish_content_item">
-							<img v-lazy="'https://cdn.dribbble.com/userupload/14355607/file/original-930ddf037011f7acd6bd810a5cb6f0fc.jpg?resize=450x338&vertical=center'" alt="">
-							<img v-lazy="'https://www.minio.aida.com.hk:9000/aida-results/result_eabc59d4-110a-11ef-bb36-0242ac160002.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20240514%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240514T093050Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=64f2098d15a2ebf5883946c472bbeecaed1a443c618e1f15d92f44b97cb63542'" alt="">
-							<img v-lazy="'https://www.minio.aida.com.hk:9000/aida-results/result_eabc59d4-110a-11ef-bb36-0242ac160002.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20240514%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240514T093050Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=64f2098d15a2ebf5883946c472bbeecaed1a443c618e1f15d92f44b97cb63542'" alt="">
-							<img v-lazy="'https://www.minio.aida.com.hk:9000/aida-results/result_eabc59d4-110a-11ef-bb36-0242ac160002.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20240514%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240514T093050Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=64f2098d15a2ebf5883946c472bbeecaed1a443c618e1f15d92f44b97cb63542'" alt="">
-							<img v-lazy="'https://www.minio.aida.com.hk:9000/aida-results/result_eabc59d4-110a-11ef-bb36-0242ac160002.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20240514%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240514T093050Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=64f2098d15a2ebf5883946c472bbeecaed1a443c618e1f15d92f44b97cb63542'" alt="">
-							<img v-lazy="'https://cdn.dribbble.com/userupload/14355607/file/original-930ddf037011f7acd6bd810a5cb6f0fc.jpg?resize=450x338&vertical=center'" alt="">
-							<img v-lazy="'https://cdn.dribbble.com/userupload/14355607/file/original-930ddf037011f7acd6bd810a5cb6f0fc.jpg?resize=450x338&vertical=center'" alt="">
+							<img v-for="item in getPublishDate.groupDetails" :class="{selectActive:item.designOutfitId === subPublishDate.coverId}" v-lazy="item.url" @click="setCover(item)" alt="">
 						</div>
 					</div>
 				</div>
 				<div class="publidh_right">
 					<div class="publidh_right_name publidh_content_item">
 						<div class="publidh_content_item_title">Name</div>
-						<input type="text">
+						<input type="text" v-model="subPublishDate.portfolioName">
 					</div>
 					<div class="publidh_right_name publidh_content_item">
 						<div class="publidh_content_item_title">Description</div>
-						<textarea ref="textarea"></textarea>
+						<textarea ref="textarea" v-model="subPublishDate.portfolioDes"></textarea>
 					</div>
 					<!-- <div class="publidh_right_name publidh_content_item">
 						<div class="publidh_content_item_title">Thumbnail preview</div>
 						<input type="text">
 					</div> -->
-					<div class="publidh_right_name publidh_content_item">
+					<div class="publidh_content_item publidh_right_zhuyi">
 						<div class="publidh_content_item_intro">
 							<span class="icon iconfont icon-zhuyi"></span>This will publish your work to the square for all users to see.
 						</div>
@@ -67,16 +61,18 @@
 					</div>
 				</div>
 			</div>
-		
+		</div>
+		<div class="mark_loading" v-show="isShowMark">
+			<a-spin size="large" />
 		</div>
 	</a-modal>
-
 </template>
 
 <script lang="ts">
 import { defineComponent,watch,createVNode, h, ref ,toRefs,computed,reactive,triggerRef, nextTick} from "vue";
-// import { Https } from "@/tool/https";
 // import { getCookie } from "@/tool/cookie";
+import { Https } from "@/tool/https";
+import { getCookie,setCookie } from "@/tool/cookie";
 // import domTurnImg from '@/tool/domTurnImg'
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { Modal,message } from 'ant-design-vue';
@@ -86,30 +82,55 @@ export default defineComponent({
     setup() {
         let publish: any = ref(false);//弹窗
 		let publishMask:any = ref(false)//弹窗遮罩
-		let publishDate:any = reactive({
+		let publishData:any = reactive({
 			publishName:'123123',
 			loadingShow:false,
 			publishMarginTop:0,
 			publishList:[],
 			publishIndex:0,//当前图片索引
+			isShowMark:false,
+			selectDate:{
+				url:'',
+			},
+			getPublishDate:{
+			},
+			subPublishDate:{
+			},
 		})
 		// let textarea: any = ref(null)
 		// let setCopy = ()=>{
 		// 	textarea.value.select()
 		// 	document.execCommand("copy");
 		// }
-		let init = ()=>{
-			console.log(213123);
+		let init = (data:any)=>{
+			let userInfo:any = getCookie("userInfo")
+			console.log(data);
+			publishData.getPublishDate = data
 			publish.value = true
-			// publishDate.publishList = list
-			// publishDate.publishIndex = index
+			publishData.selectDate.url = data.groupDetails[0].url
+			publishData.subPublishDate = {
+				userLikeGroupId : data.id,
+				coverId : data.groupDetails[0].designOutfitId,
+				accountId : JSON.parse(userInfo).userId,
+				createDate:'',
+				idDeleted:'',
+				id:'',
+				portfolioDes:'',
+				portfolioName:data.name,
+				portfolioType:'History',
+				status:'',
+				updateDate:'',
+				collectionId:'',
+			}
+			// publishData.publishList = list
+			// publishData.publishIndex = index
 			// let publishList = this.store.state.UploadFilesModule.moodboard
 		}
 		// let download = ()=>{
-		// 	downloadIamge(publishDate.publishList[publishDate.publishIndex].imgUrl)
+		// 	downloadIamge(publishData.publishList[publishData.publishIndex].imgUrl)
 		// }
 		// let setScaleImageIndex = (index:any)=>{
-		// 	publishDate.publishIndex = index
+		// 	publishData.publishIndex = index
 		// }
 		// let LikeFile = (item:any,str:string)=>{
 		// 	const currentInstance = getCurrentInstance();
@@ -123,11 +144,16 @@ export default defineComponent({
 		// 	let parent:any = this.$parent
 		// 	parent.likeFile(item,str)
 		// },
-		let confrimRename = ()=>{
-		    
+		let setCover = (item:any)=>{
+		    publishData.subPublishDate.coverId = item.designOutfitId
+			publishData.selectDate.url = item.url
+
 		}
-		let cleardate = ()=>{
+		let cleardata = ()=>{
 		    publish.value = false
+			publishData.isShowMark = false
+			publishData.getPublishDate = {}
+			publishData.subPublishDate = {}
 		}
 		let cancelDsign = ()=>{
 			Modal.confirm({
@@ -138,7 +164,7 @@ export default defineComponent({
 				mask:false,
                 centered:true,
                 onOk() {
-					cleardate()
+					cleardata()
                 }
             });
 		}
@@ -152,21 +178,36 @@ export default defineComponent({
 				mask:false,
                 centered:true,
                 onOk() {
+					subPublish()
                 }
             });
 		}
+		let subPublish = ()=>{
+			let data = publishData.subPublishDate
+			publishData.isShowMark = true
+			Https.axiosPost(Https.httpUrls.publish, data)
+                .then((rv) => {
+					console.log(rv);
+					cleardata()
+					publishData.isShowMark = false
+                })
+                .catch((rv) => {
+					publishData.isShowMark = false
+
+				});
+		}
 
         return {
             publish,
 			publishMask,
-			...toRefs(publishDate),
+			...toRefs(publishData),
 			// textarea,
 			// setCopy,
 			init,
 			// download,
 			// setScaleImageIndex,
 			// LikeFile,
-			confrimRename,
+			setCover,
 			cancelDsign,
 			setPublish,
         };
@@ -341,6 +382,7 @@ export default defineComponent({
 					overflow-x: auto;
 					height: 24rem;
 					img{
+						cursor: pointer;
 						height: 100%;
 						margin-right: 1rem;
 					}
@@ -352,8 +394,10 @@ export default defineComponent({
 		}
 		.publidh_right{
 			width: 45%;
-			.publidh_right_btn{
+			.publidh_right_zhuyi{
 				margin-top: auto;
+			}
+			.publidh_right_btn{
 				display: flex;
 				align-items: center;
 				justify-content: flex-end;
diff --git a/src/tool/https.js b/src/tool/https.js
index 4833db5f..d5c571dd 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -218,6 +218,12 @@ export const Https = {
 		prepareForSR:`/api/python/prepareForSR`,//超分
 		
 
+		//作品广场
+		publish:`/api/portfolio/publish`,//发布作品到作品广场
+		getPorfolio:`/api/portfolio/page`,//查询作品广场
+		getPorfolioDetail:`/api/portfolio/detail`,//查询作品广场作品详情
+		setPorfolioChoose:`/api/portfolio/choose`,//二次创作
+
     },
 
     axiosGet(url,config) {
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index b25e43a2..8a569717 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -456,7 +456,11 @@ export default defineComponent({
 			// this.store.commit("clearAllCollection");
 		}
 		if (this.$route.params.id) {
-			this.getHistoryChoose(this.$route.params.id, "normal");
+			if(this.$route.params.type == 'History'){
+				this.getHistoryChoose(this.$route.params.id, "normal");
+			}else if(this.$route.params.type == 'Works'){
+				this.getWorks(this.$route.params.id, "normal");
+			}
 			this.store.commit("setDesignCollectionList",[]);
 		} else {
 			// this.store.commit("clearAllData");
@@ -895,7 +899,32 @@ export default defineComponent({
 					this.isShowMark = false;
 				});
 		},
-
+		getWorks(userGroupId: any, type: any) {
+			let data:any = {
+				"accountId": 0,
+				"collectionId": 0,
+				"coverId": 0,
+				"createDate": "",
+				"id": 0,
+				"isDeleted": 0,
+				"portfolioDes": "",
+				"portfolioName": "",
+				"portfolioType": "",
+				"status": 0,
+				"updateDate": "",
+				"userLikeGroupId":userGroupId 
+			}
+			Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then(
+					(rv: any) => {
+						console.log(rv);
+						
+						this.dealHistoryChooseData(rv, type);
+						this.isShowMark = false;
+					}
+				).catch((res)=>{
+					this.isShowMark = false;
+				});
+		},
 		//处理选择组的数据
 		dealHistoryChooseData(data: any, type: any) {
 			let collectionData = {
diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue
index 89f9b4ea..8d767501 100644
--- a/src/views/HomeView/Works.vue
+++ b/src/views/HomeView/Works.vue
@@ -1,30 +1,31 @@
 <template>
     <div class="works_page">
-		<div class="modal_title_text">
+		<!-- <div class="modal_title_text">
 			<div>Works</div>
-		</div>
+		</div> -->
 		<div class="modal_title_text">
 			<div v-for="item in worksType" :key="item" class="modal_title_text_assistant" @click="setWorksSelect(item)" :class="{active:item.value == worksSelect}">{{ item.name }}</div>
 		</div>
         <div class="page_content">
 			<div class="page_content_item" v-for="item,index in worksList" :key="item">
 				<div class="page_content_item_img"  @click.stop="getImgScale(index)">
-					<img v-lazy="item.imgUrl" alt="">
+					<img v-lazy="item.designPythonOutfitUrl" alt="">
 					<div class="delete_like_file_block" >
 						<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
 						<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
 					</div>
 				</div>
 				<div class="page_content_item_text">
-					<div class="page_content_item_text_name">
-						{{item.name}}
+					<div class="page_content_item_text_name" :title="item.portfolioName">
+						{{item.portfolioName}}
 					</div>
 					<div class="page_content_item_text_bottom">
 						<div>
 							<svg xmlns="http://www.w3.org/2000/svg" width="2.5rem" height="2.5rem" viewBox="0 0 16 16" fill="none" role="img" :style="{color:'#9e9ea7',fill: 'currentColor'}">
 								<path d="M10.7408 2C13.0889 2 14.6667 4.235 14.6667 6.32C14.6667 10.5425 8.11856 14 8.00004 14C7.88152 14 1.33337 10.5425 1.33337 6.32C1.33337 4.235 2.91115 2 5.2593 2C6.60745 2 7.48893 2.6825 8.00004 3.2825C8.51115 2.6825 9.39263 2 10.7408 2Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
 							</svg>
-							<span>{{ item.likeNum }}</span>
+							<span>321</span>
+							<!-- <span>{{ item.likeNum }}</span> -->
 						</div>
 						<div>
 							<i v-if="true" class="fi fi-sr-thumbs-up" style="color:rgba(158, 158, 167);"></i>
@@ -36,7 +37,8 @@
 								<path d="M8 3C4.36992 3 1.98789 6.21774 1.18763 7.49059C1.09079 7.64462 1.04237 7.72163 1.01527 7.84042C0.99491 7.92964 0.99491 8.07036 1.01527 8.15958C1.04237 8.27837 1.09079 8.35539 1.18763 8.50941C1.98789 9.78226 4.36992 13 8 13C11.6301 13 14.0121 9.78226 14.8124 8.50941L14.8124 8.50939C14.9092 8.35538 14.9576 8.27837 14.9847 8.15958C15.0051 8.07036 15.0051 7.92964 14.9847 7.84042C14.9576 7.72163 14.9092 7.64462 14.8124 7.4906L14.8124 7.49059C14.0121 6.21774 11.6301 3 8 3Z" fill="currentColor"></path>
 								<path d="M8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="white"></path>
 							</svg>
-							<span>{{ item.lookNum }}</span>
+							<span>321</span>
+							<!-- <span>{{ item.lookNum }}</span> -->
 						</div>
 						<!-- <div>
 							<i class="fi fi-rr-comment-alt-dots"></i>
@@ -58,7 +60,7 @@
 </template>
 <script lang="ts">
 import { LoadingOutlined } from "@ant-design/icons-vue";
-import { defineComponent,h ,toRefs,ref,reactive,createVNode,nextTick,provide,computed} from 'vue'
+import { defineComponent,h ,toRefs,ref,reactive,onMounted,nextTick,provide,computed} from 'vue'
 // import HeaderComponent from "@/component/HomePage/Header.vue";
 // import RobotAssist from "@/component/HomePage/RobotAssist.vue";
 import { Modal,message,Upload,CascaderProps } from 'ant-design-vue';
@@ -192,6 +194,10 @@ export default defineComponent({
 					like: false,
 				}
 			],
+			getListDate:{
+				page:1,
+				size:10,
+			},
 			isShowMark:false
 		})
 		let newScaleImage:any = ref()
@@ -205,7 +211,19 @@ export default defineComponent({
 			newScaleImage.value.scaleImageMask = true
 			newScaleImage.value.init(filter.worksList,index)
 		}
+		let getPorfolio = ()=>{
+			let data = filter.getListDate
+			Https.axiosPost(Https.httpUrls.getPorfolio, data)
+                .then((rv) => {
+					console.log(rv);
+					filter.worksList = rv.content
+                })
+                .catch((rv) => {});
+		}
 		let {t} = useI18n()
+		onMounted (()=>{
+			getPorfolio()
+		})
         return {
 			...toRefs(filter),
 			newScaleImage,
@@ -284,13 +302,14 @@ export default defineComponent({
 		display: flex;
 		flex-wrap: wrap;
 		overflow-y: auto;
-		height: 145rem;
+		height: 125rem;
 		align-content: flex-start;
 		.page_content_item{
 			display: flex;
 			flex-direction: column;
 			margin-right: 4rem;
 			margin-bottom: 4rem;
+			width: 30rem;
 		}
 		.page_content_item_text,.page_content_item_img{
 			display: flex;
@@ -299,6 +318,7 @@ export default defineComponent({
 			width: 30rem;
 			height: 30rem;
 			overflow: hidden;
+			padding: 2rem 0;
 			justify-content: center;
 			border-radius: 2rem;
 			position: relative;
diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue
index ea023270..09138d85 100644
--- a/src/views/HomeView/history.vue
+++ b/src/views/HomeView/history.vue
@@ -323,7 +323,7 @@ export default defineComponent({
         },
 
         retrieveHome(record:any){
-            this.$router.push({name:'homePage',params: {id:record.id}})
+            this.$router.push({name:'homePage',params: {id:record.id,type:'History'}})
         },
 
 		setPublish(record:any){
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index a3171921..ba6f2fd2 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -5,9 +5,9 @@
 				<i class="fi fi-rr-settings"></i>
 			</div>
 			<div class="upgrade-content-wire"></div>
-			<!-- <div class="upgrade-content-text">System upgrading</div> -->
-			<div class="upgrade-content-text">System maintenance</div>
-			<div class="upgrade-content-textab">Due to system server upgrades, we will be conducting maintenance on Monday, March 27th, from 10:30 AM to 11:30 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
+			<div class="upgrade-content-text">System upgrading</div>
+			<!-- <div class="upgrade-content-text">System maintenance</div> -->
+			<div class="upgrade-content-textab">Due to system server upgrades, we will be conducting maintenance on Friday, May 17 from 10:30 AM to 11:30 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
 		</div>
 	</div>
 </template>