Merge branch 'localDevelop' into develop

This commit is contained in:
X1627315083
2024-04-24 14:50:28 +08:00
8 changed files with 279 additions and 74 deletions

View File

@@ -182,7 +182,7 @@
</div>
<div v-show="openClick == 3" class="modal_accomplish">
<div class="input_border">
<div class="Guide_1_9_2 input_box" :class="[inputShow || inputShowEffectPoor?'active':'',driver__.driver?'showEvents':'']">
<div class="Guide_1_9_2 input_box" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']">
<input class="search_input" @input="ifMaximumLength" @keydown.enter="getgenerate" :maxlength='inputShow?0:9999' :class="{forbidden:generateCheckbox}" :readonly="generateCheckbox" :placeholder="$t('PrintboardUpload.inputContent1')" v-model="captionGeneration">
<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
<span ref="inputShowText"></span>
@@ -305,7 +305,6 @@ export default defineComponent({
})
let workspace:any = ref({})
let inputShow = ref(false)
let inputShowEffectPoor = ref(false)//表示是否出现红框
let inputTime = ref()
let sketchboardList:any = computed(()=>{
return store.state.UploadFilesModule.sketchboard
@@ -335,7 +334,6 @@ export default defineComponent({
sketchCatecoryList,
workspace,
inputShow,
inputShowEffectPoor,
inputTime,
sketchboardList,
t,
@@ -646,7 +644,6 @@ export default defineComponent({
(this.$refs.inputShowText as any).innerHTML = this.t('SketchboardUpload.maximumLength')
this.inputShow = true
}else{
this.inputShowEffectPoor = false
this.inputShow = false
}
},500)
@@ -770,7 +767,8 @@ export default defineComponent({
let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
let data = {
generateType:generateType,
designType:this.useGenerate.designType,
// designType:this.useGenerate.designType,
designType:'collection',
collectionElementId:this.useGenerate.imgId,
level1Type:this.upload.level1Type,
level2Type:this.useGenerate.level2Type,
@@ -882,15 +880,21 @@ export default defineComponent({
this.generateList[index] = element
element.imgUrl = element.url
element.id_ = GO.id++
element.category = generage.level2Type?generage.level2Type:sketchCatecoryList[0].name
element.categoryValue = categoryValue?categoryValue:sketchCatecoryList[0].value
if(element.category){
this.sketchCatecoryList.forEach((itemCategory:any) => {
if(itemCategory.name == element.category){
element.categoryValue = itemCategory?.value
element.category = itemCategory?.name
}
});
}
}
});
});
// this.generateList = rv;
if(rv.filter((item:any)=>item.status == 'Invalid').length == 4) {
(this.$refs.inputShowText as any).innerHTML = this.t('Generate.effectPoor')
this.inputShowEffectPoor = true
if(rv.length == 4 && rv.filter((item:any)=>item.status == 'Invalid').length == 4) {
message.info(this.t('Generate.effectPoor'));
// (this.$refs.inputShowText as any).innerHTML = this.t('Generate.effectPoor')
}
if(arr.length == 0){
nextTick().then(()=>{