commit
This commit is contained in:
@@ -11,7 +11,7 @@
|
|||||||
>
|
>
|
||||||
<div class="design_title_text">
|
<div class="design_title_text">
|
||||||
<div>Details</div>
|
<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>
|
||||||
<div class="design_closeIcon" @click.stop="closeModal()">
|
<div class="design_closeIcon" @click.stop="closeModal()">
|
||||||
<i class="fi fi-rr-cross-small"></i>
|
<i class="fi fi-rr-cross-small"></i>
|
||||||
@@ -54,6 +54,9 @@
|
|||||||
<!-- 层 -->
|
<!-- 层 -->
|
||||||
<i class="fi fi-rr-copy" @mousedown="mousedownDesignImg" @mouseup="mouseupDesignImg"></i>
|
<i class="fi fi-rr-copy" @mousedown="mousedownDesignImg" @mouseup="mouseupDesignImg"></i>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-show="ifSubmit" class="subitOkPreviewBtn" @click="submit">
|
||||||
|
Submit
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="detail_modal_body_category">
|
<div class="detail_modal_body_category">
|
||||||
<div v-show="designOrder" class="detail_modal_right_top scroll_style">
|
<div v-show="designOrder" class="detail_modal_right_top scroll_style">
|
||||||
@@ -92,9 +95,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="clothes_detail_item subitOkPreviewBtn" @click="submit">
|
|
||||||
Submit
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<DesignDetailAlter ref="DesignDetailAlter"></DesignDetailAlter>
|
<DesignDetailAlter ref="DesignDetailAlter"></DesignDetailAlter>
|
||||||
@@ -169,7 +170,7 @@ export default defineComponent({
|
|||||||
let designItemId = ref()
|
let designItemId = ref()
|
||||||
let designOutfitId = ref()
|
let designOutfitId = ref()
|
||||||
let userInfo:any = {}
|
let userInfo:any = {}
|
||||||
|
let ifSubmit = ref(false)
|
||||||
return{
|
return{
|
||||||
designItemDetail,
|
designItemDetail,
|
||||||
store,
|
store,
|
||||||
@@ -181,7 +182,8 @@ export default defineComponent({
|
|||||||
body,
|
body,
|
||||||
designItemId,
|
designItemId,
|
||||||
designOutfitId,
|
designOutfitId,
|
||||||
userInfo
|
userInfo,
|
||||||
|
ifSubmit
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data(){
|
data(){
|
||||||
@@ -196,9 +198,11 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
watch:{
|
watch:{
|
||||||
designItemDetail:{
|
designItemDetail:{
|
||||||
handler: function(newval) {
|
handler: function(newVal,oldVal) {
|
||||||
|
|
||||||
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
|
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]))
|
this.current = JSON.parse(JSON.stringify(designItemDetail?.clothes?.[this.currentIndex]))
|
||||||
if(designItemDetail.others[0].layersObject.length != 0){
|
if(designItemDetail.others[0].layersObject.length != 0){
|
||||||
this.body = false
|
this.body = false
|
||||||
@@ -418,6 +422,7 @@ export default defineComponent({
|
|||||||
// designItemId:designItemDetail.designItemId,
|
// designItemId:designItemDetail.designItemId,
|
||||||
designSingleItemDTOList:clothes,
|
designSingleItemDTOList:clothes,
|
||||||
isPreview:false,
|
isPreview:false,
|
||||||
|
ifSubmit:designItemDetail.isPreview,
|
||||||
processId:String(this.userInfo?.userId),
|
processId:String(this.userInfo?.userId),
|
||||||
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
|
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||||
}
|
}
|
||||||
@@ -425,6 +430,7 @@ export default defineComponent({
|
|||||||
data.isPreview = true
|
data.isPreview = true
|
||||||
}else{
|
}else{
|
||||||
data.isPreview = false
|
data.isPreview = false
|
||||||
|
delete data.ifSubmit
|
||||||
}
|
}
|
||||||
this.store.commit('setDesignPreviewData',data)
|
this.store.commit('setDesignPreviewData',data)
|
||||||
return data
|
return data
|
||||||
@@ -710,6 +716,8 @@ export default defineComponent({
|
|||||||
img{
|
img{
|
||||||
// width: 100%;
|
// width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
object-fit: cover;
|
||||||
}
|
}
|
||||||
&.active{
|
&.active{
|
||||||
border: 2px solid rgba(0,0,0,0.4);
|
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{
|
.clothes_item_img_block{
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1080,6 +1080,23 @@ export default defineComponent({
|
|||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
max-height: 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{
|
.content_img_name{
|
||||||
@@ -1125,7 +1142,9 @@ export default defineComponent({
|
|||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
object-fit: cover;
|
object-fit: cover;
|
||||||
}
|
}
|
||||||
|
.operate_file_block .select_img_type .select_category{
|
||||||
|
zoom: .8;
|
||||||
|
}
|
||||||
.delete_file_block{
|
.delete_file_block{
|
||||||
display: none;
|
display: none;
|
||||||
width: 3.2rem;
|
width: 3.2rem;
|
||||||
|
|||||||
@@ -218,6 +218,10 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
if(this.type_ == 1){
|
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].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].path =this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath
|
||||||
// data.designSingleItemDTOList[index].printObject.prints = []
|
// data.designSingleItemDTOList[index].printObject.prints = []
|
||||||
@@ -246,6 +250,7 @@ export default defineComponent({
|
|||||||
designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
|
designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
|
||||||
designItemDetail.clothes[index].minIOPath = rv.clothes[index].minIOPath
|
designItemDetail.clothes[index].minIOPath = rv.clothes[index].minIOPath
|
||||||
designItemDetail.clothes[index].path = rv.clothes[index].path
|
designItemDetail.clothes[index].path = rv.clothes[index].path
|
||||||
|
designItemDetail.ifSubmit = true
|
||||||
// rv.clothes[0].layersObject.forEach((v)=>{
|
// rv.clothes[0].layersObject.forEach((v)=>{
|
||||||
// designItemDetail.clothes[index].layersObject[0].imageUrl = rv.clothes[0].layersObject[0].imageUrl
|
// designItemDetail.clothes[index].layersObject[0].imageUrl = rv.clothes[0].layersObject[0].imageUrl
|
||||||
// designItemDetail.clothes[index].layersObject[0].maskUrl = rv.clothes[0].layersObject[0].maskUrl
|
// designItemDetail.clothes[index].layersObject[0].maskUrl = rv.clothes[0].layersObject[0].maskUrl
|
||||||
|
|||||||
@@ -598,6 +598,7 @@ export default defineComponent({
|
|||||||
designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle
|
designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle
|
||||||
designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
|
designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
|
||||||
designItemDetail.clothes[index].printObject.prints = this.computeZindex()
|
designItemDetail.clothes[index].printObject.prints = this.computeZindex()
|
||||||
|
designItemDetail.ifSubmit = true
|
||||||
designItemDetail.clothes.forEach((item,i)=>{
|
designItemDetail.clothes.forEach((item,i)=>{
|
||||||
let a
|
let a
|
||||||
if(item.layersObject[0].imageCategory.indexOf("back") == -1){
|
if(item.layersObject[0].imageCategory.indexOf("back") == -1){
|
||||||
|
|||||||
@@ -131,15 +131,15 @@
|
|||||||
User
|
User
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="model_img" v-show="systemSeleves">
|
<div class="model_img" v-show="systemSeleves" v-mousewheel>
|
||||||
<div v-mousewheel>
|
<div class="model_img_item">
|
||||||
<div v-for="(item,index) in mannequins?.[0]?.modelList" :key="item.id">
|
<div v-for="(item,index) in mannequins?.[0]?.modelList" :key="item.id">
|
||||||
<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'Library')">
|
<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'Library')">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="model_img" v-show="!systemSeleves">
|
<div class="model_img" v-show="!systemSeleves" v-mousewheel>
|
||||||
<div v-mousewheel>
|
<div class="model_img_item">
|
||||||
<div v-for="(item,index) in mannequins?.[1]?.modelList" :key="item.id">
|
<div v-for="(item,index) in mannequins?.[1]?.modelList" :key="item.id">
|
||||||
<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'System')">
|
<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'System')">
|
||||||
</div>
|
</div>
|
||||||
@@ -286,33 +286,14 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
mousewheel:{
|
mousewheel:{
|
||||||
mounted (el) {
|
mounted (el) {
|
||||||
let parent = el.parentNode
|
el.addEventListener('wheel',(e:WheelEvent)=>{
|
||||||
// el.style.width='100%'
|
|
||||||
// el.style.height='100%'
|
|
||||||
let num = 0
|
let num = 0
|
||||||
let width = el.offsetWidth
|
if(e.deltaY > 0){
|
||||||
let parentWidth = parent.offsetWidth
|
num = 25
|
||||||
|
}else{
|
||||||
el.addEventListener('mouseover',()=>{
|
num = -25
|
||||||
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){
|
el.scrollBy(num, 0);
|
||||||
num-=15
|
|
||||||
if(num<=parentWidth - width){
|
|
||||||
num = parentWidth - width
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
el.style.marginLeft = num+'px'
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -867,6 +848,34 @@ export default defineComponent({
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
align-items: center;
|
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{
|
>div{
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
||||||
|
|||||||
@@ -376,6 +376,7 @@ export default defineComponent({
|
|||||||
this.loadingShow = false
|
this.loadingShow = false
|
||||||
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
|
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
|
||||||
designItemDetail.designItemUrl = rv.designItemUrl
|
designItemDetail.designItemUrl = rv.designItemUrl
|
||||||
|
designItemDetail.ifSubmit = true
|
||||||
designItemDetail.currentFullBodyView = rv.currentFullBodyView
|
designItemDetail.currentFullBodyView = rv.currentFullBodyView
|
||||||
rv.clothes.forEach((item)=>{
|
rv.clothes.forEach((item)=>{
|
||||||
designItemDetail.clothes.forEach((i)=>{
|
designItemDetail.clothes.forEach((i)=>{
|
||||||
|
|||||||
@@ -270,15 +270,8 @@ export default defineComponent({
|
|||||||
type1: "generate",
|
type1: "generate",
|
||||||
type2: prop.msg,
|
type2: prop.msg,
|
||||||
},
|
},
|
||||||
workspaceCom:{}
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch:{
|
|
||||||
workspaceCom(newVal,oldVal){
|
|
||||||
this.workspace = newVal
|
|
||||||
this.getPosition()
|
|
||||||
},
|
|
||||||
},
|
|
||||||
mounted() {
|
mounted() {
|
||||||
// this.fileList.forEach((item,index)=>{
|
// this.fileList.forEach((item,index)=>{
|
||||||
// item.checked = true
|
// item.checked = true
|
||||||
@@ -288,9 +281,6 @@ export default defineComponent({
|
|||||||
// this.store.commit("addGenerateFils", this.fileList);
|
// this.store.commit("addGenerateFils", this.fileList);
|
||||||
this.token = getCookie("token") || "";
|
this.token = getCookie("token") || "";
|
||||||
this.uploadUrl = getUploadUrl();
|
this.uploadUrl = getUploadUrl();
|
||||||
this.workspaceCom = computed(()=>{
|
|
||||||
return this.store?.state?.Workspace?.workspace
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
getSketchLabel(value: any) {
|
getSketchLabel(value: any) {
|
||||||
@@ -312,28 +302,7 @@ export default defineComponent({
|
|||||||
data.resData = JSON.parse(JSON.stringify(data))
|
data.resData = JSON.parse(JSON.stringify(data))
|
||||||
this.store.commit("addGenerateMaterialFils", 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) {
|
beforeUpload(file: any) {
|
||||||
const isJpgOrPng =
|
const isJpgOrPng =
|
||||||
file.type === "image/jpeg" ||
|
file.type === "image/jpeg" ||
|
||||||
@@ -493,7 +462,6 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
likeFile(item:any,str:string){
|
likeFile(item:any,str:string){
|
||||||
|
|
||||||
if(str == 'like'){
|
if(str == 'like'){
|
||||||
let data = {
|
let data = {
|
||||||
generateDetailId:item.id,
|
generateDetailId:item.id,
|
||||||
|
|||||||
@@ -125,7 +125,6 @@ export default defineComponent({
|
|||||||
type2:prop.msg
|
type2:prop.msg
|
||||||
},
|
},
|
||||||
store: useStore(),
|
store: useStore(),
|
||||||
workspaceCom:{}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
directives:{
|
directives:{
|
||||||
@@ -175,9 +174,7 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
this.workspaceCom = computed(()=>{
|
|
||||||
return this.store?.state?.Workspace?.workspace
|
|
||||||
})
|
|
||||||
// let loding = document.getElementsByClassName("material_content_list_loding")[0]
|
// let loding = document.getElementsByClassName("material_content_list_loding")[0]
|
||||||
// let bodyLoding = document.getElementsByClassName("material_content_body")[0]
|
// let bodyLoding = document.getElementsByClassName("material_content_body")[0]
|
||||||
// const ob = new IntersectionObserver(callback,{
|
// const ob = new IntersectionObserver(callback,{
|
||||||
@@ -200,10 +197,6 @@ export default defineComponent({
|
|||||||
// }
|
// }
|
||||||
},
|
},
|
||||||
watch:{
|
watch:{
|
||||||
workspaceCom(newVal,oldVal){
|
|
||||||
this.workspace = newVal
|
|
||||||
this.getPosition()
|
|
||||||
},
|
|
||||||
sketchboardList:{
|
sketchboardList:{
|
||||||
handler(newVal:any,oldVal:any){
|
handler(newVal:any,oldVal:any){
|
||||||
// this.store.state.Workspace.workspace
|
// this.store.state.Workspace.workspace
|
||||||
@@ -260,27 +253,6 @@ export default defineComponent({
|
|||||||
this.getLibraryList()
|
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){
|
selectImgItem(imgData:any){
|
||||||
imgData.type_ = this.type_
|
imgData.type_ = this.type_
|
||||||
imgData.resData = JSON.parse(JSON.stringify(imgData))
|
imgData.resData = JSON.parse(JSON.stringify(imgData))
|
||||||
@@ -341,7 +313,6 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
aa.push(item)
|
aa.push(item)
|
||||||
});
|
});
|
||||||
|
|
||||||
this.imgList = aa
|
this.imgList = aa
|
||||||
this.total = rv.total
|
this.total = rv.total
|
||||||
this.isShowLoading = false
|
this.isShowLoading = false
|
||||||
|
|||||||
@@ -241,10 +241,10 @@ export default defineComponent({
|
|||||||
this.clearTimer()
|
this.clearTimer()
|
||||||
this.timeTop = setInterval(() => {
|
this.timeTop = setInterval(() => {
|
||||||
this.robotTop = false
|
this.robotTop = false
|
||||||
}, 10000);
|
}, 15000);
|
||||||
this.timeInput = setInterval(() => {
|
this.timeInput = setInterval(() => {
|
||||||
this.robotInput = false
|
this.robotInput = false
|
||||||
}, 5000);
|
}, 10000);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -346,6 +346,7 @@ export default defineComponent({
|
|||||||
}else{
|
}else{
|
||||||
params = 'MalePosition'
|
params = 'MalePosition'
|
||||||
}
|
}
|
||||||
|
|
||||||
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
|
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
|
||||||
if (rv) {
|
if (rv) {
|
||||||
let arr:any = []
|
let arr:any = []
|
||||||
@@ -356,6 +357,8 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
arr.push(obj)
|
arr.push(obj)
|
||||||
});
|
});
|
||||||
|
(this.$refs.Generate as any).sketchCatecoryList = arr
|
||||||
|
(this.$refs.Material as any).disignTypeList = arr
|
||||||
|
|
||||||
this.sketchCatecoryList = arr
|
this.sketchCatecoryList = arr
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ export default defineComponent({
|
|||||||
placement_sacle:30,
|
placement_sacle:30,
|
||||||
perviewUrl:'',//预览的图片地址
|
perviewUrl:'',//预览的图片地址
|
||||||
isShowMark:false,
|
isShowMark:false,
|
||||||
modelType:'library',
|
modelType:'Library',
|
||||||
sex:'Male',
|
sex:'Male',
|
||||||
sexList: [
|
sexList: [
|
||||||
|
|
||||||
@@ -220,7 +220,7 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title:'HAND',
|
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){//编辑
|
if(this.printObject.templateId){//编辑
|
||||||
@@ -604,6 +604,7 @@ export default defineComponent({
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
.ant-select-selector{
|
.ant-select-selector{
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
width: 100%;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
background: rgba(0, 0, 0, 0);
|
background: rgba(0, 0, 0, 0);
|
||||||
font-size: 1.3rem;
|
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{
|
.ant-select-selection-item, .select_block .ant-select-single .ant-select-selector .ant-select-selection-placeholder{
|
||||||
font-weight: 300 !important;
|
font-weight: 300 !important;
|
||||||
line-height: 1.5715 !important;
|
line-height: 1.5715 !important;
|
||||||
|
width: 100%;
|
||||||
|
display: block;
|
||||||
|
position: relative;
|
||||||
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
@@ -25,7 +25,8 @@ import { message } from 'ant-design-vue';
|
|||||||
// }else{
|
// }else{
|
||||||
// httpIp = ''
|
// 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);
|
console.log(httpIp);
|
||||||
axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
|
axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
|
||||||
// console.log(process.env.VUE_APP_BASE_URL);
|
// console.log(process.env.VUE_APP_BASE_URL);
|
||||||
|
|||||||
@@ -66,8 +66,8 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="right_content_body">
|
<div class="right_content_body">
|
||||||
<div class="right_content_img_block scroll_style">
|
<div class="right_content_img_block scroll_style" v-mousewheel :class="{active:designCollectionList.length != 0}">
|
||||||
<div class="right_content_img_item" v-mousewheel>
|
<div class="right_content_img_item">
|
||||||
<!-- <draggable
|
<!-- <draggable
|
||||||
group="people" > -->
|
group="people" > -->
|
||||||
<div class="content_img_block" v-for="(
|
<div class="content_img_block" v-for="(
|
||||||
@@ -106,8 +106,8 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="right_content_body">
|
<div class="right_content_body">
|
||||||
<div class="right_content_img_block scroll_style">
|
<div class="right_content_img_block scroll_style" v-mousewheel :class="{active:likeDesignCollectionList.length != 0}">
|
||||||
<div class="right_content_img_item" v-mousewheel id="right_content_img_block">
|
<div class="right_content_img_item" id="right_content_img_block">
|
||||||
<!-- <div class="content_img_block" v-for="(
|
<!-- <div class="content_img_block" v-for="(
|
||||||
design, index
|
design, index
|
||||||
) in likeDesignCollectionList" :key="design?.id" @click="
|
) in likeDesignCollectionList" :key="design?.id" @click="
|
||||||
@@ -301,32 +301,39 @@ export default defineComponent({
|
|||||||
directives:{
|
directives:{
|
||||||
mousewheel:{
|
mousewheel:{
|
||||||
mounted (el) {
|
mounted (el) {
|
||||||
let parent = el.parentNode
|
// let parent = el.parentNode
|
||||||
// el.style.width='100%'
|
// let num = 0
|
||||||
// el.style.height='100%'
|
// let width = el.offsetWidth
|
||||||
// console.log(el);
|
// 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.addEventListener('wheel',(e:WheelEvent)=>{
|
||||||
let num = 0
|
let num = 0
|
||||||
let width = el.offsetWidth
|
if(e.deltaY > 0){
|
||||||
let parentWidth = parent.offsetWidth
|
num = 25
|
||||||
el.addEventListener('mouseover',()=>{
|
}else{
|
||||||
width = el.offsetWidth
|
num = -25
|
||||||
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){
|
el.scrollBy(num, 0);
|
||||||
num-=25
|
|
||||||
if(num<=parentWidth - width){
|
|
||||||
num = parentWidth - width
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
el.style.marginLeft = num+'px'
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1132,14 +1139,46 @@ export default defineComponent({
|
|||||||
height: calc(50% - 5.5rem);
|
height: calc(50% - 5.5rem);
|
||||||
|
|
||||||
.right_content_img_block {
|
.right_content_img_block {
|
||||||
overflow-y: auto;
|
// overflow-y: auto;
|
||||||
background: #f6f6fa;
|
background: #f6f6fa;
|
||||||
border-radius: 1rem;
|
border-radius: 1rem;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
width: auto;
|
width: auto;
|
||||||
overflow: hidden;
|
// overflow: hidden;
|
||||||
align-items: center;
|
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{
|
>div{
|
||||||
display: flex;
|
display: flex;
|
||||||
padding: 0 2.8rem 0 0.9rem;
|
padding: 0 2.8rem 0 0.9rem;
|
||||||
@@ -1156,6 +1195,7 @@ export default defineComponent({
|
|||||||
position: relative;
|
position: relative;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
max-height: 100%;
|
||||||
&:hover .icon_like {
|
&:hover .icon_like {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -688,7 +688,12 @@ export default defineComponent({
|
|||||||
// background: #FFFFFF;
|
// background: #FFFFFF;
|
||||||
color: #1A1A1A !important;
|
color: #1A1A1A !important;
|
||||||
.ant-select{
|
.ant-select{
|
||||||
|
.ant-select-arrow{
|
||||||
|
.icon-xiala{
|
||||||
|
margin-left: -2rem;
|
||||||
|
zoom: .7;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.icon-xiala{
|
.icon-xiala{
|
||||||
color: #1A1A1A !important;
|
color: #1A1A1A !important;
|
||||||
|
|||||||
Reference in New Issue
Block a user