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

修复bug

Browse Source
This commit is contained in:
wxd
2024-11-05 22:00:19 +08:00
parent 6502e3f19f
commit a508107851
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -728,6 +728,7 @@ export default defineComponent({
imgUrl = data.designOutfitUrl; imgUrl = data.designOutfitUrl;
imgWidth[key] = setImageWidth(key,img); imgWidth[key] = setImageWidth(key,img);
} }
if(key == 'upImgFiles')imgWidth[key] = setImageWidth(key,img);
let url = imgUrl.split('?')[0] let url = imgUrl.split('?')[0]
var match = url.match(/:(\d+)\/(.*)/); var match = url.match(/:(\d+)\/(.*)/);
@@ -1372,6 +1373,7 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.canvasElementUpload, formData,config).then((rv)=>{ Https.axiosPost(Https.httpUrls.canvasElementUpload, formData,config).then((rv)=>{
rv.imgUrl = rv.minioUrl rv.imgUrl = rv.minioUrl
fabric.Image.fromURL(rv.minioUrl,(img) => { fabric.Image.fromURL(rv.minioUrl,(img) => {
console.log(canvas.wrapperEl.parentNode.scrollTop);
setCanvasImage(img,"upImgFiles",0,canvas.wrapperEl.parentNode.scrollTop,rv) setCanvasImage(img,"upImgFiles",0,canvas.wrapperEl.parentNode.scrollTop,rv)
canvas.add(img); canvas.add(img);
},{ crossOrigin: "Anonymous" }) },{ crossOrigin: "Anonymous" })

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

@@ -339,7 +339,7 @@ export default defineComponent({
] ]
}else if(this.type_.type2 == 'Sketchboard'){ }else if(this.type_.type2 == 'Sketchboard'){
this.printModelList = JSON.parse(JSON.stringify(this.store.state.UserHabit.SketchStyle)) this.printModelList = JSON.parse(JSON.stringify(this.store.state.UserHabit.SketchStyle))
let imgList = ['/image/sketch/sketch-fine.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-thick.jpg'] let imgList = ['/image/sketch/sketch-thick.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-fine.jpg']
this.printModelList.forEach((item:any,index:number)=>{ this.printModelList.forEach((item:any,index:number)=>{
item.img = imgList[index] item.img = imgList[index]
}) })

2
src/component/LibraryPage/ModelPlacement.vue
View File

@@ -62,7 +62,7 @@
</a-select> --> </a-select> -->
<div>{{ sex.label }}</div> <div>{{ sex.label }}</div>
</div> </div>
<div class="placement_point_item" v-for="(point,index) in pointList" :key="index" @touchmove="touchmove($event)"> <div class="placement_point_item" v-for="(point,index) in pointList" :key="index" @mousemove="mouseMove" @touchmove="touchmove($event)">
<div class="ponit_title">{{point.title}}</div> <div class="ponit_title">{{point.title}}</div>
<div class="point_list"> <div class="point_list">
<div class="point_item" v-for="item in point.pointList" :key="item.color" :style="{borderColor:item.color,visibility:item.show?'inherit':'hidden'}" @mousedown="AddDian(item)" @touchstart="AddDian(item)"><div class="point_block" :style="{background:item.color}"></div></div> <div class="point_item" v-for="item in point.pointList" :key="item.color" :style="{borderColor:item.color,visibility:item.show?'inherit':'hidden'}" @mousedown="AddDian(item)" @touchstart="AddDian(item)"><div class="point_block" :style="{background:item.color}"></div></div>

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

@@ -54,7 +54,7 @@
</div> </div>
<div class="detail_right_user_content"> <div class="detail_right_user_content">
<div> <div style="text-align: center;">
<div class="scaleImage_chunk_title_intro">@{{scaleImageData.userName}}</div> <div class="scaleImage_chunk_title_intro">@{{scaleImageData.userName}}</div>
<div v-if="scaleImageData.isFollow == 0 && userInfo?.userId != scaleImageData?.accountId" style="margin-bottom: 0;" class="started_btn" @click="setFollow()" >{{$t('newScaleImage.Follow')}}</div> <div v-if="scaleImageData.isFollow == 0 && userInfo?.userId != scaleImageData?.accountId" style="margin-bottom: 0;" class="started_btn" @click="setFollow()" >{{$t('newScaleImage.Follow')}}</div>
<div v-else-if="userInfo?.userId != scaleImageData?.accountId" class="started_btn" style="margin-bottom: 0;" @click="setFollow()" >{{$t('newScaleImage.Unfollow')}}</div> <div v-else-if="userInfo?.userId != scaleImageData?.accountId" class="started_btn" style="margin-bottom: 0;" @click="setFollow()" >{{$t('newScaleImage.Unfollow')}}</div>
@@ -364,6 +364,8 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.getPorfolioDetail,data).then( Https.axiosPost(Https.httpUrls.getPorfolioDetail,data).then(
(rv: any) => { (rv: any) => {
imgData.loadingShow = false imgData.loadingShow = false
if(rv.portfolioDes)rv.portfolioDes = rv.portfolioDes.replace(/#/g, ' ');
imgData.scaleImageData = rv imgData.scaleImageData = rv
let canvasUrl = [rv.canvasUrl] let canvasUrl = [rv.canvasUrl]
var findUrl = [] var findUrl = []
@@ -788,6 +790,7 @@ export default defineComponent({
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
align-items: flex-start; align-items: flex-start;
.scaleImage_chunk_title_Original{ .scaleImage_chunk_title_Original{
color: #39215b; color: #39215b;
background: #c9a2ff; background: #c9a2ff;

1
src/tool/webSocket.js
View File

@@ -34,6 +34,7 @@ class MyWs {
reconnection(){ reconnection(){
clearTimeout(this.reconnectionTime) clearTimeout(this.reconnectionTime)
this.reconnectionTime = setTimeout(()=>{ this.reconnectionTime = setTimeout(()=>{
this.wsUrl = url +`/${JSON.parse(getCookie("userInfo")).userId}`
this.linkWs(this.wsUrl) this.linkWs(this.wsUrl)
},1000) },1000)
} }