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

调整design的moodboard的位置信息和部分修改

Browse Source
This commit is contained in:
X1627315083
2024-09-30 15:43:37 +08:00
parent 16d6416f73
commit 8fbd0376b4
14 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dev
View File

@@ -6,7 +6,7 @@ NODE_ENV = 'development'
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://www.api.aida.com.hk'
# 佩佩
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
# 海波
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'

2
src/component/Account/account.vue
View File

@@ -7,7 +7,7 @@
<div class="account_page_content">
<div class="account_page_content_left">
<div class="content_left_item">
<div>{{$t('account.personCentered')}}</div>
<!-- <div>{{$t('account.personCentered')}}</div> -->
</div>
<!-- {{ router.path }} -->
<router-link class="content_left_item" v-for="item in rootSubmenuKeys" :class="{active: $route.path == item.route}" :to="item.route">

1
src/component/Account/accountEdit.vue
View File

@@ -174,6 +174,7 @@ export default defineComponent({
position: relative;
img{
width: 15rem;
object-fit: contain;
height: 15rem;
border-radius: 50%;
background: #fff;

1
src/component/Account/followFans/follow.vue
View File

@@ -157,6 +157,7 @@ export default defineComponent({
img{
width: 100%;
height: 100%;
object-fit: contain;
border-radius: 50%;
}
}

1
src/component/Account/message/comment.vue
View File

@@ -166,6 +166,7 @@ export default defineComponent({
img{
width: 100%;
height: 100%;
object-fit: contain;
border-radius: 50%;
}
}

1
src/component/Account/message/likeMessage.vue
View File

@@ -152,6 +152,7 @@ export default defineComponent({
img{
width: 100%;
height: 100%;
object-fit: contain;
border-radius: 50%;
}
}

1
src/component/Account/message/newFollow.vue
View File

@@ -159,6 +159,7 @@ export default defineComponent({
img{
width: 100%;
height: 100%;
object-fit: contain;
border-radius: 50%;
}
}

25
src/component/Detail/editFrontBack.vue
View File

@@ -8,9 +8,10 @@
<i class="icon iconfont icon-fanchehui" @click="historyState('reverse')"></i>
<!-- <i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:canvasState == 'move'}"></i> -->
<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:canvasState == 'pencil'}"></i>
<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:canvasState == 'eraser'}"></i>
<div class="editFrontBack_center_btn_colorRed" @click="setOperationColor('rgb(255,0,0)')" :class="{active:rgba == 'rgb(255,0,0)'}" title="front"></div>
<div class="editFrontBack_center_btn_colorGreen" @click="setOperationColor('rgb(0,255,0)')" :class="{active:rgba == 'rgb(0,255,0)'}" title="back"></div>
<!-- <i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:canvasState == 'eraser'}"></i> -->
<div class="editFrontBack_center_btn_colorRed" @click="setOperationColor('rgb(255,0,0)')" :class="{active:rgba == 'rgb(255,0,0)'}" title="front">front</div>
<div class="editFrontBack_center_btn_colorGreen" @click="setOperationColor('rgb(0,255,0)')" :class="{active:rgba == 'rgb(0,255,0)'}" title="back">back</div>
<div class="editFrontBack_center_btn_colorWhite" @click="setOperation('eraser')" :class="{active:canvasState == 'eraser'}" title="background">background</div>
<input type="range" v-show="canvasState != 'move'" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]">
<!-- <div class="icon iconfont icon-xiala" :class="{btnRotate:spreadState}" @click="()=>spreadState = !spreadState"></div> -->
</div>
@@ -75,8 +76,8 @@ export default defineComponent({
let canvasBtn = reactive({
canvasState:'move',
canvasPencilWidth:{
pencil:4,
eraser:4,
pencil:20,
eraser:20,
},
spreadState:false,
})
@@ -221,6 +222,7 @@ export default defineComponent({
pencilbtnStyle.value.top = parentY+'px'
}
let setOperation = (str)=>{
if(!canvas)return
canvasBtn.canvasState = str
if(str == 'move'){
setMove()
@@ -450,6 +452,7 @@ export default defineComponent({
input{
// width: 100%;
flex: 1;
max-width: 30%;
}
.icon-xiala{
position: absolute;
@@ -469,13 +472,16 @@ export default defineComponent({
display: block;
}
}
.editFrontBack_center_btn_colorRed,.editFrontBack_center_btn_colorGreen{
width: 4rem;
height: 2rem;
.editFrontBack_center_btn_colorRed,.editFrontBack_center_btn_colorGreen,.editFrontBack_center_btn_colorWhite{
width: 10rem;
line-height: 3rem;
text-align: center;
height: 3rem;
border-radius: 4px;
margin: 0 .5rem;
cursor: pointer;
padding: .5rem 1;
border: 1px solid rgba(0,0,0,.5);
&.active{
border: 2px solid;
border-radius: .4rem;
@@ -487,6 +493,9 @@ export default defineComponent({
.editFrontBack_center_btn_colorGreen{
background: rgba(0,255,0);
}
.editFrontBack_center_btn_colorWhite{
background: rgba(255,255,255);
}
i{
font-size: 2.5rem;
cursor: pointer;

5
src/component/HomePage/productImg.vue
View File

@@ -961,6 +961,7 @@ methods: {
justify-content: space-between;
.productImg_right_item_box{
height: 40%;
width: 100%;
display: flex;
overflow-x: auto;
background: #f6f6fa;
@@ -977,8 +978,11 @@ methods: {
margin-right: 1rem;
position: relative;
background: #fff;
overflow: hidden;
flex-shrink: 0;
.productImg_right_item_imgBox{
height: 100%;
overflow: hidden;
.loadingImg{
width: 14rem;
object-fit: contain;
@@ -992,6 +996,7 @@ methods: {
top: 2rem;
display: flex;
flex-direction: column;
overflow: hidden;
>div{
margin-bottom: 1rem;
}

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

@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="plcaement_point_content" v-if="userInfo.userId == 88 || userInfo.userId == 83">
<div class="plcaement_point_content" v-if="userInfo.userId == 88 || userInfo.userId == 833">
<div style="display: flex; align-items: center;">
<div style="display: flex; align-items: center;">
<input type="checkbox" model="false" @click="()=>{modelType = 'System'}">
@@ -584,7 +584,7 @@ export default defineComponent({
// })
let cropper:any = this.$refs.cropper,
that = this
if((this.modelType == 'System' && this.userInfo.userId == 88) || (this.modelType == 'System' &&this.userInfo.userId == 83)){
if((this.modelType == 'System' && this.userInfo.userId == 88) || (this.modelType == 'System' &&this.userInfo.userId == 833)){
if(this.printObject.templateId){
this.printObject.id = this.printObject.relationId
this.confrimSubmit()
@@ -634,7 +634,7 @@ export default defineComponent({
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
...await this.getPrintLocation()
}
if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
if(this.userInfo.userId == 88 || this.userInfo.userId == 833){
param.modelType = this.modelType
}
@@ -661,7 +661,7 @@ export default defineComponent({
modelType:'Library',
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}
if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
if(this.userInfo.userId == 88 || this.userInfo.userId == 833){
new_data.modelType = this.modelType
// new_data.sex = this.sex
}

4
src/component/modules/generalMiniCanvas.vue
View File

@@ -83,8 +83,8 @@ export default defineComponent({
let canvasBtn = reactive({
canvasState:'move',
canvasPencilWidth:{
pencil:4,
eraser:4,
pencil:20,
eraser:20,
},
spreadState:false,
})

23
src/store/userHabit/userHabit.ts
View File

@@ -1,6 +1,7 @@
import {Module} from 'vuex'
import {RootState} from '../index'
import { Https } from "@/tool/https";
import store from '../index'
interface UserHabit{
clothingType:any,
credits:any,
@@ -103,21 +104,17 @@ const userHabit : Module<UserHabit,RootState> = {
},
setMessageSystem(state,data){
let num = 0
let userInfo = ['followeeCount','followerCount']
let obj:any = {}
for (const iterator in data) {
if(iterator != 'newPosted'){
num+=data[iterator]
if(userInfo.indexOf(iterator) > 0){
obj[iterator] = data[iterator]
store.commit('setUserInfo', obj)
}else{
if(iterator != 'newPosted')num+=data[iterator]
state.messageSystem.messageType[iterator] = data[iterator]
}
state.messageSystem.messageType[iterator] = data[iterator]
// if(!state.messageSystem.messageType[iterator]){
// state.messageSystem.messageType[iterator] = data[iterator]
// }else{
// for (const key in state.messageSystem.messageType) {
// if(key == iterator){
// state.messageSystem.messageType[key] = data[iterator]
// break
// }
// }
// }
}
state.messageSystem.messageNum = num
},

15
src/views/HomeMain.vue
View File

@@ -260,9 +260,20 @@ export default defineComponent({
}
})
}
MyWs.linkWs("wss://"+MyWs.messageUrl,'message')
MyWs.linkWs("ws://"+MyWs.messageUrl+`/${JSON.parse(getCookie("userInfo")).userId}`,'message')
let getWsMessage = (data)=>{
let userInfo = ['followeeCount','followerCount']
let obj = {}
let isObj = false
data.forEach(element => {
const keys = Object.keys(element)[0]
if(userInfo.indexOf(keys) > 0){
obj[keys] = element[keys]
isObj = true
}
});
if(isObj)store.commit('setUserInfo',obj)
store.commit('setMessageSystem',...data)
}
MyEvent.add('getMessage',getWsMessage)

12
src/views/HomeView/HomeView.vue
View File

@@ -535,8 +535,10 @@ export default defineComponent({
// this.likeDesignCollectionList.push(team)
// },
affiche(text:any){
let affiche:any = this.$refs.affiche
affiche.init(text)
nextTick(()=>{
let affiche:any = this.$refs.affiche
affiche.init(text)
})
// affiche.afficheMask = true
},
dragstart (e:any, index:any) {
@@ -716,7 +718,7 @@ export default defineComponent({
colorBoards,
sketchboardFiles,
marketingSketchFiles,
moodTemplateId,
moodboardPosition,
} = this.store.state.UploadFilesModule.allBoardData;
this.randomNum()
let workspace = this.store.state.Workspace.workspace
@@ -726,6 +728,7 @@ export default defineComponent({
moodBoards: this.getBoardId(moodboardFiles),
printBoards: this.getPrintId(printboardFiles),
sketchBoards: this.getSkecthBoard(sketchboardFiles),
moodboardPosition: moodboardPosition,
switchCategory: !workspace.overallSingle ?"": workspace.position,
singleOverall: !workspace.overallSingle ? "overall" : "single",
systemScale: workspace.systemDesignerPercentage?workspace.systemDesignerPercentage*.01:.3,
@@ -737,6 +740,7 @@ export default defineComponent({
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
processId:this.designRandom
};
// data.moodboardPosition = JSON.stringify(this.store.state.UploadFilesModule.moodboardPosition)
let isLoad = false
if(designCollectionId == -1){
isLoad = true
@@ -954,6 +958,8 @@ export default defineComponent({
},
//处理选择组的数据
dealHistoryChooseData(data: any, type: any) {
console.log(data.collection.moodboardPosition);
let collectionData = {
disposeMoodboard: data.collection.moodTemplateId?[{
id:data.collection.moodTemplateId,