diff --git a/src/component/DetailCopy/designDetail.vue b/src/component/DetailCopy/designDetail.vue
index 876374a4..fcec1ef7 100644
--- a/src/component/DetailCopy/designDetail.vue
+++ b/src/component/DetailCopy/designDetail.vue
@@ -262,7 +262,6 @@ export default defineComponent({
let gradient = null
let newData = list[i]?.newDetail?.[detailData.currentDetailType]
let isCurrent = list[i].id == detailData?.selectDetail?.id
-
let data:any = {
changed:false,
color:(newData && detailData.currentDetailType == 'color' && isCurrent)?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`,
@@ -278,7 +277,7 @@ export default defineComponent({
priority,
scale,
type:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.level2Type:list[i].type,
- sketchString:'',
+ sketchString:list[i].sketchString?list[i].sketchString:'',
trims:(newData && detailData.currentDetailType == 'element' && isCurrent)?{prints:newData}:list[i].trims?list[i].trims:{prints:[]},
}
if((list[i].color?.gradient || list[i].newDetail?.color?.gradient)){
diff --git a/src/component/HomePage/index/index.vue b/src/component/HomePage/index/index.vue
index 00513668..5cf10b97 100644
--- a/src/component/HomePage/index/index.vue
+++ b/src/component/HomePage/index/index.vue
@@ -13,7 +13,7 @@
- state = 1" :workflowType="selectObject.type" :httpWorkflowType="selectObject.httpType" :workflowTitle="selectObject.title">
+ state = 1" :workflowType="selectObject.type" :httpWorkflowType="selectObject.httpType" :workflowTitle="opjectList.filter((item)=>item.value == selectObject.type)[0].title">
-
Cloud generation task
+
Create Cloud Generation Tasks
-
Build type *
+
Task type *
-
-
Number of images *
+
+ Quantity *
@@ -100,14 +100,14 @@
-
+
Cost credit:{{credits * numberOfImages}}
-
+
OK
@@ -183,10 +183,8 @@ export default defineComponent({
operationsData.exhibitionImgList = store.state.UploadFilesModule.modularData.design.likeData
}else if(operationsData.buildType == 'relight'){
operationsData.exhibitionImgList = store.state.UploadFilesModule.modularData.toProduct
- operationsData.numberOfImages = operationsData.exhibitionImgList.length
}else if(operationsData.buildType == 'poseTransfer'){
operationsData.exhibitionImgList = store.state.UploadFilesModule.modularData.toProduct
- operationsData.numberOfImages = operationsData.exhibitionImgList.length
}
props.cloudList.forEach((item)=>{
if(item.value == operationsData.buildType){
@@ -269,11 +267,12 @@ export default defineComponent({
let setOk = ()=>{
let data
data = setAddData()
- console.log(data)
- if(operationsData.buildType == 'toProductImage' || operationsData.buildType == 'relight'){
- if(data.toProductImage.toProductImageVOList.length == 0)return message.warning('Please select the image')
+ if(operationsData.buildType == 'toProductImage'){
+ if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("You need to go to the Design module and generate a design result first before you can use the 'To Product Image' cloud generation feature.")
+ }else if(operationsData.buildType == 'relight'){
+ if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("You need to go to the 'To Product Image' module and generate a result first before you can use the 'Relight' cloud generation feature.")
}else if(operationsData.buildType == 'poseTransfer'){
- if(data.poseTransform.length == 0)return message.warning('Please enter the number of images')
+ if(data.poseTransform.length == 0)return message.warning("You must first generate results in the 'To Product Image' module before you can use the 'Transfer Pose' cloud generation feature.")
}
if(!data.buildType || !data.nums)return message.warning('Please check the input box marked with *')
operations.loadingShow = true
@@ -288,6 +287,13 @@ export default defineComponent({
operations.loadingShow = false
})
}
+ const changeNumberOfImages = ()=>{
+ if(operationsData.buildType =='relight' || operationsData.buildType == 'poseTransfer'){
+ if(operationsData.exhibitionImgList.length < Number(operationsData.numberOfImages)){
+ operationsData.numberOfImages = operationsData.exhibitionImgList.length
+ }
+ }
+ }
return {
...toRefs(operations),
...toRefs(operationsData),
@@ -297,6 +303,7 @@ export default defineComponent({
blur,
setOk,
changeBuildType,
+ changeNumberOfImages,
};
},
data() {
diff --git a/src/component/HomePage/index/model/cloudUploading/index.vue b/src/component/HomePage/index/model/cloudUploading/index.vue
index b4eaac23..a0c2296e 100644
--- a/src/component/HomePage/index/model/cloudUploading/index.vue
+++ b/src/component/HomePage/index/model/cloudUploading/index.vue
@@ -9,7 +9,7 @@
-
Create cloudUploading
+
Create
@@ -125,23 +125,43 @@ export default defineComponent({
},
cloudTiltleList:[
{
- name:'File name',
- value:'name',
- },{
- name:'Build Type',
+ name:'Task type',
value:'buildType',
+ fun:(value:any)=>{
+ let str = ''
+ if(value == 'design')str = 'Design'
+ if(value == 'toProductImage')str = 'To Product Image'
+ if(value == 'relight')str = 'Relight'
+ if(value == 'poseTransfer')str = 'Transfer Pose'
+ return str
+ }
},{
- name:'Generate quantity',
+ name:'Quantity generated',
value:'nums',
},{
- name:'Task time',
+ name:'Creation time',
value:'updateTime',
fun:(value:any)=>{
if(!value)return
return value.split('T')[0] + ' ' + value.split('T')[1].split('.')[0]
}
},{
- name:'Schedule',
+ name:'Start time',
+ value:'updateTime',
+ fun:(value:any)=>{
+ //没开始内容为 -
+ if(!value)return
+ return value.split('T')[0] + ' ' + value.split('T')[1].split('.')[0]
+ }
+ },{
+ name:'End time',
+ value:'updateTime',
+ fun:(value:any)=>{
+ if(!value)return
+ return value.split('T')[0] + ' ' + value.split('T')[1].split('.')[0]
+ }
+ },{
+ name:'Status',
value:'process',
fun:(value:any)=>{
if(value == '100.00%'){
diff --git a/src/component/HomePage/index/workflow/index.vue b/src/component/HomePage/index/workflow/index.vue
index c52d0411..e42e46ea 100644
--- a/src/component/HomePage/index/workflow/index.vue
+++ b/src/component/HomePage/index/workflow/index.vue
@@ -21,7 +21,7 @@
- All files
+ Cloud Generation Tasks