修复library bug

This commit is contained in:
X1627315083
2024-04-26 16:33:41 +08:00
parent 1a2baf9278
commit ba43adb463

View File

@@ -217,9 +217,12 @@
{{ $t('LibraryPage.Generate') }} {{ $t('LibraryPage.Generate') }}
<!-- <div v-show="isGenerate"><a-spin size="large" /></div> --> <!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
</div> </div>
<div v-show="isGenerate" class="generage_btn started_btn" @click.stop="getgenerate"> <div v-show="isGenerate && !remGenerate[selectCode]" class="generage_btn started_btn" @click.stop="getgenerate">
<i class="fi fi-br-loading"></i> <i class="fi fi-br-loading"></i>
</div> </div>
<div v-show="remGenerate[selectCode]" @click="removeGenerate" class="generage_btn started_btn">
{{$t('Generate.Close')}}
</div>
<span ref="inputShowText"></span> <span ref="inputShowText"></span>
</div> </div>
</div> </div>
@@ -325,7 +328,7 @@
<div class="mark_loading" v-show="isShowMark"> <div class="mark_loading" v-show="isShowMark">
<a-spin size="large" /> <a-spin size="large" />
<div v-show="remGenerate" class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div> <!-- <div v-show="remGenerate" class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div> -->
</div> </div>
<!-- 蒙层 end--> <!-- 蒙层 end-->
@@ -420,7 +423,8 @@ export default defineComponent({
let generateList:any = ref({ let generateList:any = ref({
Sketchboard:[], Sketchboard:[],
Moodboard:[], Moodboard:[],
Printboard:[] Printboard:[],
Models:[]
}) })
let selectGenerateList:any = ref([]) let selectGenerateList:any = ref([])
@@ -445,9 +449,19 @@ export default defineComponent({
let driver__:any = computed(()=>{ let driver__:any = computed(()=>{
return store.state.Guide.guide return store.state.Guide.guide
}) })
let generateTime:any = ref() let generateTime:any = ref({
Sketchboard:'',
Moodboard:'',
Printboard:'',
Models:''
})
let isGenerate:any = ref(false) let isGenerate:any = ref(false)
let remGenerate:any = ref(false) let remGenerate:any = ref({
Sketchboard:'',
Moodboard:'',
Printboard:'',
Models:''
})
let remGenerateTime:any = ref() let remGenerateTime:any = ref()
let getLibraryListInputTime:any = ref() let getLibraryListInputTime:any = ref()
const options:any = ref([ const options:any = ref([
@@ -631,7 +645,8 @@ export default defineComponent({
this.value.labelValue = [] this.value.labelValue = []
this.getLibraryList('') this.getLibraryList('')
this.getClass() this.getClass()
this.uploadGenerate = 'Upload' if(this.selectCode == 'Models')this.uploadGenerate = 'Upload'
this.captionGeneration = '' this.captionGeneration = ''
this.selectGenerateList = [] this.selectGenerateList = []
// this.generateList = { // this.generateList = {
@@ -1057,7 +1072,7 @@ export default defineComponent({
}, },
getgenerate(){ getgenerate(){
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
this.remGenerate = false this.remGenerate[this.selectCode] = false
// if(this.isTest){//试用用户禁止使用 // if(this.isTest){//试用用户禁止使用
// message.info( // message.info(
// this.t('isTest.available') // this.t('isTest.available')
@@ -1167,9 +1182,9 @@ export default defineComponent({
arr.status = 'execution' arr.status = 'execution'
this.generateList[this.selectCode].unshift(arr) this.generateList[this.selectCode].unshift(arr)
}); });
this.setGenerate() this.setGenerate(this.selectCode)
this.remGenerateTime = setTimeout(()=>{ this.remGenerateTime = setTimeout(()=>{
this.remGenerate = true this.remGenerate[this.selectCode] = true
},10000) },10000)
} }
).catch(res=>{ ).catch(res=>{
@@ -1177,19 +1192,20 @@ export default defineComponent({
this.isGenerate = false this.isGenerate = false
}); });
}, },
setGenerate(){ setGenerate(str:any){
this.generateTime = setInterval(()=>{ this.generateTime[str] = setInterval(()=>{
let data = this.generateList[this.selectCode].filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId); let data = this.generateList[str].filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId);
Https.axiosPost(Https.httpUrls.generateResult, data).then( Https.axiosPost(Https.httpUrls.generateResult, data).then(
(rv) => { (rv) => {
if(this.isGenerate){//防止取消后有正在执行的获取状态 if(this.isGenerate){//防止取消后有正在执行的获取状态
let arr:any = [] let arr:any = []
arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' && item.status != 'Invalid') arr = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' && item.status != 'Invalid')
rv.forEach((element:any) => { rv.forEach((element:any) => {
this.generateList[this.selectCode].forEach((item:any,index:any) => { this.generateList[str].forEach((item:any,index:any) => {
if(item.taskId == element.taskId && element.status == 'Success'){ if(item.taskId == element.taskId && element.status == 'Success'){
element.imgUrl = element.url element.imgUrl = element.url
this.generateList[this.selectCode][index] = element this.generateList[str][index] = element
this.disignTypeList.forEach((itemCategory:any) => { this.disignTypeList.forEach((itemCategory:any) => {
if(itemCategory.value == element.category){ if(itemCategory.value == element.category){
element.categoryValue = itemCategory?.label element.categoryValue = itemCategory?.label
@@ -1204,18 +1220,20 @@ export default defineComponent({
message.info(this.t('Generate.effectPoor')); message.info(this.t('Generate.effectPoor'));
} }
if(arr.length == 0){ if(arr.length == 0){
this.generateList[this.selectCode] = this.generateList[this.selectCode].filter((item:any)=>item.status == 'Success') this.generateList[str] = this.generateList[str].filter((item:any)=>item.status == 'Success')
clearInterval(this.generateTime) clearInterval(this.generateTime[str])
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
// this.isShowMark = false // this.isShowMark = false
this.remGenerate = false this.remGenerate[this.selectCode] = false
this.isGenerate = false this.isGenerate = false
}else{
} }
} }
} }
).catch(res=>{ ).catch(res=>{
this.generateList[this.selectCode] = this.generateList[this.selectCode].filter((item:any)=>item.status == 'Success') this.generateList[str] = this.generateList[str].filter((item:any)=>item.status == 'Success')
clearInterval(this.generateTime) clearInterval(this.generateTime[str])
clearInterval(this.remGenerateTime) clearInterval(this.remGenerateTime)
// this.isShowMark = false // this.isShowMark = false
this.isGenerate = false this.isGenerate = false
@@ -1227,8 +1245,8 @@ export default defineComponent({
this.generateList[this.selectCode] = this.generateList[this.selectCode].filter((item:any)=>item.status == 'Success') this.generateList[this.selectCode] = this.generateList[this.selectCode].filter((item:any)=>item.status == 'Success')
// this.isShowMark = false // this.isShowMark = false
this.isGenerate = false this.isGenerate = false
this.remGenerate = false this.remGenerate[this.selectCode] = false
clearInterval(this.generateTime) clearInterval(this.generateTime[this.selectCode])
if(arr){ if(arr){
let str = arr.map((obj:any) => obj.taskId).join(','); let str = arr.map((obj:any) => obj.taskId).join(',');
let data = {uniqueId:str,userId:(this?.userInfo as any)?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone} let data = {uniqueId:str,userId:(this?.userInfo as any)?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}