push Develop

This commit is contained in:
X1627315083
2024-06-17 09:39:01 +08:00
parent c93483e36f
commit 363b880276
55 changed files with 5880 additions and 1359 deletions

View File

@@ -105,11 +105,11 @@
<div class="habit_System_Designer_text_max">
<div class="habit_System_Designer_text">
{{ $t('Habit.System') }}<span>({{systemDesigner.system}}%)</span>
{{ $t('Habit.System') }}<span>({{systemDesigner.designer}}%)</span>
</div>
<div class="habit_System_Designer_text">
{{ $t('Habit.Designer') }}<span>({{systemDesigner.designer}}%)</span>
{{ $t('Habit.Designer') }}<span>({{systemDesigner.system}}%)</span>
</div>
</div>
</div>
@@ -811,17 +811,18 @@ export default defineComponent({
// },
setWorkspaceStyle(data: any){
this.workspaceItem.styleId = data
this.putWorkspace(this.workspaceItem,'')
this.putWorkspace(this.workspaceItem,this.workspaceItem.id)
},
setStyle(){
this.openType.habit = false
// this.openType.habit = false
let habitSetStyle:any = this.$refs.habitSetStyle;
habitSetStyle.habitSetStyleMask = true
// habitSetStyle.habitSetStyleMask = true
// habitSetStyle.styleList = this.styleList
habitSetStyle.init();
habitSetStyle.init(this.workspaceItem);
},
setParentData(){
this.openType.habit = true
// this.openType.habit = true
// this.getDetail(this.workspaceItem.id)
},
},
});