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

Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

Browse Source
This commit is contained in:
zhangyahui
2026-03-25 09:48:39 +08:00
parent 2f9b33e4ca 48c37e0810
commit bfb4e128f5
8 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -853,9 +853,7 @@ export default defineComponent({
level2Type = this.sketchboardList?.[0]?.categoryValue
? this.sketchboardList[0].categoryValue
: ''
if (this.workspace.styleName) {
sloganText = `${this.workspace.styleName},${sloganText}`
}
sloganText = `${this.workspace.styleName || 'all'},${sloganText}`
} else if (this.upload.level1Type == 'Printboard') {
level2Type = this.scene?.value
if (level2Type == 'Slogan' && this.searchPictureName == '') {

6
src/component/home/index.vue
View File

@@ -196,9 +196,9 @@ export default defineComponent({
type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
httpType:rv.process,//项目类型
ageGroup:rv.workspaceVO?.ageGroup,
style:rv.workspaceVO?.style,
styleId:rv.workspaceVO?.styleId,
styleName:rv.workspaceVO?.styleName,
style:rv.workspaceVO?.style || '',
styleId:rv.workspaceVO?.styleId || null,
styleName:rv.workspaceVO?.styleName || '',
sex:rv.workspaceVO?.sex,
userBrandDnaImg:rv.workspaceVO?.userBrandDnaImg,
userBrandDnaName:rv.workspaceVO?.userBrandDnaName,

6
src/component/home/newProject/setting.vue
View File

@@ -94,9 +94,9 @@ export default defineComponent({
type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
httpType:rv.process,//项目类型
ageGroup:rv.workspaceVO.ageGroup,
style:rv.workspaceVO.style,
styleId:rv.workspaceVO.styleId,
styleName:rv.workspaceVO.styleName,
style:rv.workspaceVO.style || '',
styleId:rv.workspaceVO.styleId || null,
styleName:rv.workspaceVO.styleName || '',
sex:rv.workspaceVO.sex,
userBrandDnaImg:rv.workspaceVO.userBrandDnaImg,
userBrandDnaName:rv.workspaceVO.userBrandDnaName,

12
src/component/home/newProject/workspace.vue
View File

@@ -179,9 +179,9 @@ export default defineComponent({
dataDom.brandDNA.init(data.selectObject);
}
const setWorkspaceStyle = (value:any)=>{
data.selectObject.styleName = value.name
data.selectObject.style = value.value
data.selectObject.styleId = value.id
data.selectObject.styleName = value.name || ''
data.selectObject.style = value.value || ''
data.selectObject.styleId = value.id || null
// store.commit('setProbject',data)
}
const setWorkspaceBrandDNA = (value:any)=>{
@@ -238,9 +238,9 @@ export default defineComponent({
// type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
// httpType:rv.process,//项目类型
ageGroup:rv.workspaceVO?.ageGroup,
style:rv.workspaceVO?.style,
styleId:rv.workspaceVO?.styleId,
styleName:rv.workspaceVO?.styleName,
style:rv.workspaceVO?.style || '',
styleId:rv.workspaceVO?.styleId || null,
styleName:rv.workspaceVO?.styleName || '',
sex:rv.workspaceVO?.sex,
userBrandDnaImg:rv.workspaceVO?.userBrandDnaImg,
userBrandDnaName:rv.workspaceVO?.userBrandDnaName,

6
src/component/modules/habitSetStyle.vue
View File

@@ -102,9 +102,9 @@ setup(props,{emit}) {
// if(habitSetStyleData.styleList.length == 0){
// getStyleList()
// }
oldDataId = data.styleId
habitSetStyleData.selectStyle.id = data.styleId
habitSetStyleData.selectStyle.name = data.styleName
oldDataId = data.styleId || null
habitSetStyleData.selectStyle.id = data.styleId || null
habitSetStyleData.selectStyle.name = data.styleName || ''
// habitSetStyleData.selectStyleId = 'feng2'
}
let setCover = (item:any)=>{

2
src/store/userHabit/userHabit.ts
View File

@@ -407,7 +407,7 @@ const userHabit : Module<UserHabit,RootState> = {
item.name = name
});
// const {t} = useI18n()
rv.unshift({name:t('Model.all'),value:'',id:''})
rv.unshift({name:t('Model.all'),value:'',id:null})
store.commit('setMannequinStyle',rv)
resolve('')
}

3
src/store/workspace/workspace.ts
View File

@@ -74,7 +74,8 @@ const Workspace: Module<DesignDetail, RootState> = {
},
setProbject(state, data) {
for (const key in data) {
if (data[key] == undefined) continue
let list = ['styleName','styleId','style']
if (data[key] == undefined && !list.includes(key)) continue
state.probjects[key] = data[key]
}
},

5
src/views/HomeView/library.vue
View File

@@ -1721,9 +1721,8 @@ export default defineComponent({
sloganText = this.captionGeneration
if(this.selectCode == "Sketchboard"){
level2Type = this.selectGenerateList?.[0]?.categoryValue?this.selectGenerateList[0].categoryValue:''
if(this.workspace.styleName){
sloganText = `${this.workspace.styleName},${sloganText}`
}
// sloganText = `${this.workspace.styleName || 'all'},${sloganText}`
sloganText = `'all',${sloganText}`
}else if(this.selectCode == "Printboard"){
level2Type = this.scene?.value
if(level2Type == 'Slogan' && this.captionGeneration == ''){