aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 合并冲突造成代码覆盖

Browse Source
This commit is contained in:
zhangyh
2025-10-02 12:09:21 +08:00
parent 6e8b149128
commit 0170b3dbe4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/component/HomePage/Generate.vue
View File

@@ -509,7 +509,9 @@ export default defineComponent({
(newVal, oldVal) => { (newVal, oldVal) => {
console.log('scene-------------newVal', newVal) console.log('scene-------------newVal', newVal)
if (newVal.value == 'extract') { if (newVal.value == 'extract') {
speed.speedData = speed.extractList[0] speed.speedData = {
...speed.extractList[0]
}
} else if (newVal.value == 'Logo' || newVal.value == 'Slogan') { } else if (newVal.value == 'Logo' || newVal.value == 'Slogan') {
speed.speedData.value = '' speed.speedData.value = ''
speed.speedData.label = '' speed.speedData.label = ''
@@ -519,7 +521,9 @@ export default defineComponent({
// }else{ // }else{
// speed.speedData = speed.speedList[0] // speed.speedData = speed.speedList[0]
// } // }
speed.speedData = speed.speedList[0] speed.speedData = {
...speed.extractList[0]
}
} }
}, },
{ {
@@ -537,7 +541,7 @@ export default defineComponent({
} }
} else if (props.msg == 'Printboard') { } else if (props.msg == 'Printboard') {
scene.value = { scene.value = {
name: t('PrintboardUpload.Pattern'), name: t('PrintboardUpload.GeneratePrint'),
value: 'Pattern' value: 'Pattern'
} }
} }