![]()
@@ -211,6 +211,7 @@ export default defineComponent({
let generateCheckbox:any = ref()
let loadingShow = ref(false)
+ let isGenerate = ref(false)
let sketchCatecoryList:any = computed(()=>{
return store.state.Workspace.workspacePosition
@@ -243,6 +244,7 @@ export default defineComponent({
store,
generateCheckbox,
loadingShow,
+ isGenerate,
sketchCatecoryList,
workspace,
inputShow,
@@ -620,7 +622,7 @@ export default defineComponent({
// );
// return
// }
- if(this.loadingShow){
+ if(this.isGenerate){
return
}
let generage:any = this.$refs.Generate
@@ -691,7 +693,7 @@ export default defineComponent({
}
}
- this.loadingShow = true
+ this.isGenerate = true
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
(rv) => {
if(data.isTestUser){
@@ -699,7 +701,7 @@ export default defineComponent({
message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount,str:this.t('collectionModal.Printboard')}));
}else if(rv.leftUsageCount == 0){
message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Printboard')}));
- this.loadingShow = false
+ this.isGenerate = false
return
}
}
@@ -715,7 +717,7 @@ export default defineComponent({
},10000)
}
).catch(res=>{
- this.loadingShow = false
+ this.isGenerate = false
});
},
setGenerate(){
@@ -731,7 +733,7 @@ export default defineComponent({
let data = this.generateList.filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId);
Https.axiosPost(Https.httpUrls.generateResult, data).then(
(rv) => {
- if(this.loadingShow){//防止取消后有正在执行的获取状态
+ if(this.isGenerate){//防止取消后有正在执行的获取状态
let arr:any = []
arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' && item.status != 'Invalid')
rv.forEach((element:any) => {
@@ -740,14 +742,12 @@ export default defineComponent({
this.generateList[index] = element
element.imgUrl = element.url
element.id_ = GO.id++
- if(element.category){
- this.sketchCatecoryList.forEach((itemCategory:any) => {
- if(itemCategory.value == element.category){
- element.categoryValue = itemCategory?.name
- element.category = itemCategory?.value
- }
- });
- }
+ this.sketchCatecoryList.forEach((itemCategory:any) => {
+ if(itemCategory.value == element.category){
+ element.categoryValue = itemCategory?.name
+ element.category = itemCategory?.value
+ }
+ });
}
});
});
@@ -765,7 +765,7 @@ export default defineComponent({
this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
clearInterval(this.generateTime)
clearInterval(this.remGenerateTime)
- this.loadingShow = false
+ this.isGenerate = false
this.remGenerate = false
}
}
@@ -774,7 +774,7 @@ export default defineComponent({
this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
clearInterval(this.generateTime)
clearInterval(this.remGenerateTime)
- this.loadingShow = false
+ this.isGenerate = false
});
},1000)
},
@@ -782,7 +782,7 @@ export default defineComponent({
let arr = this.generateList.filter((item:any)=>item.status != 'Success')
//取消操作
this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')
- this.loadingShow = false
+ this.isGenerate = false
clearInterval(this.generateTime)
if(arr){
let str = arr.map((obj:any) => obj.taskId).join(',');
diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue
index 023012c9..cd616b38 100644
--- a/src/component/HomePage/scaleImage.vue
+++ b/src/component/HomePage/scaleImage.vue
@@ -21,6 +21,10 @@
@@ -70,6 +74,8 @@ export default defineComponent({
])
let scaleImageMask:any = ref(false)
let scaleImageIndex:any = ref(0)
+
+ let robotAssits:any = ref(0)
return {
scaleImage,
loadingShow,
@@ -78,6 +84,8 @@ export default defineComponent({
scaleImageList,
scaleImageMask,
scaleImageIndex,
+
+ robotAssits,
};
},
data() {
@@ -104,10 +112,11 @@ export default defineComponent({
mounted() {
},
methods: {
- init(list:any,index:any){
+ init(list:any,index:any,dialogueIndex:any){
this.scaleImage = true
this.scaleImageList = list
this.scaleImageIndex = index
+ if(dialogueIndex)this.robotAssits = dialogueIndex
// let scaleImageList = this.store.state.UploadFilesModule.moodboard
},
cancelDsign(){
@@ -134,6 +143,15 @@ export default defineComponent({
setScaleImageIndex(index:any){
this.scaleImageIndex = index
},
+ LikeFile(item:any,str:string){
+ let parent:any = this.$parent
+ if(this.robotAssits){
+ parent.likeFile(item,this.scaleImageIndex,this.robotAssits)
+ }else{
+ parent.likeFile(item,str)
+ }
+
+ }
},
});
@@ -197,12 +215,45 @@ export default defineComponent({
display: flex;
justify-content: center;
height: 75%;
+ margin: 0 auto;
margin-top: calc(5rem*1.2);
+ position: relative;
+ max-width: calc(50rem*1.2);
+
img{
width: auto;
- max-width: calc(50rem*1.2);
height: 100%;
}
+ .img_operate_block{
+ width: 3.6rem;
+ height: 3.6rem;
+ background: rgba(0,0,0,0.6);
+ border-radius: 50%;
+ text-align: center;
+ line-height: 3.6rem;
+ cursor: pointer;
+ margin-bottom: 0.4rem;
+ position: absolute;
+ right: 2rem;
+ top: 2rem;
+ opacity: 0;
+ .operate_icon{
+ font-size: 1.8rem;
+ color: #fff;
+ &.fi-sr-heart{
+ color: red;
+ }
+ }
+ i{
+ font-size: 1.8rem;
+ color: #fff;
+ }
+ }
+ }
+ .scaleImage_content:hover{
+ .img_operate_block{
+ opacity: 1;
+ }
}
.scaleImage_nav{
flex: 1;
diff --git a/src/component/HomePage/sketchCategory.vue b/src/component/HomePage/sketchCategory.vue
index 42706e68..5b56aa3b 100644
--- a/src/component/HomePage/sketchCategory.vue
+++ b/src/component/HomePage/sketchCategory.vue
@@ -80,7 +80,6 @@ export default defineComponent({
setup(props:any){
let showFileCategory = (file:any)=> {
file.categoryShow = true;
- console.log(props.driverClass);
nextTick().then(()=>{
if(props.driver__){
diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue
index 549da74c..5a6d1765 100644
--- a/src/component/LibraryPage/setLabel.vue
+++ b/src/component/LibraryPage/setLabel.vue
@@ -316,7 +316,7 @@ export default defineComponent({
setLabelData(){
let data = {
"classificationIdList": [],
- "classificationName": "123221",
+ "classificationName": "",
"createTime": "",
"deleteConfirm": '',
"id": '',
@@ -326,7 +326,6 @@ export default defineComponent({
"updateTime": "",
"userId": ''
}
- console.log(this.type);
return data
},
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index d947a7af..85cc9df3 100644
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -219,7 +219,6 @@
-