2023-10-31-2-dist

2023-10-31 16:04:40 +08:00
parent 4bc10f121a
commit 5d89e3c007
19 changed files with 425 additions and 217 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .DS_Store
 node_modules
-/dist
+# /dist


 # local env files
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -185,6 +185,10 @@ li {
 .operate_file_block .select_img_type .category_list .category_item:hover {
  background: linear-gradient(-137deg, #eeefdb, #e7dbed);
 }
+.ant-message {
+  z-index: 1049 !important;
+  top: 6rem;
+}
 .ant-modal-confirm-btns .ant-btn:hover {
  color: #39215b !important;
  border-color: #39215b !important;
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -229,6 +229,10 @@ ul,li{
 		}
 	}
 }
+.ant-message{
+	z-index: 1049 !important;
+	top: 6rem;
+}
 .ant-modal-confirm-btns{
 	.ant-btn:hover{
 		color: #39215b !important;
--- a/src/component/Detail/DesignDetailAlter.vue
+++ b/src/component/Detail/DesignDetailAlter.vue
@@ -653,10 +653,6 @@ export default defineComponent({

 				// console.log(this.current.printObject,imgData); 
 			}
-
-
-			// imgData.type_ = this.type_
-			// this.store.commit("addGenerateMaterialFils", imgData);
        },
 		//请求我的印花&&模型
 		getLibraryList(){
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -487,7 +487,7 @@ export default defineComponent({
 			justify-content: space-between;
 		}
 		.modal_img{
-			width: 45rem;
+			width: 50rem;
 			// width: 40rem;
 			height: 5rem;
 			overflow-x: hidden;
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -166,10 +166,11 @@
 					<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
 				</div>
            </div>
+			<div class="mark_loading" v-show="loadingShow">
+				<a-spin size="large" />
+			</div>
        </div>
-		<div class="mark_loading" v-show="loadingShow">
-			<a-spin size="large" />
-		</div>
+		
    </div>
 </template>
 <script lang="ts">
@@ -314,6 +315,7 @@ export default defineComponent({
        generageAdd(data: any) {
            data.type_ = this.type_;
 			data.resData = JSON.parse(JSON.stringify(data))
+			data.jsContent1 = this.t('uploadFile.jsContent1')
            this.store.commit("addGenerateMaterialFils", data);
        },
 		
@@ -500,6 +502,7 @@ export default defineComponent({
 		},
        deleteFile(item: any) {
            if (item.type_ == "generate" || item.type_ == "material") {
+				item.jsContent1 = this.t('uploadFile.jsContent1')
                this.store.commit("addGenerateMaterialFils", item);
            } else {
                this.sketchboardList =
@@ -565,6 +568,8 @@ export default defineComponent({
 	flex: 1;
    // height: 30rem;
    // overflow-x: hidden;
+	display: flex;
+    flex-direction: column;
    border-right: 1px solid #e5e5e5;
    &.generate::-webkit-scrollbar {
        display: none;
@@ -629,7 +634,16 @@ export default defineComponent({
    }
    .generage_img {
        display: flex;
+		position: relative;
        flex-wrap: wrap;
+		align-content: flex-start;
+		flex: 1;
+		.mark_loading{
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			z-index: 99;
+		}
        .generage_img_item {
            cursor: pointer;
            margin: 0 2rem 2rem 0;
--- a/src/component/HomePage/Material.vue
+++ b/src/component/HomePage/Material.vue
@@ -84,6 +84,7 @@ import { Https } from "@/tool/https";
 import { message } from 'ant-design-vue';
 import { useStore } from "vuex";
 import GO from '@/tool/GO';
+import { useI18n } from 'vue-i18n';

 export default defineComponent({
    props: ["msg",'disignTypeList'],
@@ -103,6 +104,8 @@ export default defineComponent({
 				
        //     ])
 		let workspace:any = ref({})
+
+		let {t} = useI18n()
        return{
            myMaterialModalShow,
            imgList,
@@ -115,7 +118,8 @@ export default defineComponent({
            searcMaterialhName,
            designType,
            // disignTypeList,
-			workspace
+			workspace,
+			t
        }
    },
 	data (prop) {
@@ -259,6 +263,7 @@ export default defineComponent({
 			this.imgList.forEach((v:any)=>{
 				v.categoryShow = false
 			})
+			imgData.jsContent1 = this.t('uploadFile.jsContent1')
 			this.store.commit("addGenerateMaterialFils", imgData);
        },
        //改变页码
--- a/src/component/HomePage/MoodboardUpload.vue
+++ b/src/component/HomePage/MoodboardUpload.vue
@@ -334,6 +334,7 @@ export default defineComponent({

        deleteFile(item: any) {
 			if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
+				item.jsContent1 = this.t('uploadFile.jsContent1')
 				this.store.commit("addGenerateMaterialFils", item);
 				
 			}else{
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -117,12 +117,13 @@
 							<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
 						</div>
 					</div>
+					<div class="mark_loading" v-show="loadingShow">
+						<a-spin size="large" />
+					</div>
 				</div>
 			</div>
 		</div>
-		<div class="mark_loading" v-show="loadingShow">
-			<a-spin size="large" />
-		</div>
+		
        <Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper>
    </div>
 </template>
@@ -277,6 +278,7 @@ export default defineComponent({
            // this.fileList.splice(item, 1)
            // this.store.commit('setPrintboardFile',this.fileList)
 			if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
+				item.jsContent1 = this.t('uploadFile.jsContent1')
 				this.store.commit("addGenerateMaterialFils", item);
 			}else{
 				this.fileList = this.store.state.UploadFilesModule.printboardFiles
@@ -498,7 +500,7 @@ export default defineComponent({
 			let data = {
 				generateType:generateType,
 				designType:'',
-				collectionElementId:generage.collectionElementid,
+				collectionElementId:generage?.collectionElementid,
 				level1Type:generage.upload.level1Type,
 				level2Type:'',
 				text:this.captionGeneration,
@@ -507,7 +509,7 @@ export default defineComponent({
 				gender:'',
 			}
 			if(generateType == 'image'||generateType == 'text-image'){
-				if(generage.collectionElementid){
+				if(generage?.collectionElementid){
 					
 				}else{
 					message.warning(
@@ -543,8 +545,8 @@ export default defineComponent({
 						let arr
 						rv.generatedCollectionItems.forEach((v:any,index:number)=>{
 							arr = {
-								id:rv.generatedCollectionItems[index].generateItemId,
-								imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
+								id:v.generateItemId,
+								imgUrl:v.generateItemUrl,
 								id_:GO.id++
 							}
 						this.generateList.push(arr)
@@ -562,6 +564,7 @@ export default defineComponent({
                type2: 'Printboard',
            },
 			item.resData = JSON.parse(JSON.stringify(item))
+			item.jsContent1 = this.t('uploadFile.jsContent1')
            this.store.commit("addGenerateMaterialFils", item);
 		}
     }
@@ -834,6 +837,15 @@ export default defineComponent({
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: flex-start;
+				position: relative;
+				align-content: flex-start;
+
+				.mark_loading{
+					position: absolute;
+					width: 100%;
+					height: 100%;
+					z-index: 99;
+				}
 				.modal_imgItem{
 					margin: 0 2rem 5rem 0;
 					display: inline-block;
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -235,12 +235,13 @@
 							<a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox>
 						</div>
 					</div>
+					<div class="mark_loading" v-show="loadingShow">
+						<a-spin size="large" />
+					</div>
 				</div>
 			</div>
 		</div>
-		<div class="mark_loading" v-show="loadingShow">
-			<a-spin size="large" />
-		</div>
+		
 		<!-- <layout ref="layout" :moodb_className="moodb_className" :flex_direction="flex_direction" @setmoodbClass="setmoodbClass"></layout> -->
       	
 		
@@ -475,6 +476,7 @@ export default defineComponent({

        deleteFile(item: any) {
 			if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
+				item.jsContent1 = this.t('uploadFile.jsContent1')
 				this.store.commit("addGenerateMaterialFils", item);
 			}else{
 				this.fileList = this.store.state.UploadFilesModule.sketchboardFiles
@@ -569,7 +571,7 @@ export default defineComponent({
 			let data = {
 				generateType:generateType,
 				designType:'',
-				collectionElementId:generage.collectionElementid,
+				collectionElementId:generage?.collectionElementid,
 				level1Type:generage.upload.level1Type,
 				level2Type:generage.level2Type,
 				text:this.captionGeneration,
@@ -578,7 +580,7 @@ export default defineComponent({
 				gender:this.workspace.sex,
 			}
 			if(generateType == 'image'||generateType == 'text-image'){
-				if(generage.collectionElementid){
+				if(generage?.collectionElementid){
 				}else{
 					message.warning(
 						this.t('SketchboardUpload.jsContent5')
@@ -613,8 +615,8 @@ export default defineComponent({
 						let arr
 						rv.generatedCollectionItems.forEach((v:any,index:number)=>{
 							arr = {
-								id:rv.generatedCollectionItems[index].generateItemId,
-								imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
+								id:v.generateItemId,
+								imgUrl:v.generateItemUrl,
 								category:generage.level2Type,
 								id_:GO.id++
 							}
@@ -633,6 +635,7 @@ export default defineComponent({
                type2: 'Sketchboard',
            },
 			item.resData = JSON.parse(JSON.stringify(item))
+			item.jsContent1 = this.t('uploadFile.jsContent1')
            this.store.commit("addGenerateMaterialFils", item);
 		}
    },
@@ -896,6 +899,14 @@ export default defineComponent({
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: flex-start;
+				align-content: flex-start;
+				position: relative;
+				.mark_loading{
+					position: absolute;
+					width: 100%;
+					height: 100%;
+					z-index: 99;
+				}
 				.modal_imgItem{
 					margin: 0 2rem 4rem 0;
 					display: inline-block;
--- a/src/component/HomePage/collectionModal.vue
+++ b/src/component/HomePage/collectionModal.vue
@@ -16,7 +16,10 @@
 					<div v-show="collectionStep === 3">{{ $t('collectionModal.Colorboard') }}</div>
 					<div v-show="collectionStep === 4">{{ $t('collectionModal.Sketchboard') }}</div>
 					<!-- <div v-show="collectionStep === 5">Markets Sketch</div> -->
-					<div class="collection_title_text_intro">{{ $t('collectionModal.collection') }}</div>
+					<div  class="collection_title_text_intro" v-show="collectionStep === 1">{{ $t('collectionModal.MoodCollection') }}</div>
+					<div  class="collection_title_text_intro" v-show="collectionStep === 2">{{ $t('collectionModal.PrinCollection') }}</div>
+					<div  class="collection_title_text_intro" v-show="collectionStep === 3">{{ $t('collectionModal.ColorCollection') }}</div>
+					<div  class="collection_title_text_intro" v-show="collectionStep === 4">{{ $t('collectionModal.SketchCollection') }}</div>
 				</div>
 				<div class="collection_progress">
 					<a-progress :strokeWidth= 13 strokeColor="#341e57" type="circle" :percent="collectionStep*25" :format="percent => `${collectionStep}/4`" />
--- a/src/component/LibraryPage/ModelPlacement.vue
+++ b/src/component/LibraryPage/ModelPlacement.vue
@@ -294,7 +294,7 @@ export default defineComponent({
 				cropper.cropOffsertY = cropper.getImgAxis().y1
 				imgBoxSize.addEventListener('mousemove',this.startMove)
                this.setImageSize()
-				this.getDefaultPointList(this.imgBox)
+				this.getDefaultPointList(this.imgBox,' ')
            },300)
        },
 		realTime(data:any) {
@@ -343,7 +343,7 @@ export default defineComponent({
 			
 		},
        //初始化可以使用的点位
-        getDefaultPointList(imgBox:any){
+        getDefaultPointList(imgBox:any,str:any){
            this.isSubmit = false
 			this.locationList=[]
            this.pointList = [
@@ -360,36 +360,35 @@ export default defineComponent({
                    pointList:[{type:'handLeft',color:'#d88e8e',show:true,field:'hand'},{type:'handRight',color:'#d88e8e',show:true,field:'hand'}]
                },
            ]
-            if(this.printObject.shoulderLeft?.length >1){//编辑
-				console.log(this.printObject);
-				
+			for(let ponit of this.pointList){
+				for(let pointItem of ponit.pointList){
+					if(this.printObject[pointItem.type]?.length){
+						pointItem.show = false
+						let data = {
+							left:this.printObject[pointItem.type][0] * imgBox.width - 12,
+							top:this.printObject[pointItem.type][1] * imgBox.height - 12,
+							color:pointItem.color,
+							type:pointItem.type,
+							field:pointItem.field,
+						}
+						this.locationList.push(data)
+					}
+				}
+			}
+            if(str != 'setPoint'){//编辑
                this.isSubmit = true
 				// this.option.canScale = false
 				// this.option.canMove = false
-                for(let ponit of this.pointList){
-                    for(let pointItem of ponit.pointList){
-                        if(this.printObject[pointItem.type]?.length){
-                            pointItem.show = false
-                            let data = {
-                                left:this.printObject[pointItem.type][0] * imgBox.width - 12,
-                                top:this.printObject[pointItem.type][1] * imgBox.height - 12,
-                                color:pointItem.color,
-                                type:pointItem.type,
-                                field:pointItem.field,
-                            }
-                            this.locationList.push(data)
-                        }
-                    }
-                }
+            
                this.oldLocationList = JSON.parse(JSON.stringify(this.locationList))
+				this.oldPointList = JSON.parse(JSON.stringify(this.pointList))
            }else{
 				this.option.canScale = true
 				// this.option.fixedBox = false
 				this.option.canMove = true
 				// this.option.canMoveBox = true
 			}
-            
-            this.oldPointList = JSON.parse(JSON.stringify(this.pointList))
+           
        },
 		setPoint(){
 			console.log();
@@ -422,7 +421,7 @@ export default defineComponent({
 				file:printObject.file,
 				url:printObject.url
 			}
-			this.getDefaultPointList(this.imgBox)
+			this.getDefaultPointList(this.imgBox,'setPoint')
 		},
        AddDian(point:any){
            if(!point.show){
@@ -530,8 +529,8 @@ export default defineComponent({
                Modal.confirm({
                    title: this.t('ModelPlacement.jsContent1'),
                    icon: createVNode(ExclamationCircleOutlined),
-                    okText: 'Ok',
-                    cancelText: 'Cancel',
+                    okText: 'Yes',
+                    cancelText: 'No',
 					mask:false,
                    // centered:true,
                    onOk() {
@@ -558,6 +557,9 @@ export default defineComponent({
        },

        restoreLocationList(){
+			this.locationList = []
+			console.log(this.locationList);
+			
            this.pointList = JSON.parse(JSON.stringify(this.oldPointList))
            this.locationList = JSON.parse(JSON.stringify(this.oldLocationList))
        },
--- a/src/component/LibraryPage/ModelPlacementMobile.vue
+++ b/src/component/LibraryPage/ModelPlacementMobile.vue
@@ -304,8 +304,8 @@ export default defineComponent({
                Modal.confirm({
                    title: "You haven't marked the image yet, and the model will not be uploaded. Are you sure you want to close it?",
                    icon: createVNode(ExclamationCircleOutlined),
-                    okText: 'Ok',
-                    cancelText: 'Cancel',
+                    okText: 'Yes',
+                    cancelText: 'No',
 					mask:false,
                    // centered:true,
                    onOk() {
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -69,6 +69,7 @@ export default {
 		Prints:'Prints',
 		Sketches:'Sketches',
 		Mannequins:'Mannequins',
+		model:'model',
 		jsContent1:'Are you sure to delete the picture?',
 		jsContent2:'Are you sure to delete the picture?',
 		jsContent3:'You can only upload Image file!',
@@ -242,7 +243,10 @@ export default {
 		Printboard:'Printboard',
 		Colorboard:'Colorboard',
 		Sketchboard:'Sketchboard',
-		collection:'select moodboard for your collection',
+		MoodCollection:'select moodboard for your collection',
+		PrinCollection:'select printboard for your collection',
+		ColorCollection:'select colors for your collection',
+		SketchCollection:'select sketchboard for your collection',
 		jsContent1:'You must select the image and then use the layout.',
 		jsContent2:'The uploaded files will not be saved, being sure to continue? ',
 		jsContent3:'You must choose one or more colors for further process.',
@@ -292,4 +296,7 @@ export default {
 		preview:'preview',
 		jsContent1:'The above changes are not saved, being sure to continue? ',
 	},
+	uploadFile:{
+		jsContent1:'You can select up to 8 images',
+	},
 }
--- a/src/lang/zh-cn.ts
+++ b/src/lang/zh-cn.ts
@@ -44,8 +44,8 @@ export default {
 		GeneratedDesign:'生成的设计',
 		SelectedDesign:'喜欢的设计',
 		Export:'导出',
-		jsContent1:'你必须选择一种或多种颜色进行下一步处理。',
-		jsContent2:'你必须选择一种或多种颜色进行下一步处理。',
+		jsContent1:'您必须选择一种或多种颜色进行下一步。',
+		jsContent2:'您必须选择一种或多种颜色进行下一步。',
 		jsContent3:'导出文件失败。',
 	},
 	LibraryPage:{
@@ -58,24 +58,25 @@ export default {
 		ImageOnly:'图片',
 		TextOnly:'文字',
 		TextImage:'图片-文字',
-		inputContent2:'输入生成内容',
+		inputContent2:'输入生成图片的标题',
 		maximumLength:'输入的内容超过允许输入的最大长度',
 		Model1:'模型1',
 		Model2:'模型2',
-		inputContent3:'输入生成内容',
+		inputContent3:'输入生成图片的标题',
 		Cancel:'取消',
 		Sure:'确定',
-		Moodboard:'Moodboard',
+		Moodboard:'情绪板',
 		Prints:'印花',
 		Sketches:'服装',
 		Mannequins:'模特',
+		model:'模型',
 		jsContent1:'你确定要删除选中图片吗？',
 		jsContent2:'你确定要删除选中图片吗？',
 		jsContent3:'您只能上传图片文件！',
 		jsContent4:'图片必须小于2MB',
 		jsContent5:'图片已经上传是否继续上传',
 		jsContent6:'输入的内容超过允许输入的最大长度',
-		jsContent7:'请输入内容~"',
+		jsContent7:'请输入内容~',
 	},
 	HistoryPage:{
 		History:'历史',
@@ -86,19 +87,19 @@ export default {
 		Rename:'重命名',
 		Retrieve:'选择',
 		Delete:'删除',
-		inputContent2:'输入新名称',
+		inputContent2:'请输入新名称',
 		Submit:'保存',
 		CollectionsName:'名字',
 		UptateTime:'修改时间',
 		SketchCounts:'草图数量',
-		Operations:'操作',
+		Operations:'Operations',
 		jsContent1:'删除成功',
 		jsContent2:'您确定要删除这个收藏吗？',
 		jsContent3:'修改成功',
 		jsContent4:'图片必须小于2MB',
 		jsContent5:'图片已经上传是否继续上传',
 		jsContent6:'输入的内容超过允许输入的最大长度',
-		jsContent7:'请输入内容~"',
+		jsContent7:'请输入内容~',
 	},
 	ModelPlacement:{
 		Registration:'新增模特',
@@ -109,187 +110,193 @@ export default {
 		System:'系统',
 		Library:'收藏',
 		Point:'点位',
-		RemovePoint:'Remove Point',
-		mannequinHint:'Please change the pure white inside the mannequin for another color to enhance your experience',
-		SHOULDER:'SHOULDER',
-		WAISTBAND:'WAISTBAND',
-		HAND:'HAND',
-		jsContent1:"You haven't marked the image yet, and the model will not be uploaded. Are you sure you want to close it?",
+		RemovePoint:'删除点位',
+		mannequinHint:'模特背景图片请使用白色或者其他颜色来增强效果',
+		SHOULDER:'肩膀',
+		WAISTBAND:'腰部',
+		HAND:'手',
+		jsContent1:"您还没有保存，模特不会上传，确定要继续吗?",
 		jsContent2:'图片已经上传是否继续上传',
 	},
 	ModelPlacementMobile:{
-		Registration:'Registration',
+		Registration:'新增模特',
 		Submit:'保存',
 		Preview:'预览',
 		Back:'Back',
 		Restore:'重置',
 		Point:'点位',
-		RemovePoint:'Remove Point',
-		mannequinHint:'Please change the pure white inside the mannequin for another color to enhance your experience',
-		SHOULDER:'SHOULDER',
-		WAISTBAND:'WAISTBAND',
-		HAND:'HAND',
-		jsContent1:"You haven't marked the image yet, and the model will not be uploaded. Are you sure you want to close it?",
+		RemovePoint:'删除点位',
+		mannequinHint:'模特背景图片请使用白色或者其他颜色来增强效果',
+		SHOULDER:'肩膀',
+		WAISTBAND:'腰部',
+		HAND:'手',
+		jsContent1:"您还没有保存，模特不会上传，确定要继续吗?",
 		jsContent2:'图片已经上传是否继续上传',
 	},
 	Upload:{
-		Delete:'Delete',
-		Maximum2M:'Maximum 10 images can be uploaded, Maximum 2M per image',
+		Delete:'删除',
+		Maximum2M:'您最多可以上传10张照片，每张照片不能超过2MB',
 		jsContent1:'您只能上传图片文件！',
 		jsContent2:'图片必须小于2MB',
-		jsContent3:'upload failed',
+		jsContent3:'上传失败',
 	},
 	SketchboardUpload:{
-		Upload:'Upload',
-		Library:'Library',
-		Generate:'Generate',
+		Upload:'上传',
+		Library:'收藏',
+		Generate:'生成',
 		PIN:'PIN',
-		Thumbnail:'Thumbnail preview of selected sketchboard',
-		inputContent1:'Caption generation',
+		Thumbnail:'选择的服装缩略图',
+		inputContent1:'生成图片的标题',
 		maximumLength:'输入的内容超过允许输入的最大长度',
-		jsContent1:"upload failed",
+		jsContent1:"上传失败",
 		jsContent2:"您只能上传图片文件！",
 		jsContent3:'图片必须小于2MB',
-		jsContent4:"Maximum number of allowable file uploads has been exceeded",
-		jsContent5:"Please select a picture",
+		jsContent4:"超过允许上传的最大图片数量",
+		jsContent5:"请选择一张图片",
 		jsContent6:"输入的内容超过允许输入的最大长度",
 		jsContent7:"请输入内容~",
 	},
 	PrintboardUpload:{
-		Upload:'Upload',
-		Library:'Library',
-		Generate:'Generate',
+		Upload:'上传',
+		Library:'收藏',
+		Generate:'生成',
 		PIN:'PIN',
-		Thumbnail:'Thumbnail preview of selected printboard',
-		inputContent1:'Caption generation',
+		Thumbnail:'选择的印花缩略图',
+		inputContent1:'生成图片的标题',
 		maximumLength:'输入的内容超过允许输入的最大长度',
 		jsContent1:"您只能上传图片文件！",
 		jsContent2:'图片必须小于2MB',
-		jsContent3:"Maximum number of allowable file uploads has been exceeded",
-		jsContent4:"Please select a picture",
+		jsContent3:"超过允许上传的最大图片数量",
+		jsContent4:"请选择一张图片",
 		jsContent5:"输入的内容超过允许输入的最大长度",
 		jsContent6:"请输入内容~",
 	},
 	ColorboardUpload:{
-		Thumbnail:'Thumbnail preview of selected colorboard',
-		Clear:'Clear',
-		Palette:'Palette',
+		Thumbnail:'选择的颜色缩略图',
+		Clear:'清除',
+		Palette:'调色板',
 		HEX:'HEX',
 		RGBA:'RGBA',
-		AutoRecognize:'Auto Recognize',
-		ColorCode:'Color Code',
-		ExtractColor:'Extract Color',
-		jsContent1:"Your browser does not support it",
-		jsContent2:"Can't find the TCX color",
+		AutoRecognize:'识别图片颜色',
+		ColorCode:'颜色代码',
+		ExtractColor:'提取颜色',
+		jsContent1:"您的浏览器不支持",
+		jsContent2:"找不到这个TCX的颜色",
 		jsContent3:"您只能上传图片文件！",
 		jsContent4:'图片必须小于2MB',
 	},
 	MoodboardUpload:{
-		Upload:'Upload',
-		Library:'Library',
-		Generate:'Generate',
-		Delete:'Delete',
-		Thumbnail:'Thumbnail preview of selected moodboard',
-		layout:'layout',
-		jsContent1:'You can select up to 8 images',
-		jsContent2:"upload failed",
+		Upload:'上传',
+		Library:'收藏',
+		Generate:'生成',
+		Delete:'删除',
+		Thumbnail:'选择的情绪板缩略图',
+		layout:'布局',
+		jsContent1:'您最多可以选择8张图片',
+		jsContent2:"上传失败",
 		jsContent3:"您只能上传图片文件！",
 		jsContent4:'图片必须小于2MB',
-		jsContent5:'Please click Layout to sort randomly',
+		jsContent5:'请点击布局进行随机排序',
 	},
 	Cropper:{
-		Cutpicture:'Cut picture',
-		Finish:'Finish',
-		Cancel:'Cancel',
-		CropPreview:'Crop Preview',
+		Cutpicture:'切图',
+		Finish:'完成',
+		Cancel:'取消',
+		CropPreview:'缩略图',
 	},
 	Material:{
-		inputContent1:'Please input',
+		inputContent1:'输入名字进行搜索',
 		PIN:'PIN',
 	},
 	MarketingSketchUpload:{
-		Upload:'Upload',
-		MyLibrary:'My Library',
-		maximumLength:'Maximum 15 images can be uploaded, Maximum 2M per image',
-		jsContent1:'upload failed',
+		Upload:'上传',
+		MyLibrary:'我的收藏',
+		maximumLength:'最多可以上传15张照片，每张照片不能超过2MB',
+		jsContent1:'上传失败',
 		jsContent2:"您只能上传图片文件！",
 		jsContent3:'图片必须小于2MB',
-		jsContent5:'Maximum number of allowable file uploads has been exceeded',
+		jsContent5:'超过允许上传的最大图片数量',
 	},
 	layout:{
-		MoodBoardDesign:'MoodBoard Design',
+		MoodBoardDesign:'设计情绪板',
 		Submit:'保存',
 	},
 	Generate:{
-		ImageOnly:'Image Only',
-		TextOnly:'Text Only',
-		TextImage:'Text-Image',
+		ImageOnly:'图片',
+		TextOnly:'文字',
+		TextImage:'图片-文字',
 		Model1:'模型1',
 		Model2:'模型2',
-		inputContent1:'输入生成内容',
-		Generate:'Generate',
+		inputContent1:'输入生成图片的标题',
+		Generate:'生成',
 		maximumLength:'输入的内容超过允许输入的最大长度',
 		jsContent1:"您只能上传图片文件！",
 		jsContent2:'图片必须小于2MB',
 		jsContent3:"请输入内容~",
 		jsContent4:'输入的内容超过允许输入的最大长度',
 		jsContent5:"请输入内容~",
-		jsContent6:"You can select up to 8 images",
-		jsContent7:"upload failed",
+		jsContent6:"您最多可以选择8张图片",
+		jsContent7:"上传失败",
 	},
 	collectionModal:{
-		Moodboard:'Moodboard',
-		Printboard:'Printboard',
-		Colorboard:'Colorboard',
-		Sketchboard:'Sketchboard',
-		collection:'select moodboard for your collection',
-		jsContent1:'You must select the image and then use the layout.',
-		jsContent2:'The uploaded files will not be saved, being sure to continue? ',
-		jsContent3:'You must choose one or more colors for further process.',
+		Moodboard:'情绪板',
+		Printboard:'印花板',
+		Colorboard:'颜色板',
+		Sketchboard:'服装板块',
+		MoodCollection:'选择需要收藏的情绪板',
+		PrinCollection:'选择需要收藏的印花板',
+		ColorCollection:'选择需要收藏的颜色板',
+		SketchCollection:'选择需要收藏的服装板',
+		jsContent1:'您必须选择图片然后点击布局.',
+		jsContent2:'上传的文件不会保存，是否继续? ',
+		jsContent3:'您必须选择一种或多种颜色进行下一步。',
 	},
 	DesignDetail:{
-		Details:'Details',
-		EditDetails:'Edit the details of your design',
+		Details:'详情',
+		EditDetails:'编辑设计的细节',
 		Submit:'保存',
-		CurrentApparel:'Current Apparel',
-		CurrentPrint:'Current Print',
-		CurrentColor:'Current Color',
+		CurrentApparel:'当前服装',
+		CurrentPrint:'当前印花',
+		CurrentColor:'当前颜色',
 	},
 	DesignDetailAlter:{
-		Upload:'Upload',
-		Library:'Library',
-		inputContent1:'Please input',
-		Palette:'Palette',
+		Upload:'上传',
+		Library:'收藏',
+		inputContent1:'输入名字进行搜索',
+		Palette:'调色板',
 		HEX:'HEX',
 		RGBA:'RGBA',
-		AutoRecognize:'Auto Recognize',
-		Delete:'Delete',
-		ColorCode:'Color Code',
-		jsContent1:"Your browser does not support it",
-		jsContent2:"You can select up to 8 images",
-		jsContent3:"upload failed",
+		AutoRecognize:'识别图片颜色',
+		Delete:'删除',
+		ColorCode:'颜色代码',
+		jsContent1:"您的浏览器不支持",
+		jsContent2:"您最多可以选择8张图片",
+		jsContent3:"上传失败",
 		jsContent4:'您只能上传图片文件！',
 		jsContent5:'Image must smaller than 5MB!',
-		jsContent6:"Can't find the TCX color",
+		jsContent6:"找不到这个TCX的颜色",
 	},
 	DesignDetailEnd:{
-		NewApparel:'New Apparel',
-		NewPrint:'New Print',
-		Placement:'Placement',
-		Overall:'Overall',
-		Single:'Single',
-		NewColor:'New Color',
-		preview:'preview',
-		Layout:'Layout',
-		jsContent1:'Please select print',
+		NewApparel:'选择的服装',
+		NewPrint:'选择的印花',
+		Placement:'模式',
+		Overall:'整体',
+		Single:'单个',
+		NewColor:'选择的颜色',
+		preview:'预览',
+		Layout:'布局',
+		jsContent1:'请选择印个印花',
 	},
 	DesignPrintOperation:{
-		Placement:'Placement',
-		Overall:'Overall',
-		Single:'Single',
-		Random:'Random',
-		inputContent:'Please input',
-		preview:'preview',
-		jsContent1:'The above changes are not saved, being sure to continue? ',
+		Placement:'调整位置',
+		Overall:'整体',
+		Single:'单个',
+		Random:'随机',
+		inputContent:'输入名字进行搜索',
+		preview:'预览',
+		jsContent1:'以上操作没有保存，是否继续? ',
+	},
+	uploadFile:{
+		jsContent1:'您最多可以选择8张图片哦',
 	},
 }
--- a/src/store/uploadFile/uploadFile.ts
+++ b/src/store/uploadFile/uploadFile.ts
@@ -1,8 +1,8 @@
 import {Module} from 'vuex'
 import {RootState} from '../index'
 import { message } from "ant-design-vue";
+import { useI18n } from "vue-i18n";
 import GO from '@/tool/GO';
-
 interface UploadFiles{
 	moodboard:any,
 	disposeMoodboard:any,
@@ -90,9 +90,11 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 			}else{
 				arr = state.printboard
 			}
+			
 			if(file.length == 0){
 				if(arr.length >= 8){
-					message.warning('You can select up to 8 images')
+					// message.warning(GO.jsContent1)
+					message.warning(data.jsContent1)
 				}else{
 					data.checked = true
 					file.push(data)
@@ -107,7 +109,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 				}
 				if(str){
 					if(arr.length >= 8){
-						message.warning('You can select up to 8 images')
+						message.warning(data.jsContent1)
 					}else{
 						data.checked = true
 						file.push(data)
--- a/src/views/HistoryPage.vue
+++ b/src/views/HistoryPage.vue
@@ -8,7 +8,7 @@
            <div class="page_content_body">
                <HeaderComponent></HeaderComponent>
                <div class="history_page_body">
-                    <div class="history_header">{{ $t('HistoryPage.History') }}History</div>
+                    <div class="history_header">{{ $t('HistoryPage.History') }}</div>
                    <div class="history_table_search">
                        <a-range-picker class="range_picker" v-model:value="rangePickerValue" :placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]" valueFormat="YYYY-MM-DD">
                            <template #suffixIcon>
@@ -32,7 +32,7 @@
                            bordered:false
                         }">
 						  <template #bodyCell="{ column, text, record ,index}">
-								<div class="operate_list" v-if="column.title === 'Operations'">
+								<div class="operate_list" v-if="column?.Operations">
 									<div class="operate_item" @click="turnToDetail(record)">{{ $t('HistoryPage.Detail') }}</div>
 									<div class="operate_item" @click="renameCollection(record,index)">{{ $t('HistoryPage.Rename') }}</div>
 									<div class="operate_item" @click="retrieveHome(record)">{{ $t('HistoryPage.Retrieve') }}</div>
@@ -97,6 +97,7 @@ export default defineComponent({
                fixed: 'right',
                width: 150, 
                // slots:{customRender:'action'}
+				Operations:true,
            },
        ]);
        let collectionList:any = ref([])
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1324,7 +1324,5 @@ export default defineComponent({

 	}
 }
-.ant-message{
-		z-index: 1049 !important;
-	}
+
 </style>
--- a/src/views/LibraryPage.vue
+++ b/src/views/LibraryPage.vue
@@ -234,10 +234,10 @@
                                </div>

                                <div class="content_body_table scroll_style">
-                                    <div class="content_img_item" v-for="(img,index) in imgList" :key="img.id" @click="selectImgItem(img)">
+                                    <div class="content_img_item" v-for="(img,index) in generateList" :key="img.id" @click="selectImgItem(img)">
                                        <div :class="['content_img_item_block', selectImgList.indexOf(img.id) > -1 ? 'select_item_img' :'']">
-                                            <img v-lazy="img.url" :key="img.url" :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']"/>
-                                            <div class="img_item_hover">
+                                            <img v-lazy="img.imgUrl" :key="img.imgUrl" :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']"/>
+                                            <!-- <div class="img_item_hover">
                                                <div class="img_operate_content">
                                                    <div class="img_operate_block" @click.stop="editPlacementClick(img)" v-show="selectCode === 'Models'">
                                                        <span class="icon iconfont icon-tianxie operate_icon"></span>
@@ -249,25 +249,17 @@
                                                        <span class="icon iconfont icon-shanchu operate_icon"></span>
                                                    </div>
                                                </div>
-                                            </div>
+                                            </div> -->
                                        </div>
-                                        <div class="content_img_name">{{img.name}}</div>
+                                        <div class="content_img_name"></div>
                                    </div>
                                    <div class="no_data_block" v-show="!imgList.length && !isShowMark">
                                        <img src="@/assets/images/homePage/null_img.png">
                                    </div>
                                </div>

-                                <div class="table_pagination" v-show="imgList.length">
-                                    <a-pagination
-                                        
-                                        v-model:current="currentPage"
-                                        v-model:pageSize="pageSize"
-                                        :total="total"
-                                        :showQuickJumper="true"
-                                        :showSizeChanger="false"
-                                        @change="changePage"
-                                    />
+                                <div class="table_pagination" v-show="generateList.length">
+                                  
                                </div>
 							</div>
                        </div>
@@ -381,16 +373,156 @@ export default defineComponent({
 		let generateCheckbox:any = ref()
 		let captionGeneration:any = ref()
 		let inputTime = ref()
-		let generateList:any = ref([])
+		let generateList:any = ref([
+    {
+        "id": 266,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735547_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065908Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=910634477c4188db039cfddfa69147c02d354200989a6515ee80dc9b939e6b83"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    },
+    {
+        "id": 267,
+        "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
+    }
+])
 		let selectGenerateList:any = ref([])
 		let printModel = ref({
 			num:1,
 			optype:false,
-			name:'model1'
+			name:useI18n().t('LibraryPage.model')+'1'
 		})
 		let {t} = useI18n()
-		console.log();
-		
+
        return {
            menuList,
            selectImgList,
@@ -421,7 +553,7 @@ export default defineComponent({
 			generateList,
 			selectGenerateList,
 			printModel,
-			t
+			t,
        }
    },
 	data(this_) {
@@ -868,7 +1000,7 @@ export default defineComponent({
 			this.printModel = {
 				num : num,
 				optype:false,
-				name:'model'+num
+				name:this.t('LibraryPage.model')+num
 			}
 		},
 		getgenerate(){
@@ -877,7 +1009,7 @@ export default defineComponent({
 			let data = {
 				generateType:generateType,
 				designType:'',
-				collectionElementId:generageImg.id,
+				collectionElementId:generageImg?.id,
 				level1Type:this.selectCode,
 				level2Type:this.selectCode == 'Sketchboard'?this.designType:'',
 				text:this.captionGeneration,
@@ -886,7 +1018,7 @@ export default defineComponent({
 				gender:this.selectCode == 'Sketchboard'?this.sex:'',
 			}
 			if(generateType == 'image'||generateType == 'text-image'){
-				if(generageImg.id){
+				if(generageImg?.id){
 					
 				}else{
 					message.warning(
@@ -914,22 +1046,26 @@ export default defineComponent({
 					return
 				}
 			}
-			Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
-                (rv) => {
-					if(rv){
-						this.generateList = []
-						let arr
-						rv.generatedCollectionItems.forEach((v:any,index:number)=>{
-							arr = {
-								id:rv.generatedCollectionItems[index].generateItemId,
-								imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
-							}
-						this.generateList.push(arr)
-						})
-					}
-                }
-            ).catch(res=>{
-            });
+			// this.isShowMark = true
+			// Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
+            //     (rv) => {
+			// 		if(rv){
+			// 			let arr
+			// 			rv.generatedCollectionItems.forEach((v:any,index:number)=>{
+			// 				arr = {
+			// 					id:v.generateItemId,
+			// 					imgUrl:v.generateItemUrl,
+			// 				}
+			// 			this.generateList.push(arr)
+			// 			console.log(this.generateList);
+						
+			// 			})
+			// 			this.isShowMark = false
+			// 		}
+            //     }
+            // ).catch(res=>{
+			// 	this.isShowMark = false
+            // });
 		},
    }
 })
@@ -960,6 +1096,7 @@ export default defineComponent({
 			flex-direction: column;
            
            .library_page_body{
+				overflow: hidden;
                width: 100%;
                // height: calc(100% - 7rem);
 				flex: 1;
@@ -1263,7 +1400,7 @@ export default defineComponent({
 													line-height: 2;
 													cursor: pointer;
 													&.printModel_item:hover{
-														background: rgba(0,0,0,.4);
+														background: #949396;
 													}
 												}
 											}
@@ -1294,6 +1431,9 @@ export default defineComponent({
 								flex-wrap: wrap;
 								justify-content: flex-start;
 								align-content: flex-start;
+								&.content_body_table::-webkit-scrollbar {
+									display: none;
+								}
                                .content_img_item{
                                    display: inline-block;
                                    vertical-align: top;
@@ -1389,8 +1529,9 @@ export default defineComponent({

                            .table_pagination{
                                text-align: center;
-                                margin-top: 2rem;
+								// height: 5.2rem;
 								flex: 1;
+                                margin-top: 2rem;
                            }
                        }
                    }