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

fix

Browse Source
This commit is contained in:
X1627315083
2025-04-23 16:20:53 +08:00
parent 764c7bc7ec
commit dc092b64a1
29 changed files with 126 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/style/style.css
View File

@@ -659,7 +659,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
line-height: 5.5rem;
}
.ant-select-arrow {
right: 3rem;
right: 10px;
width: auto;
height: auto;
top: 50%;

3
src/assets/style/style.less
View File

@@ -721,7 +721,8 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
}
}
.ant-select-arrow{
right: 3rem;
// right: 3rem;
right: 10px;
// width: 1.2rem;
// height: 1.2rem;
width: auto;

2
src/component/DetailCopy/canvas/argument.vue
View File

@@ -91,7 +91,7 @@
<div class="label_item" v-show="canvasGeneral.operation == 'pencil'">
<div class="title">{{ $t('exportModel.Brushwork') }}:</div>
<a-select ref="select" class="label_select" size="small" v-model:value="canvasGeneral.brushwork.value"
style="width: 12rem ;height: 6rem;"
style="width: 12rem ;"
@change="canvasGeneral.brushworkChange"
>
<a-select-option class="label_select_item" v-for="item in canvasGeneral.pencilList.brushList" :value="item.value">

6
src/component/DetailCopy/model/modelPosition.vue
View File

@@ -422,10 +422,10 @@ export default defineComponent({
height: 100%;
img{
// width: 100%;
// height: 100%;
width: 100%;
height: auto;
height: 100%;
// width: 100%;
// height: auto;
float: left;
user-select:none;
-webkit-user-drag: none;

10
src/component/HomePage/RobotAssist.vue
View File

@@ -89,7 +89,6 @@ export default defineComponent({
let {t} = useI18n()
let isTest = ref()
let store = useStore()
let workspace:any = ref({})
let driver__:any = computed(()=>{
return store.state.Guide.guide
})
@@ -110,7 +109,6 @@ export default defineComponent({
t,
isTest,
store,
workspace,
driver__,
driver__Time,
userDetail
@@ -181,11 +179,6 @@ export default defineComponent({
this.record = JSON.parse(sessionStorage.getItem("record") as string)
}
this.getBloodBars()
this.workspace = computed(()=>{
return this.store?.state?.Workspace?.workspace
})
},
directives:{
fade:{
@@ -255,8 +248,6 @@ export default defineComponent({
},
roborSend (){
this.clearTimer()
console.log(this.workspace)
return
if(!this.chatCentent){
message.info(this.t('RobotAssist.jsContent1'));
return
@@ -282,7 +273,6 @@ export default defineComponent({
"user_id" : this.userDetail?.userId,
"session_id":sessionId,
"message" : this.chatCentent,
gender:this.workspace.sexEnum.value,
}
let interaction = {onDownloadProgress: (progressEvent:any) => {
this.clearTimer()

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

@@ -13,7 +13,7 @@
</div>
</div>
</div>
<workflow v-if="selectObject?.type" ref="workflow" @goHome="()=>state = 1" :workflowType="selectObject.type" :httpWorkflowType="selectObject.httpType"></workflow>
<workflow v-if="selectObject?.type" ref="workflow" @goHome="()=>state = 1" :workflowType="selectObject.type" :httpWorkflowType="selectObject.httpType" :workflowTitle="selectObject.title"></workflow>
<div class="mark_loading" v-show="isShowMark">
<a-spin size="large" />
</div>

4
src/component/HomePage/index/model/cloudUploading/index.vue
View File

@@ -24,8 +24,8 @@
<span v-show="header.value != 'operation'">
{{header?.fun?header.fun(row[header.value]) : row[header.value]}}
</span>
<span v-show="header.value == 'operation'" @click="detailIamge(row)" style="cursor: pointer;">
Check
<span style="color: #007EE5; cursor: pointer;" v-show="header.value == 'operation'" @click="detailIamge(row)">
Review
</span>
</td>
</tr>

6
src/component/HomePage/index/model/design/index.vue
View File

@@ -376,7 +376,6 @@ export default defineComponent({
}
let getDesignTime = null as any;
const setSystemDesigner = (time:any)=>{
console.log(123)
clearTimeout(collItemSize.collTime)
collItemSize.collTime = setTimeout(()=>{
nextTick(()=>{
@@ -413,15 +412,13 @@ export default defineComponent({
posiitonData.value.generateElList = []
let elArr = collItemDom.value.querySelectorAll('.content_img_GetWidth')
designCollectionList.value.forEach((item:any,index:any)=>{
posiitonData.value.generateElList.push({
posiitonData.value.generateElList.unshift({
el: elArr[index],
sort: designCollectionList.value.length - index - 1,
index: designCollectionList.value.length - index - 1,
userLikeSortId:item.designItemId
});
})
console.log(posiitonData.value.generateElList)
}
const setDeleteDesign = (value:any,index:any)=>{
@@ -532,7 +529,6 @@ export default defineComponent({
}else{
posiitonData.value.generateSelectIndex = moveIndex;
}
console.log(elList)
let currentSort = item.sort;
for(let i = 0;i < elList.length;i++){
if(currentSort < moveIndex){

12
src/component/HomePage/index/model/patternMaking3D/index.vue
View File

@@ -101,7 +101,7 @@ export default defineComponent({
const setSelectModel = (item:any)=>{
data.isShowMark = true
const value = {
threeDSimpleId:item.threeDSimpleId,
threeDSimpleId:item.id,
}
Https.axiosPost(Https.httpUrls.getLayoutDetail,{},{params:value}).then((res:any)=>{
data.selectModel = res
@@ -111,7 +111,10 @@ export default defineComponent({
// if(data.imgOrThree){
// dataDom.threeBox.openSetData()
// }
store.commit('setPatternMaking3D',item.id)
let stateData = {
threeDsimpleId:item.id
}
store.commit('setPatternMaking3D',stateData)
}).catch((err:any)=>{
data.isShowMark = false
})
@@ -122,7 +125,7 @@ export default defineComponent({
})
const openSetData = ()=>{
nextTick(()=>{
let id = store.state.HomeStoreModule.patternMaking3D
let id = store.state.HomeStoreModule.patternMaking3D.threeDsimpleId
if(id && data.selectModel.id == -1)setSelectModel({id})
})
setTimeout(()=>{
@@ -172,8 +175,7 @@ export default defineComponent({
data.libraryOrModel = str
}
const setMaterial = (item:any)=>{
let url = item.url || item.url || item.imgUrl
dataDom.threeBox.addMaterial(url)
dataDom.threeBox.addMaterial(item)
}
return{
...toRefs(dataDom),

23
src/component/HomePage/index/model/patternMaking3D/three.vue
View File

@@ -244,11 +244,12 @@ export default defineComponent({
await addModel(url)
// addMaterial()
}
const addMaterial = (url:any)=>{
const addMaterial =async (item:any)=>{
//添加图片材质
let url = item.url || item.url || item.imgUrl
data.load.state = true
let textureLoader = new THREE.TextureLoader()
textureLoader.load(url, // 图片放在public/textures目录下
await textureLoader.load(url, // 图片放在public/textures目录下
(texture:any) => {
data.textureLoader = texture
// 3. 配置纹理参数
@@ -267,6 +268,10 @@ export default defineComponent({
const modelHeight = box.getSize(new THREE.Vector3()).y;
data.repeat.x = 2 - modelWidth / textureWidth;
data.repeat.y = 2 - modelHeight / textureHeight;
let patternMaking3D = store.state.HomeStoreModule.patternMaking3D
if(patternMaking3D.x)data.repeat.x = patternMaking3D.x
if(patternMaking3D.y)data.repeat.y = patternMaking3D.y
// texture.repeat.set(1, 1); // 纹理重复次数
texture.repeat.set(2 - data.repeat.x, 2 - data.repeat.y); // 纹理重复次数
@@ -294,7 +299,12 @@ export default defineComponent({
console.error('纹理加载失败:', error);
data.load.state = false
});
let value = {
collectionElementId:item.id,
x:data.repeat.x,
y:data.repeat.y,
}
store.commit('setPatternMaking3D',value)
})
}
@@ -376,12 +386,19 @@ export default defineComponent({
data.load.state = true
const modeUrl = await getModelUrl(value)
await setModel(modeUrl)
let patternMaking3D = store.state.HomeStoreModule.patternMaking3D
if(patternMaking3D.printMinioUrl)await addMaterial({url:patternMaking3D.printMinioUrl})
data.load.state = false
}
const changeRepeat = (e:any)=>{
clearTimeout(dataTime.updataRepeat)
dataTime.updataRepeat = setTimeout(()=>{
data.textureLoader.repeat.set(2 - data.repeat.x,2 - data.repeat.y); // 纹理重复次数
let value = {
x:data.repeat.x,
y:data.repeat.y,
}
store.commit('setPatternMaking3D',value)
},1000)
}
onMounted(()=>{

15
src/component/HomePage/index/workflow/content/index.vue
View File

@@ -1,11 +1,11 @@
<template>
<div class="contentBox" :class="{active:(selectKey_ == 'design' || selectKey_ == 'toProduct' || selectKey_ == 'relight' || selectKey_ == 'poseTransfer')}">
<seriesDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'seriesDesign'" ref="seriesDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType"></seriesDesign>
<singleProductDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'singleProductDesign'" ref="singleProductDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType"></singleProductDesign>
<sketchDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'sketchDesign'" ref="sketchDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType"></sketchDesign>
<productDrawingDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'productDrawingDesign'" ref="productDrawingDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType"></productDrawingDesign>
<printingDesign3D v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'printingDesign3D'" ref="printingDesign3D" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType"></printingDesign3D>
<printDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'printDesign'" ref="printDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType"></printDesign>
<seriesDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'seriesDesign'" ref="seriesDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" :workflowTitle="workflowTitle"></seriesDesign>
<singleProductDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'singleProductDesign'" ref="singleProductDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" :workflowTitle="workflowTitle"></singleProductDesign>
<sketchDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'sketchDesign'" ref="sketchDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" :workflowTitle="workflowTitle"></sketchDesign>
<productDrawingDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'productDrawingDesign'" ref="productDrawingDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" :workflowTitle="workflowTitle"></productDrawingDesign>
<printingDesign3D v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'printingDesign3D'" ref="printingDesign3D" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" :workflowTitle="workflowTitle"></printingDesign3D>
<printDesign v-show="selectKey_ != 'yun'" v-if="selectObject.id && workflowType == 'printDesign'" ref="printDesign" :selectKey_="selectKey_" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" :workflowTitle="workflowTitle"></printDesign>
<div class="public">
<cloudUploading v-show="selectKey_ == 'yun'" v-if="selectObject.id" :workflowType="workflowType" ref="cloudUploading" @retrieve="(value:any)=>$emit('retrieve',value)"></cloudUploading>
</div>
@@ -39,6 +39,7 @@ export default defineComponent({
selectKey_:String,
workflowType:String,
httpWorkflowType:String,
workflowTitle:String,
},
emit:['projectComplete','retrieve'],
setup(props,{emit}) {
@@ -61,7 +62,7 @@ export default defineComponent({
//处理design数据
const setDesignData = (str:any)=>{
// if (str in dataDom) {
if(str == 'workspace' || str == '')return
if(str == 'workspace' || str == 'yun' || str == '')return
return new Promise(async (resolve,reject)=>{
if(str == "colorBoard")await setColor()
// if(str == "sketchBoard")await setSketch()

3
src/component/HomePage/index/workflow/content/printDesign.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="seriesDesign">
<workspace @setProject="workspaceBack" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<workspace @setProject="workspaceBack" :workflowTitle="workflowTitle" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<PrintboardUpload ref="printBoard" class="printBoard" :isState="selectKey_ =='printBoard'" v-show="selectKey_ == 'printBoard'"></PrintboardUpload>
<canvasUpload ref="canvas" class="canvas" :isState="selectKey_ =='canvas'" v-show="selectKey_ == 'canvas'"></canvasUpload>
</div>
@@ -29,6 +29,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
workflowTitle:String,
},
emits:['projectComplete'],
setup(props,{emit}) {

13
src/component/HomePage/index/workflow/content/printingDesign3D.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="seriesDesign">
<workspace @setProject="workspaceBack" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<workspace @setProject="workspaceBack" :workflowTitle="workflowTitle" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<PrintboardUpload ref="printBoard" class="printBoard" :isState="selectKey_ =='printBoard'" v-show="selectKey_ == 'printBoard'"></PrintboardUpload>
<patternMaking3D ref="patternMaking3D" class="patternMaking3D" :isState="selectKey_ =='patternMaking3D'" v-show="selectKey_ == 'patternMaking3D'"></patternMaking3D>
<!-- <canvasUpload></canvasUpload> -->
@@ -31,6 +31,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
workflowTitle:String,
},
setup(props,{emit}) {
const store = useStore();
@@ -100,8 +101,16 @@ export default defineComponent({
),
generatePrintFiles: [],
};
store.commit("setAllBoardDataChoose", collectionData);
store.commit('setPatternMaking3D',value.threeDSimpleId)
let patternMaking3DData = {
threeDsimpleId:value.patternMaking3D.threeDSimpleId,
collectionElementId:value.patternMaking3D.collectionElementId,
printMinioUrl:value.patternMaking3D.printMinioUrl,
x:value.patternMaking3D.x,
y:value.patternMaking3D.y,
};
store.commit('setPatternMaking3D',patternMaking3DData)
}
const dealViewChooseData = (data: any,str:string)=> {
if (!data) {

3
src/component/HomePage/index/workflow/content/productDrawingDesign.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="seriesDesign">
<workspace @setProject="workspaceBack" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<workspace @setProject="workspaceBack" :workflowTitle="workflowTitle" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<toProduct ref="toProduct"
:productimgMenu="{value:'ToProductImage',label:$t('ProductImg.ProductImage')}"
class="toProduct"
@@ -42,6 +42,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
workflowTitle:String,
},
setup(props,{emit}) {
const store = useStore();

3
src/component/HomePage/index/workflow/content/seriesDesign.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="seriesDesign">
<workspace @setProject="workspaceBack" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<workspace @setProject="workspaceBack" :workflowTitle="workflowTitle" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<design ref="design" class="design" :isState="selectKey_ =='design'" v-show="selectKey_ == 'design'"></design>
<MoodboardUpload ref="moodBoard" class="moodBoard" :isState="selectKey_ =='moodBoard'" v-show="selectKey_ == 'moodBoard'"></MoodboardUpload>
<PrintboardUpload ref="printBoard" class="printBoard" :isState="selectKey_ =='printBoard'" v-show="selectKey_ == 'printBoard'"></PrintboardUpload>
@@ -54,6 +54,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
workflowTitle:String,
},
emits:['projectComplete'],
setup(props,{emit}) {

3
src/component/HomePage/index/workflow/content/singleProductDesign.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="seriesDesign">
<workspace @setProject="workspaceBack" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<workspace @setProject="workspaceBack" :workflowTitle="workflowTitle" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<design ref="design" class="design" :isState="selectKey_ =='design'" v-show="selectKey_ == 'design'"></design>
<MoodboardUpload ref="moodBoard" class="moodBoard" :isState="selectKey_ =='moodBoard'" v-show="selectKey_ == 'moodBoard'"></MoodboardUpload>
<PrintboardUpload ref="printBoard" class="printBoard" :isState="selectKey_ =='printBoard'" v-show="selectKey_ == 'printBoard'"></PrintboardUpload>
@@ -50,6 +50,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
workflowTitle:String,
},
setup(props,{emit}) {
const store = useStore();

3
src/component/HomePage/index/workflow/content/sketchDesign.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="seriesDesign">
<workspace @setProject="workspaceBack" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<workspace @setProject="workspaceBack" :workflowTitle="workflowTitle" ref="workspace" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType" class="workspace" :isState="selectKey_ =='workspace'" v-show="selectKey_ == 'workspace'"></workspace>
<mannequin ref="mannequin" class="mannequin" :isState="selectKey_ =='mannequin'" v-show="selectKey_ == 'mannequin'"></mannequin>
<SketchboardUpload ref="sketchBoard" class="sketchBoard" :isState="selectKey_ =='sketchBoard'" v-show="selectKey_ == 'sketchBoard'"></SketchboardUpload>
<deReconstruction ref="deReconstruction" class="deReconstruction" :isState="selectKey_ =='deReconstruction'" v-show="selectKey_ == 'deReconstruction'"></deReconstruction>
@@ -33,6 +33,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
workflowTitle:String,
},
setup(props,{emit}) {
const store = useStore();

7
src/component/HomePage/index/workflow/index.vue
View File

@@ -26,7 +26,7 @@
</div>
<div class="text" @click="setBack()"><i class="fi fi-bs-down-left-and-up-right-to-center"></i></div>
</div>
<content ref="content" @retrieve="retrieve" :selectKey_="selectKey_" @projectComplete="setBack()" :workflowType="workflowType" :httpWorkflowType="httpWorkflowType"></content>
<content ref="content" @retrieve="retrieve" :selectKey_="selectKey_" @projectComplete="setBack()" :workflowType="workflowType" :workflowTitle="workflowTitle" :httpWorkflowType="httpWorkflowType"></content>
</div>
</div>
</div>
@@ -62,7 +62,10 @@ export default defineComponent({
props:{
workflowType:{
type:String,
},
workflowTitle:{
type:String,
default:''
},
httpWorkflowType:{
type:String,

4
src/component/HomePage/index/workflow/nav.vue
View File

@@ -21,7 +21,8 @@
<i :class="item.icon"></i>
<span v-show="isUnfold">{{ item.name }}</span>
</div>
<div class="navList list exist" v-show="['seriesDesign', 'singleProductDesign', 'productDrawingDesign'].includes(workflowType)" style="margin-top: auto;" @click="setNav('yun', $event.target)">
<div class="border" style="margin-top: auto;" ></div>
<div class="navList list exist" v-show="['seriesDesign', 'singleProductDesign', 'productDrawingDesign'].includes(workflowType)" @click="setNav('yun', $event.target)">
<i class="fi fi-rr-cloud-upload-alt"></i>
<span v-show="isUnfold">云生成</span>
</div>
@@ -111,6 +112,7 @@ export default defineComponent({
<style lang="less" scoped>
.homeNav{
padding: 5rem 0rem;
padding-bottom: 2.5rem;
background: #f7f8fa;
transition: all .3s;
width: 7rem;

15
src/component/HomePage/index/workflow/workspace.vue
View File

@@ -3,7 +3,7 @@
<div class="workspaceBox">
<div class="title marginBottom" style=" display:flex;align-items: center;">
<i v-if="firstTime" @click="setBack" style="font-size:3rem; display:flex; cursor: pointer;margin-right:2rem" class="fi fi-rr-arrow-small-left"></i>
Porject setting
Project setting ({{ workflowTitle }})
</div>
<div class="projectName marginBottom" v-if="show.title">
<div class="text">Project name: <span style="color: red;">*</span></div>
@@ -60,8 +60,11 @@
</div>
</div>
</div>
<div class="position marginBottom" v-show="show.position">
<generalMenu :selectWidth="'100%'" :dataList="selectObject.positionList" @setprintModel="setprintModel" :item="selectObject.position"></generalMenu>
<div class="position marginBottom" style="display: flex; align-items: center;justify-content: space-between;" v-show="show.position">
<div class="text">
Category:
</div>
<generalMenu style="width:80%" :selectWidth="'100%'" :dataList="selectObject.positionList" @setprintModel="setprintModel" :item="selectObject.position"></generalMenu>
</div>
<div class="complete">
<div class="gallery_btn" @click="complete">Complete</div>
@@ -83,6 +86,7 @@ import { Https } from '@/tool/https';
import { position } from 'html2canvas/dist/types/css/property-descriptors/position';
import { id } from 'element-plus/es/locale';
import { message } from 'ant-design-vue';
import {projectList} from '@/tool/listData'
export default defineComponent({
components:{
habitSetStyle,generalMenu
@@ -95,6 +99,10 @@ export default defineComponent({
httpWorkflowType:{
type:String,
default:''
},
workflowTitle:{
type:String,
default:''
},
firstTime:{
type:Boolean,
@@ -246,6 +254,7 @@ export default defineComponent({
data.selectObject.position = data.selectObject.positionList[0]
})
return{
projectList,
...toRefs(dataDom),
...toRefs(data),
setStyle,

6
src/component/HomePage/newPosted.vue
View File

@@ -171,9 +171,9 @@ export default defineComponent({
.newPosted_generalMessage_item_img{
height: 100%;
img{
width: 5rem;
max-height: 100%;
object-fit: cover;
width: 8rem;
height: 100%;
object-fit: contain;
}
}
}

2
src/component/WorksPage/newScaleImage.vue
View File

@@ -1226,7 +1226,7 @@ export default defineComponent({
cursor: pointer;
width: 4rem;
height: 4rem;
background: rgba(57, 33, 91);
background: #000;
display: flex;
align-items: center;
justify-content: center;

2
src/component/WorksPage/newScaleImageMobile.vue
View File

@@ -1135,7 +1135,7 @@ export default defineComponent({
cursor: pointer;
width: 4rem;
height: 4rem;
background: rgba(57, 33, 91);
background: #000;
display: flex;
align-items: center;
justify-content: center;

31
src/store/homeStore/homeStore.ts
View File

@@ -42,10 +42,14 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
categoryValue:'23',
categoryShow:false
}],
// patternMaking3D:{
// id:null,
// },
patternMaking3D:null,
patternMaking3D:{
threeDsimpleId:null,
collectionElementId:null,
printMinioUrl:null,
x:null,
y:null,
},
// patternMaking3D:null,
canvasData:{
deReconstruction:null,
canvas:null
@@ -91,7 +95,16 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
}
},
setPatternMaking3D(state,data){
state.patternMaking3D = data
for (const key in data) {
if(data[key] == undefined)continue
console.log(data[key])
if(key == 'x' || key == 'y'){
state.patternMaking3D[key] = Number(data[key].toFixed(3))
}else{
state.patternMaking3D[key] = data[key]
}
// state.patternMaking3D[key] = data[key]
}
},
setCanvasData(state,data){
state.canvasData[data.type] = data.file
@@ -156,7 +169,13 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
state.toProductImageList = []
state.poseTransfer = []
state.deReconstruction = null
state.patternMaking3D = null
state.patternMaking3D = {
threeDsimpleId:null,
collectionElementId:null,
printMinioUrl:null,
x:null,
y:null,
}
state.canvasData = {
deReconstruction:null,
canvas:null

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

@@ -370,7 +370,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
commit('setProjectList',navListData)
},
setModularData({ state,commit },data){
let navListData = JSON.parse(JSON.stringify((workspace as any).state.projectList))
let navListData = JSON.parse(JSON.stringify((workspace as any).state.projectList)) as any
let value = null
let homeData:any = homeStore.state
if(data.type == 'design'){

2
src/tool/util.js
View File

@@ -71,7 +71,7 @@ function downloadIamge(imgsrc, name) { // 下载图片地址和图片名
canvas.height = image.height
var context = canvas.getContext('2d')
context.drawImage(image, 0, 0, image.width, image.height)
var url = canvas.toDataURL('image/jpeg') // 得到图片的base64编码数据
var url = canvas.toDataURL('image/png') // 得到图片的base64编码数据
var a = document.createElement('a') // 生成一个a元素
var event = new MouseEvent('click') // 创建一个单击事件
a.download = name || 'generate' // 设置图片名称

8
src/views/HomeMain.vue
View File

@@ -611,11 +611,13 @@ export default defineComponent({
.homeMain_max{
position: relative;
display: flex;
height: 100vh;
height: 100%;
box-sizing: border-box;
flex-direction: column;
.homeMain_content_body{
flex: 1;
height: calc(100vh - 7rem);
height: calc(100% - 20rem);
// height: calc(100vh - 7rem);
overflow: hidden;
}
}
@@ -668,7 +670,7 @@ export default defineComponent({
.message_iconItem_value{
padding: 1rem;
left: 50%;
transform: translateX(-50%);
transform: translateX(-96%);
top: 4rem;
}
}

1
src/views/LoginPageEnterprise.vue
View File

@@ -526,6 +526,7 @@ export default defineComponent({
password: md5(this.password + "abc"),
userName: 'a',
// userName: this.username,
organizationName:this.selectEnterprise,
email: this.email,
operationType: "LOGIN",
ip: "",

1
src/views/LoginPageSchool.vue
View File

@@ -526,6 +526,7 @@ export default defineComponent({
password: md5(this.password + "abc"),
userName: 'a',
// userName: this.username,
organizationName:this.selectSchool,
email: this.email,
operationType: "LOGIN",
ip: "",