修复部分bug部分页面的调整

src/component/home/batchGeneration/createCloud.vue

@@ -311,7 +311,6 @@ export default defineComponent({
 		}
 		const getImageStrength = (num) => {
 			let imageStrength = num == 100? 95 :num
-			console.log(num)
 			return imageStrength;
 		};
 		const getPoseTransformData = ()=>{
@@ -332,7 +331,7 @@ export default defineComponent({
 				SERIES_DESIGN:"design",
 				TO_PRODUCT_IMAGE:"toProductImage",
 				RELIGHT:"relight",
-				POSE_TRANSFORM:"poseTransfer"
+				POSE_TRANSFER:"poseTransfer"
 			}
 			return {
 				"buildType": buildTypeCorresponding[operationsData.buildType],
@@ -383,7 +382,12 @@ export default defineComponent({
 				if (rv) {
 					operations.loadingShow = false
 					cancelDsign()
-					emit('getContentList')
+					let porjectData = operationsData.objectList.find(item => item.id === operationsData.projectData)
+					let project = {
+						value:porjectData?.id,
+						label:porjectData?.name,
+					}
+					emit('getContentList',project)
 				}
 			}).catch((error) => {
 				operations.loadingShow = false

src/component/home/batchGeneration/index.vue

@@ -9,7 +9,7 @@
 				</div>
 			</div>
 			<div class="searchObject generalModel_state">
-				<div class="generalModel_state_item smail">
+				<div class="generalModel_state_item smail" style="margin-right: 1rem;">
 					<span>Project :</span>
 					<a-select
 						v-model:value="projectData"
@@ -34,7 +34,8 @@
 				</div>
 			</div>
 			<div class="createCloud">
-				<div class="gallery_btn" @click="createClound">Create</div>
+				<div class="gallery_btn" style="margin-right: 2rem;" @click="pagination">Search</div>
+				<div class="gallery_btn white" @click="createClound">Create</div>
 			</div>
 		</div>
 		<div class="contentList">
@@ -55,13 +56,13 @@
 					</td>
 				</tr>
 			</div>
-			<a-pagination style="text-align: center;" v-model:current="currentPage" :total="total" show-less-items />
+			<a-pagination style="text-align: center;" @change="pagination" v-model:current="currentPage" :total="total" show-less-items />
 		</div>
 		<createCloud ref="createCloud" :cloudList="generateList.seriesDesign" @getContentList="submitGetContentList"></createCloud>
 	</div>
 </template>
 <script lang="ts">
-import { defineComponent,computed,ref,onMounted,nextTick,createVNode,toRefs, reactive, onBeforeUnmount} from 'vue'
+import { defineComponent,computed,ref,onMounted,nextTick,createVNode,toRefs, reactive, onBeforeUnmount, inject} from 'vue'
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { Https } from "@/tool/https";
 import { useStore } from "vuex";
@@ -76,6 +77,7 @@ export default defineComponent({
 	emits:['retrieve'],
 	setup(props,{emit}) {
 		const store = useStore();
+		const router = useRouter()
 		const route = useRoute()
 		const data = reactive({
 			pageType:'list',
@@ -85,6 +87,7 @@ export default defineComponent({
 			selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
 			projectData:null as any,//批量id
 			createData:null as any,
+			settingGetHistory:inject('settingGetHistory') as any,
 			generateList:{
 				seriesDesign:[
 				{
@@ -227,6 +230,14 @@ export default defineComponent({
 			
 			dataDom.createCloud.init(data.createData,obj)
 		}
+		const createData = ()=>{
+			store.commit("createProbject");
+			store.commit("clearAllData");
+			store.commit("clearAllCollection");
+			store.commit("setAllBoardDataChoose",{});
+			store.commit("clearShowSketchboard",{});
+			store.commit("clearAllCollection");
+		}
 		const detailIamge = (item:any)=>{
 			//去除里面的T2025-04-17T13:45:43
 			if(item.process == '100.00%' || item.status == 1){
@@ -236,31 +247,50 @@ export default defineComponent({
 					size:10,
 					buildType:item.buildType,
 				}
+				createData()
 				Https.axiosPost(Https.httpUrls.getDesignCloudResult,value).then((rv)=>{
-					console.log(rv)
-					if(rv.design && rv.design.length > 0){
+					if(item.buildType == 'design'){
 						store.commit('addDesignCollectionList',rv.design)
-						emit('retrieve','design')
-					}else if(rv.toProductImage && rv.toProductImage.length > 0){
+						router.push(`/home?history=${item.projectId}&source=batch`)
+					}else if(item.buildType == 'toProductImage'){
 						store.commit('setCloudList',{str:'toProduct',list:rv.toProductImage})
-						emit('retrieve','toProduct')	
-					}else if(rv.relight && rv.relight.length > 0){
+						router.push(`/home/tools?tools=toProduct&id=${item.projectId}&source=batch`)
+					}else if(item.buildType == 'relight'){
 						store.commit('setCloudList',{str:'relight',list:rv.relight})
-						emit('retrieve','relight')	
-					}else if(rv.poseTransfer && rv.poseTransfer.length > 0){
+						router.push(`/home/tools?tools=${item.buildType}&id=${item.projectId}&source=batch`)
+					}else if(item.buildType == 'poseTransfer'){
 						store.commit('setCloudList',{str:'poseTransfer',list:rv.poseTransfer})
-						emit('retrieve','poseTransfer')	
+						router.push(`/home/tools?tools=${item.buildType}&id=${item.projectId}&source=batch`)
 					}
+					// if(rv.design && rv.design.length > 0){
+					// 	store.commit('addDesignCollectionList',rv.design)
+					// 	emit('retrieve','design')
+					// }else if(rv.toProductImage && rv.toProductImage.length > 0){
+					// 	store.commit('setCloudList',{str:'toProduct',list:rv.toProductImage})
+					// 	emit('retrieve','toProduct')	
+					// }else if(rv.relight && rv.relight.length > 0){
+					// 	store.commit('setCloudList',{str:'relight',list:rv.relight})
+					// 	emit('retrieve','relight')	
+					// }else if(rv.poseTransfer && rv.poseTransfer.length > 0){
+					// 	store.commit('setCloudList',{str:'poseTransfer',list:rv.poseTransfer})
+					// 	emit('retrieve','poseTransfer')	
+					// }
 					data.isGetContentList = false
 				})
 			}
 		}
+		const pagination = ()=>{
+			data.isGetContentList = true
+			getContentList()
+		}
+		let time = null as any
 		const getContentList = ()=>{
 			if(data.isGetContentList){
+				clearTimeout(time)
 				let value = {
 					page:data.currentPage,
 					size:data.pageSize,
-					projectId: data.projectData.id,
+					projectId: data.projectData?.value,
 				}
 				Https.axiosPost(Https.httpUrls.cloudPage,value).then((rv)=>{
 					data.contentList = rv.content
@@ -268,7 +298,7 @@ export default defineComponent({
 					let arr = rv.content
 					let result = arr.some((item:any) => (item.process !== '100.00%' && item.status !== 1));
 					if(!result)data.isGetContentList = false
-					setTimeout(()=>{
+					time = setTimeout(()=>{
 						getContentList()
 					},1500)
 				})
@@ -298,9 +328,16 @@ export default defineComponent({
 				})
 			},1000)
 		}
-		const submitGetContentList = ()=>{
+		const submitGetContentList = (project:any)=>{
 			data.isGetContentList = true
+			if(project){
+				data.projectData = project
+			}else{
+				data.projectData = null
+			}
+			data.currentPage = 1
 			getContentList()
+			if(data.settingGetHistory)data.settingGetHistory()
 		}
 		const handleChange = (event:any,value:any)=>{
 			data.createData = value
@@ -311,9 +348,12 @@ export default defineComponent({
 		onMounted(()=>{
 			data.isGetContentList = true
 			if(route.query?.id){
-				data.projectData.value = route.query?.id
-				data.projectData.label = route.query?.name
+				data.projectData = {
+					value:route.query?.id,
+					label:route.query?.name,
+				}
 			}
+			getContentList()
 			// if(route.query?.type == 'creation')dataDom.createCloud.init(data.projectData)
 		})
 		return{
@@ -325,6 +365,7 @@ export default defineComponent({
 			submitGetContentList,
 			handleChange,
 			getHistoryProjectList,
+			pagination,
 		}
 	},
 	provide() {