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

This commit is contained in:
zhangyh
2025-10-02 12:09:21 +08:00
parent 6e8b149128
commit 0170b3dbe4

View File

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