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

commit

Browse Source
This commit is contained in:
X1627315083
2023-10-13 17:06:44 +08:00
parent 76315492ad
commit 19a3574fbb
15 changed files with 184 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/component/Detail/DesignDetail.vue
View File

@@ -11,7 +11,7 @@
>
<div class="design_title_text">
<div>Details</div>
<div class="design_title_text_intro">edit the details of your design</div>
<div class="design_title_text_intro">Edit the details of your design</div>
</div>
<div class="design_closeIcon" @click.stop="closeModal()">
<i class="fi fi-rr-cross-small"></i>
@@ -54,6 +54,9 @@
<!-- 层 -->
<i class="fi fi-rr-copy" @mousedown="mousedownDesignImg" @mouseup="mouseupDesignImg"></i>
</div>
<div v-show="ifSubmit" class="subitOkPreviewBtn" @click="submit">
Submit
</div>
</div>
<div class="detail_modal_body_category">
<div v-show="designOrder" class="detail_modal_right_top scroll_style">
@@ -92,9 +95,7 @@
</div>
</div>
</div>
<div class="clothes_detail_item subitOkPreviewBtn" @click="submit">
Submit
</div>
</div>
</div>
<DesignDetailAlter ref="DesignDetailAlter"></DesignDetailAlter>
@@ -169,7 +170,7 @@ export default defineComponent({
let designItemId = ref()
let designOutfitId = ref()
let userInfo:any = {}
let ifSubmit = ref(false)
return{
designItemDetail,
store,
@@ -181,7 +182,8 @@ export default defineComponent({
body,
designItemId,
designOutfitId,
userInfo
userInfo,
ifSubmit
}
},
data(){
@@ -196,9 +198,11 @@ export default defineComponent({
},
watch:{
designItemDetail:{
handler: function(newval) {
handler: function(newVal,oldVal) {
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
console.log(designItemDetail);
this.ifSubmit = designItemDetail.ifSubmit?designItemDetail.ifSubmit:false
this.current = JSON.parse(JSON.stringify(designItemDetail?.clothes?.[this.currentIndex]))
if(designItemDetail.others[0].layersObject.length != 0){
this.body = false
@@ -418,6 +422,7 @@ export default defineComponent({
// designItemId:designItemDetail.designItemId,
designSingleItemDTOList:clothes,
isPreview:false,
ifSubmit:designItemDetail.isPreview,
processId:String(this.userInfo?.userId),
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}
@@ -425,6 +430,7 @@ export default defineComponent({
data.isPreview = true
}else{
data.isPreview = false
delete data.ifSubmit
}
this.store.commit('setDesignPreviewData',data)
return data
@@ -710,6 +716,8 @@ export default defineComponent({
img{
// width: 100%;
height: 100%;
max-width: 100%;
object-fit: cover;
}
&.active{
border: 2px solid rgba(0,0,0,0.4);
@@ -752,6 +760,10 @@ export default defineComponent({
}
}
.subitOkPreviewBtn{
bottom: 2rem;
z-index: 999;
}
.clothes_item_img_block{
display: flex;
}

23
src/component/Detail/DesignDetailAlter.vue
View File

@@ -1008,7 +1008,7 @@ export default defineComponent({
}
}
}
.detail_Library_item,.detail_Upload_item{
width: 100%;
// height: calc(100% - 19rem);
@@ -1080,6 +1080,23 @@ export default defineComponent({
max-width: 100%;
max-height: 100%;
}
.operate_file_block{
height: 2.5rem;
.select_img_type{
.select_category{
zoom: .8;
.icon-xiala{
zoom: .8;
}
}
.category_list{
margin-top: -.4rem;
.category_item{
zoom: .8;
}
}
}
}
}
.content_img_name{
@@ -1125,7 +1142,9 @@ export default defineComponent({
max-width: 100%;
object-fit: cover;
}
.operate_file_block .select_img_type .select_category{
zoom: .8;
}
.delete_file_block{
display: none;
width: 3.2rem;

5
src/component/Detail/DesignDetailEnd.vue
View File

@@ -218,6 +218,10 @@ export default defineComponent({
}
})
if(this.type_ == 1){
if(data.designSingleItemDTOList[index].path != this.sketchImg.minIOPath && this.sketchImg.id_){
data.designSingleItemDTOList[index].offset = [0,0]
data.designSingleItemDTOList[index].scale = 1
}
data.designSingleItemDTOList[index].id = this.sketchImg.id_? this.sketchImg.id_:this.current.id_
data.designSingleItemDTOList[index].path =this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath
// data.designSingleItemDTOList[index].printObject.prints = []
@@ -246,6 +250,7 @@ export default defineComponent({
designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
designItemDetail.clothes[index].minIOPath = rv.clothes[index].minIOPath
designItemDetail.clothes[index].path = rv.clothes[index].path
designItemDetail.ifSubmit = true
// rv.clothes[0].layersObject.forEach((v)=>{
// designItemDetail.clothes[index].layersObject[0].imageUrl = rv.clothes[0].layersObject[0].imageUrl
// designItemDetail.clothes[index].layersObject[0].maskUrl = rv.clothes[0].layersObject[0].maskUrl

1
src/component/Detail/DesignPrintOperation.vue
View File

@@ -598,6 +598,7 @@ export default defineComponent({
designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle
designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
designItemDetail.clothes[index].printObject.prints = this.computeZindex()
designItemDetail.ifSubmit = true
designItemDetail.clothes.forEach((item,i)=>{
let a
if(item.layersObject[0].imageCategory.indexOf("back") == -1){

69
src/component/Detail/habit.vue
View File

@@ -131,15 +131,15 @@
User
</div>
</div>
<div class="model_img" v-show="systemSeleves">
<div v-mousewheel>
<div class="model_img" v-show="systemSeleves" v-mousewheel>
<div class="model_img_item">
<div v-for="(item,index) in mannequins?.[0]?.modelList" :key="item.id">
<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'Library')">
</div>
</div>
</div>
<div class="model_img" v-show="!systemSeleves">
<div v-mousewheel>
<div class="model_img" v-show="!systemSeleves" v-mousewheel>
<div class="model_img_item">
<div v-for="(item,index) in mannequins?.[1]?.modelList" :key="item.id">
<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'System')">
</div>
@@ -286,33 +286,14 @@ export default defineComponent({
},
mousewheel:{
mounted (el) {
let parent = el.parentNode
// el.style.width='100%'
// el.style.height='100%'
let num = 0
let width = el.offsetWidth
let parentWidth = parent.offsetWidth
el.addEventListener('mouseover',()=>{
width = el.offsetWidth
parentWidth = parent.offsetWidth
})
el.addEventListener('mousewheel',(e:MouseEvent)=>{
if(0>(e as WheelEvent).deltaY && width>parentWidth){
num+=15
if(num >= 0){
num = 0
}
}else if(0<(e as WheelEvent).deltaY && width>parentWidth){
num-=15
if(num<=parentWidth - width){
num = parentWidth - width
}
el.addEventListener('wheel',(e:WheelEvent)=>{
let num = 0
if(e.deltaY > 0){
num = 25
}else{
num = -25
}
el.style.marginLeft = num+'px'
el.scrollBy(num, 0);
})
}
}
@@ -867,6 +848,34 @@ export default defineComponent({
display: flex;
flex: 1;
align-items: center;
overflow-x: auto;
&.model_img::-webkit-scrollbar {
/* 竖轴的宽度 */
width: 1rem;
/* 横轴的高度 */
height: 1rem;
transition: all .3s;
}
/* 进度 */
&.model_img::-webkit-scrollbar-thumb {
border-radius: 1rem;
background: rgba(238, 238, 244, 0);
}
/* 轨道 */
&.model_img::-webkit-scrollbar-track {
border-radius: 1rem;
background: rgba(238, 238, 244, 0);
}
&.model_img:hover {
// overflow-x: scroll;
&.model_img::-webkit-scrollbar-thumb {
background: #543087;
}
/* 轨道 */
&.model_img::-webkit-scrollbar-track {
background: rgba(84, 48, 135,.2);
}
}
>div{
display: flex;

1
src/component/Detail/setDesignItem.vue
View File

@@ -376,6 +376,7 @@ export default defineComponent({
this.loadingShow = false
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
designItemDetail.designItemUrl = rv.designItemUrl
designItemDetail.ifSubmit = true
designItemDetail.currentFullBodyView = rv.currentFullBodyView
rv.clothes.forEach((item)=>{
designItemDetail.clothes.forEach((i)=>{

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

@@ -270,15 +270,8 @@ export default defineComponent({
type1: "generate",
type2: prop.msg,
},
workspaceCom:{}
};
},
watch:{
workspaceCom(newVal,oldVal){
this.workspace = newVal
this.getPosition()
},
},
mounted() {
// this.fileList.forEach((item,index)=>{
// item.checked = true
@@ -288,9 +281,6 @@ export default defineComponent({
// this.store.commit("addGenerateFils", this.fileList);
this.token = getCookie("token") || "";
this.uploadUrl = getUploadUrl();
this.workspaceCom = computed(()=>{
return this.store?.state?.Workspace?.workspace
})
},
computed: {
getSketchLabel(value: any) {
@@ -312,28 +302,7 @@ export default defineComponent({
data.resData = JSON.parse(JSON.stringify(data))
this.store.commit("addGenerateMaterialFils", data);
},
getPosition(){
let params
if(this.workspace.sex == 'Female'){
params = 'FemalePosition'
}else{
params = 'MalePosition'
}
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
if (rv) {
let arr:any = []
rv.forEach((item:any) => {
let obj = {
value:item.name,
label:item.name,
}
arr.push(obj)
});
this.sketchCatecoryList = arr
}
})
},
beforeUpload(file: any) {
const isJpgOrPng =
file.type === "image/jpeg" ||
@@ -493,7 +462,6 @@ export default defineComponent({
}
},
likeFile(item:any,str:string){
if(str == 'like'){
let data = {
generateDetailId:item.id,

31
src/component/HomePage/Material.vue
View File

@@ -125,7 +125,6 @@ export default defineComponent({
type2:prop.msg
},
store: useStore(),
workspaceCom:{}
}
},
directives:{
@@ -175,9 +174,7 @@ export default defineComponent({
},
},
mounted () {
this.workspaceCom = computed(()=>{
return this.store?.state?.Workspace?.workspace
})
// let loding = document.getElementsByClassName("material_content_list_loding")[0]
// let bodyLoding = document.getElementsByClassName("material_content_body")[0]
// const ob = new IntersectionObserver(callback,{
@@ -200,10 +197,6 @@ export default defineComponent({
// }
},
watch:{
workspaceCom(newVal,oldVal){
this.workspace = newVal
this.getPosition()
},
sketchboardList:{
handler(newVal:any,oldVal:any){
// this.store.state.Workspace.workspace
@@ -260,27 +253,6 @@ export default defineComponent({
this.getLibraryList()
},
getPosition(){
let params
if(this.workspace.sex == 'Female'){
params = 'FemalePosition'
}else{
params = 'MalePosition'
}
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
if (rv) {
let arr:any = []
rv.forEach((item:any) => {
let obj = {
value:item.name,
label:item.name,
}
arr.push(obj)
});
this.disignTypeList = arr
}
})
},
selectImgItem(imgData:any){
imgData.type_ = this.type_
imgData.resData = JSON.parse(JSON.stringify(imgData))
@@ -341,7 +313,6 @@ export default defineComponent({
}
aa.push(item)
});
this.imgList = aa
this.total = rv.total
this.isShowLoading = false

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

@@ -241,10 +241,10 @@ export default defineComponent({
this.clearTimer()
this.timeTop = setInterval(() => {
this.robotTop = false
}, 10000);
}, 15000);
this.timeInput = setInterval(() => {
this.robotInput = false
}, 5000);
}, 10000);
}

3
src/component/HomePage/SketchboardUpload.vue
View File

@@ -346,6 +346,7 @@ export default defineComponent({
}else{
params = 'MalePosition'
}
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
if (rv) {
let arr:any = []
@@ -356,6 +357,8 @@ export default defineComponent({
}
arr.push(obj)
});
(this.$refs.Generate as any).sketchCatecoryList = arr
(this.$refs.Material as any).disignTypeList = arr
this.sketchCatecoryList = arr
}

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

@@ -154,7 +154,7 @@ export default defineComponent({
placement_sacle:30,
perviewUrl:'',//预览的图片地址
isShowMark:false,
modelType:'library',
modelType:'Library',
sex:'Male',
sexList: [
@@ -220,7 +220,7 @@ export default defineComponent({
},
{
title:'HAND',
pointList:[{type:'handLeft',color:'#CCFF7B',show:true,field:'hand'},{type:'handRight',color:'#CCFF7B',show:true,field:'hand'}]
pointList:[{type:'handLeft',color:'#d88e8e',show:true,field:'hand'},{type:'handRight',color:'#d88e8e',show:true,field:'hand'}]
},
]
if(this.printObject.templateId){//编辑
@@ -604,6 +604,7 @@ export default defineComponent({
width: 100%;
.ant-select-selector{
padding: 0;
width: 100%;
margin: 0;
background: rgba(0, 0, 0, 0);
font-size: 1.3rem;
@@ -615,6 +616,10 @@ export default defineComponent({
.ant-select-selection-item, .select_block .ant-select-single .ant-select-selector .ant-select-selection-placeholder{
font-weight: 300 !important;
line-height: 1.5715 !important;
width: 100%;
display: block;
position: relative;
padding: 0;
}
}

6
src/tool/GO.ts
View File

@@ -51,6 +51,10 @@ export default {
})
}
})
},
// magnifying(normalEl,binEl,mouseWH:any){
// let mouseW = mouseWH.width?mouseWH.width:10+'rem'
// let mouseH = mouseWH.height?mouseWH.height:10+'rem'
// normalEl.offsetWidth
// }
}

3
src/tool/https.js
View File

@@ -25,7 +25,8 @@ import { message } from 'ant-design-vue';
// }else{
// httpIp = ''
// }
let httpIp = process.env.NODE_ENV == 'development' ? "http://192.168.1.10:10086" : "";
let httpIp = process.env.NODE_ENV == 'development' ? "" : "";
// let httpIp = process.env.NODE_ENV == 'development' ? "http://192.168.1.10:10086" : "";
console.log(httpIp);
axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
// console.log(process.env.VUE_APP_BASE_URL);

100
src/views/HomeView.vue
View File

@@ -66,8 +66,8 @@
</div>
<div class="right_content_body">
<div class="right_content_img_block scroll_style">
<div class="right_content_img_item" v-mousewheel>
<div class="right_content_img_block scroll_style" v-mousewheel :class="{active:designCollectionList.length != 0}">
<div class="right_content_img_item">
<!-- <draggable
group="people" > -->
<div class="content_img_block" v-for="(
@@ -106,8 +106,8 @@
</div>
<div class="right_content_body">
<div class="right_content_img_block scroll_style">
<div class="right_content_img_item" v-mousewheel id="right_content_img_block">
<div class="right_content_img_block scroll_style" v-mousewheel :class="{active:likeDesignCollectionList.length != 0}">
<div class="right_content_img_item" id="right_content_img_block">
<!-- <div class="content_img_block" v-for="(
design, index
) in likeDesignCollectionList" :key="design?.id" @click="
@@ -301,32 +301,39 @@ export default defineComponent({
directives:{
mousewheel:{
mounted (el) {
let parent = el.parentNode
// el.style.width='100%'
// el.style.height='100%'
// console.log(el);
let num = 0
let width = el.offsetWidth
let parentWidth = parent.offsetWidth
el.addEventListener('mouseover',()=>{
width = el.offsetWidth
parentWidth = parent.offsetWidth
})
el.addEventListener('mousewheel',(e:MouseEvent)=>{
if(0>(e as WheelEvent).deltaY && width>parentWidth){
num+=25
if(num >= 0){
num = 0
}
}else if(0<(e as WheelEvent).deltaY && width>parentWidth){
num-=25
if(num<=parentWidth - width){
num = parentWidth - width
}
// let parent = el.parentNode
// let num = 0
// let width = el.offsetWidth
// let parentWidth = parent.offsetWidth
// el.addEventListener('mouseover',()=>{
// width = el.offsetWidth
// parentWidth = parent.offsetWidth
// })
// el.addEventListener('mousewheel',(e:MouseEvent)=>{
// if(0>(e as WheelEvent).deltaY && width>parentWidth){
// num+=25
// if(num >= 0){
// num = 0
// }
// }else if(0<(e as WheelEvent).deltaY && width>parentWidth){
// num-=25
// if(num<=parentWidth - width){
// num = parentWidth - width
// }
}
// }
el.style.marginLeft = num+'px'
// el.style.marginLeft = num+'px'
// })
el.addEventListener('wheel',(e:WheelEvent)=>{
let num = 0
if(e.deltaY > 0){
num = 25
}else{
num = -25
}
el.scrollBy(num, 0);
})
}
}
@@ -1132,14 +1139,46 @@ export default defineComponent({
height: calc(50% - 5.5rem);
.right_content_img_block {
overflow-y: auto;
// overflow-y: auto;
background: #f6f6fa;
border-radius: 1rem;
height: 100%;
display: flex;
width: auto;
overflow: hidden;
// overflow: hidden;
align-items: center;
padding-bottom: 1rem;
overflow-x: auto;
&.active::-webkit-scrollbar-button:single-button{
display: none;
}
&.active::-webkit-scrollbar {
/* 竖轴的宽度 */
width: 1rem;
/* 横轴的高度 */
height: 1rem;
transition: all .3s;
}
/* 进度 */
&.active::-webkit-scrollbar-thumb {
border-radius: 1rem;
background: rgba(238, 238, 244, 0);
}
/* 轨道 */
&.active::-webkit-scrollbar-track {
border-radius: 1rem;
background: rgba(238, 238, 244, 0);
}
&.active:hover {
// overflow-x: scroll;
&.active::-webkit-scrollbar-thumb {
background: #543087;
}
/* 轨道 */
&.active::-webkit-scrollbar-track {
background: rgba(84, 48, 135,.2);
}
}
>div{
display: flex;
padding: 0 2.8rem 0 0.9rem;
@@ -1156,6 +1195,7 @@ export default defineComponent({
position: relative;
vertical-align: top;
flex-shrink: 0;
max-height: 100%;
&:hover .icon_like {
display: block;
}

7
src/views/LibraryPage.vue
View File

@@ -688,7 +688,12 @@ export default defineComponent({
// background: #FFFFFF;
color: #1A1A1A !important;
.ant-select{
.ant-select-arrow{
.icon-xiala{
margin-left: -2rem;
zoom: .7;
}
}
}
.icon-xiala{
color: #1A1A1A !important;