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

Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

Browse Source
This commit is contained in:
李志鹏
2026-04-08 11:06:33 +08:00
parent 41e530d33d bb021ae9ac
commit 4da9c06aa9
22 changed files with 1810 additions and 2300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/component/Administrator/Transaction/TransactionTable.vue
View File

@@ -148,6 +148,7 @@
total: total,
showQuickJumper: true,
bordered: false,
showTotal: (total) => `Total Transaction: ${total}`
}"
>
<template #bodyCell="{ column, text, record, index }">
@@ -465,13 +466,16 @@ export default defineComponent({
(rv: any) => {
if (rv) {
// this.dataList = rv
// console.log('rv----',rv);
filter.dataList = rv.content;
filterData.total = rv.total;
filter.tableLoading = false;
filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
return total + (isNaN(value) ? 0 : value);
}, 0);
filterData.totalPayer = rv.totalAmount;
// filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
// const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
// return total + (isNaN(value) ? 0 : value);
// }, 0);
// this.workspaceItem.position = this.singleTypeList[0].label
}

2
src/component/Canvas/index.vue
View File

@@ -7,7 +7,7 @@
:enabledRedGreenMode="false"
/>
</div>
<div class="btn">123
<div class="btn">
<div class="gallery_btn" @click="exportElement">Export</div>
</div>
</div>

1
src/component/Detail/detailLeft/sketch.vue
View File

@@ -76,6 +76,7 @@ export default defineComponent({
selectImgItem(data)
return
}
data.id = id
if(data?.imgUrl)data.url = data.imgUrl
let value = {
data,

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 == '') {

1
src/component/HomePage/UpgradePlan.vue
View File

@@ -7,6 +7,7 @@
:get-container="() => $refs.upgradePlan"
width="35%"
height="auto"
zIndex="9999999"
:maskClosable="false"
:centered="true"
:closable="false"

3
src/component/home/design/index.vue
View File

@@ -379,6 +379,7 @@ export default defineComponent({
setup(props,{emit}) {
const {t,locale} = useI18n()
const store = useStore();
const route = useRoute()
const editDesignType = reactive({
selectProbject:computed(()=>{
return store.state.Workspace.probjects
@@ -624,6 +625,7 @@ export default defineComponent({
collItemSize.collTime = setTimeout(()=>{
nextTick(()=>{
let parentWidth = likeItemDom.value.parentElement.offsetWidth
if(parentWidth == 0)return
collItemSize.widthValue.value = collItemSize.widthValue.value == -1?100:collItemSize.widthValue.value
collItemSize.widthValue.value = collItemSize.widthValue.value > parentWidth?parentWidth:collItemSize.widthValue.value
collItemSize.collValue = Math.floor(parentWidth / collItemSize.widthValue.value)
@@ -634,7 +636,6 @@ export default defineComponent({
collItemSize.collStyle.width = (collItemDom.value.offsetWidth - 30) / 3 * collItemSize.scale[0] + 'px'
collItemSize.collStyle.height = (collItemDom.value.offsetWidth - 30) / 3 * collItemSize.scale[1] + 'px'
collItemSize.likeStyle.width = collItemSize.itemStyle.width + 'px'
collItemSize.likeStyle.height = collItemSize.itemStyle.height + 'px'
let elArr = likeItemDom.value.children

2
src/component/home/design/tools.vue
View File

@@ -271,7 +271,7 @@ export default defineComponent({
allCollectionStr.forEach((itemStr:any)=>{
let list = [] as any
allCollection[itemStr.value].forEach((imgItem)=>{
list.push({url:imgItem.url || imgItem.imgUrl})
list.push({url:imgItem?.url || imgItem?.imgUrl})
})
let obj = {
value:itemStr.value,

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,

14
src/component/home/tools/poseTransfer/index.vue
View File

@@ -352,7 +352,8 @@ export default defineComponent({
props: {
isDesignPage: {
type: Boolean,
default: false
default: false,
required:false
},
source: {
type: String,
@@ -773,7 +774,7 @@ export default defineComponent({
data.lastSelectImg = res.data
}
}
// 同步尾帧文件列表到全局 store
// 同步尾帧文件列表到全局 store（使用专门的 lastFrameList）
store.commit('setPoseTransferLastFrameList', {
str: 'set',
list: [file]
@@ -989,6 +990,7 @@ export default defineComponent({
if (data.lastSelectImg?.id === item.id) {
data.lastSelectImg = {}
}
// 使用专门的 lastFrameList mutation 清空列表
store.commit('setPoseTransferLastFrameList')
} else {
// 如果删除的是当前选中的首帧，清空选中状态
@@ -1176,10 +1178,10 @@ export default defineComponent({
firstFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
item => item.frameType === 'first'
)
lastFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
item => item.frameType === 'last'
)
// 注意：尾帧通过专门的 watch (lastFrameList) 监听，不需要从这里过滤
// lastFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
// item => item.frameType === 'last'
// )
// 更新 showFirstFrameList 中项的选中状态
showFirstFrameList.value.forEach((listItem: any) => {
if (listItem.id == data.selectImg.id) {

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)=>{