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:
zhangyh
2025-11-20 13:47:53 +08:00
parent e6d657eaf1 2249bf614f
commit 4b2553fa10
6 changed files with 459 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,7 @@ export default defineComponent({
storeData.positionList = position
store.commit('setProbject',storeData)
// setChatData()
if(route.name == 'tools'){
if(route.name == 'toolsPage'){
getCollection('tools',null)
}else{
getCollection('design',null)

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

@@ -84,7 +84,7 @@
</div>
</div>
<div class="complete">
<div class="gallery_btn" style="padding: 0rem 2.2rem; line-height: 4.5rem;font-weight: 500;" @click="complete">{{ sourceType == 'edit' ? $t('HomeView.Save') : $t('HomeView.Start')}}</div>
<div class="gallery_btn" style="padding: 0rem 2.2rem; line-height: 4.5rem;font-weight: 500;" @click="complete(sourceType)">{{ sourceType == 'edit' ? $t('HomeView.Save') : $t('HomeView.Start')}}</div>
</div>
</div>
<habitSetStyle ref="habitSetStyle" @setWorkspaceStyle="setWorkspaceStyle" :mannequinStyle="mannequinStyle"></habitSetStyle>
@@ -201,12 +201,11 @@ export default defineComponent({
const formatterBrandDNA = (value: number)=>{
return `${value}%`;
}
const complete = ()=>{
const complete = (sourceType)=>{
// if(!data.selectObject.name){
// message.info(t('PrintboardUpload.jsContent7'))
// return
// }
console.log(data.selectObject)
let value = {
name:data.selectObject.name,
process:props.httpWorkflowType,
@@ -227,6 +226,10 @@ export default defineComponent({
}
Https.axiosPost(Https.httpUrls.projectSaveOrUpdate,value).then((rv)=>{
if(rv){
if((sourceType == 'edit' && data.selectObject.id == rv.id) || sourceType != 'edit'){
store.state.Workspace.cachedRoutes = [];
store.commit('setProjectPath','')
}
data.selectObject.id = rv.id
let storeData = {

26
src/component/toolsPage/index.vue
View File

@@ -5,18 +5,24 @@
:productimgMenu="{value:'ToProductImage',label:$t('ProductImg.ProductImage')}"
class="toProduct"
:isState="openType =='toProduct'"
v-if="openType == 'toProduct'"
v-if="openType == 'toProduct' || currentProjectPath.includes('toProduct')"
v-show="openType == 'toProduct'"
></toProduct>
<toProduct ref="relight"
:productimgMenu="{value:'Relight',label:$t('ProductImg.Relight')}"
class="relight"
:isState="openType =='relight'"
v-if="openType == 'relight'"
v-if="openType == 'relight' || currentProjectPath.includes('relight')"
v-show="openType == 'relight'"
></toProduct>
<poseTransfer v-if="openType == 'poseTransfer'" ref="poseTransfer"></poseTransfer>
<deReconstruction v-if="openType == 'deReconstruction'" ref="deReconstruction"></deReconstruction>
<patternMaking3D v-if="openType == 'patternMaking3D'" ref="patternMaking3D"></patternMaking3D>
<canvasUpload v-if="openType == 'canvasUpload'" ref="canvasUpload" @canvasChangeGetJSON="canvasChangeGetJSON" :isSubmitCanvasJSON="true"></canvasUpload>
<poseTransfer v-if="openType == 'poseTransfer' || currentProjectPath.includes('poseTransfer')"
v-show="openType == 'poseTransfer'" ref="poseTransfer"></poseTransfer>
<deReconstruction v-if="openType == 'deReconstruction' || currentProjectPath.includes('deReconstruction')"
v-show="openType == 'deReconstruction'" ref="deReconstruction"></deReconstruction>
<patternMaking3D v-if="openType == 'patternMaking3D' || currentProjectPath.includes('patternMaking3D')"
v-show="openType == 'patternMaking3D'" ref="patternMaking3D"></patternMaking3D>
<canvasUpload v-if="openType == 'canvasUpload' || currentProjectPath.includes('canvasUpload')"
v-show="openType == 'canvasUpload'" ref="canvasUpload" @canvasChangeGetJSON="canvasChangeGetJSON" :isSubmitCanvasJSON="true"></canvasUpload>
</div>
</div>
</template>
@@ -62,7 +68,10 @@ export default defineComponent({
width: 800,
height: 600,
backgroundColor: "#f8f8f8",
}
},
currentProjectPath:computed(() => {
return store.state.Workspace.projectPath
})
})
const dataDom:any = reactive({
toProduct:null as any,
@@ -79,7 +88,6 @@ export default defineComponent({
const setIsShowMark = (boolean:boolean)=>{
data.isShowMark = boolean
}
let settingGetHistory:any = inject('settingGetHistory')
const open = (str:any)=>{
nextTick(()=>{
@@ -92,7 +100,7 @@ export default defineComponent({
(query:any, oldQuery:any) => {
if(oldQuery && query == oldQuery)return
const key = Object.keys(query)?.[0]
if(route.name == 'tools' && key){
if(route.name == 'toolsPage' && key){
data.openType = query[key]
nextTick(()=>{
open(query[key])