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:
X1627315083
2023-12-20 17:03:42 +08:00
parent 6297b75d68
commit 5674df060f
18 changed files with 144 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@
<i class="fi fi-rr-edit" @click.stop="openCurrent(2)"></i>
</div>
<div class="Guide_1_20" :class="[driver__.driver?'showEvents':'']">
<div class="centent_div" v-if="current?.printObject?.prints[0]?.path" @click="openCurrent(2)">
<div class="centent_div" v-if="current?.printObject?.prints?.[0]?.path" @click="openCurrent(2)">
<img :src="current?.printObject?.prints[0]?.path" alt="">
</div>
<i v-else class="fi fi-rr-picture centent" @click="openCurrent(2)"></i>
@@ -188,6 +188,8 @@ export default defineComponent({
let currentIndex:any = ref(0)
let current:any = ref({})//点击上衣或者下衣
provide('current',current)
provide('designItemDetail',designItemDetail)
provide('currentIndex',currentIndex)
let frontBack:any = ref({})
let body = ref(false)
let designItemId = ref()
@@ -202,6 +204,7 @@ export default defineComponent({
return store.state.Guide.guide
})
provide('driver__',driver__)
provide('body',body)
let moible:any = isMoible()
provide('moible',moible)
let {t} = useI18n()
@@ -1064,6 +1067,7 @@ export default defineComponent({
}
&.active{
width: 100%;
max-height: 100%;
}
.detail_modal_item_front,.detail_modal_item_back{
cursor: pointer;
@@ -1071,15 +1075,20 @@ export default defineComponent({
img{
// width: 100%;
max-height: 100%;
width: auto;
}
&.active{
top: 50%;
left: 50%;
width: 100%;
max-width: 100%;
max-height: 100%;
transform: translate(-50%,-50%);
img{
width: 100%;
max-width: 100%;
width: auto;
margin: 0 auto;
display: flex;
}
}
}

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

@@ -55,6 +55,7 @@
>
{{ file.level2Type }}
<div
v-if="!body"
:class="[
'icon',
'iconfont',
@@ -67,6 +68,7 @@
</div>
</div>
<div
v-if="!body"
class="category_list"
v-show="file.categoryShow"
>
@@ -140,6 +142,7 @@
>
{{ file.level2Type }}
<div
v-if="!body"
:class="[
'icon',
'iconfont',
@@ -151,6 +154,7 @@
></div>
</div>
<div
v-if="!body"
class="category_list"
v-show="file.categoryShow"
>
@@ -311,6 +315,7 @@ export default defineComponent({
let select = ref(false);
let current = inject('current')//父组件传过来的数据
let driver__ = inject('driver__')//父组件传过来的数据
let body = inject('body')//父组件传过来的数据
let openClick = ref(1);
let searchPictureName = ref('')
//模型印花
@@ -358,6 +363,7 @@ export default defineComponent({
selectColorList,
workspace,
driver__,
body,
t,
}
},
@@ -575,7 +581,8 @@ export default defineComponent({
file.url = res.data.url;
file.resData = res.data;
file.designType = res.data.designType
file.level2Type = res.data.level2Type;
let type = this.body?this.current.type:res.data.level2Type
file.level2Type = type;
file.minIOPath = file.resData.minIOPath
let fileList = this.uploadList.filter(
(v) => v.status === "done"
@@ -633,7 +640,8 @@ export default defineComponent({
this.uploadList = []
this.apparelList = []
this.printList = []
DesignDetailEnd.colorList = [{},{},{},{},{},{},{},{}]
DesignDetailEnd.colorList = [{},{},{},{},{},{},{},{},{}]
// DesignDetailEnd.colorList = [{}]
DesignDetailEnd.sketchImg={}
this.terminate()
},
@@ -698,10 +706,11 @@ export default defineComponent({
},
//请求我的印花&&模型
getLibraryList(){
let type = this.body?this.current.type:''
let workspace = this.store.state.Workspace.workspace
let data = {
level1Type:this.selectCode,
// level2Type:this.designType,
level2Type:this.selectCode == 'Sketchboard'?type:'',
modelSex:workspace?.sex,
page:this.currentPage,
pictureName:this.searchPictureName,
@@ -841,7 +850,7 @@ export default defineComponent({
},
//查询颜色的潘通值和txc
getPantongName(v) {
if(!v.r){
if(v?.r == undefined){
return
}
let color = [v.r, v.g, v.b];

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

@@ -73,7 +73,6 @@
<div class="modal_img">
<div class="modal_img_item" v-for="color,index in colorList" :key="color" >
<div :title="color?.name?color?.name:''" @click="selectColorItem(index,color)" @dblclick="setSelectColorItem(color)" :class="['upload_color',selectIndex === index ? 'select_upload_color' : '',]" :style="{background:`rgba(${color?.r},${color?.g},${color?.b},${color?.a})`}">
<!-- <div class="color_content" :style="{background:`#6c6cac`}"></div> -->
<div class="color_content" :style="{'background-color':`rgba(${color.rgba?.r},${color.rgba?.g},${color.rgba?.b},${color.rgba?.a})`}">
</div>
<div class="color_content_body">
@@ -86,8 +85,7 @@
</div>
<div v-show="type_ == 1 || type_ == 3" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div>
<div v-if="type_ == 2 && current?.printObject?.prints?.[0]?.path != null" @click.stop="setPrint" class="subitOkPreviewBtn Guide_1_23">{{ $t('DesignDetailEnd.Layout') }}</div>
<div v-else-if="type_ == 2 && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div>
<div v-else-if="type_ == 2 && designItemDetail?.clothes?.[currentIndex]?.printObject?.prints?.[0]?.path != null && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div>
<DesignPrintOperation v-if="!moible" ref="DesignPrintOperation"></DesignPrintOperation>
<DesignPrintOperationMobile v-else ref="DesignPrintOperationMobile"></DesignPrintOperationMobile>
</div>
@@ -121,13 +119,16 @@ export default defineComponent({
let sketchImg = ref({})
let driver__ = inject('driver__')//父组件传过来的数据
let moible = inject('moible')//父组件传过来的数据
let designItemDetail = inject('designItemDetail')//父组件传过来的数据
let currentIndex = inject('currentIndex')//父组件传过来的数据
let previewShow = ref(false)
//印花
let overallSingle = ref(false)
let systemDesignerPercentage = ref(30)
//颜色
let colorList = ref([{},{},{},{},{},{},{},{}])
// let colorList = ref([{}])
let colorList = ref([{},{},{},{},{},{},{},{},{}])
//加载中
let loadingShow = ref(false)
@@ -140,6 +141,9 @@ export default defineComponent({
sketchImg,
driver__,
moible,
designItemDetail,
currentIndex,
previewShow,
type_,
overallSingle,
systemDesignerPercentage,
@@ -208,21 +212,24 @@ export default defineComponent({
let parent = this.$parent
this.selectIndex = index
this.$parent.selectIndex = index
if(this.$parent.selectColor.rgba.r == color?.rgba?.r && this.$parent.selectColor.rgba.g == color?.rgba?.g && this.$parent.selectColor.rgba.b == color?.rgba?.b){
if(color.rgba?.r){
hex = parent.rgbaToHex([color.rgba.r,color.rgba.g,color.rgba.b])
}else{
this.$parent.selectColor = {}
return
}
if(color.rgba?.r){
hex = parent.rgbaToHex([color.rgba.r,color.rgba.g,color.rgba.b,color.rgba.a])
}else{
hex = '#FFFFFF'
//判断是否对一个颜色重复点击
if(this.$parent.selectColor?.rgba?.r == color?.rgba?.r && this.$parent.selectColor.rgba.g == color?.rgba?.g && this.$parent.selectColor.rgba.b == color?.rgba?.b){
return
}
this.$parent.selectColor = color?.rgba?.r ? {rgba:{r:color.rgba?.r,g:color.rgba?.g,b:color.rgba?.b,a:color.rgba?.a},hex:hex} : {rgba:{r:255,g:255,b:255,a:1},hex:hex}
this.$parent.selectColor = {rgba:{r:color.rgba?.r,g:color.rgba?.g,b:color.rgba?.b,a:color.rgba?.a},hex:hex}
this.$parent.tcxColor = ''
this.$parent.pantongName = ''
},
setSelectColorItem(color){
let designItemDetail = this.store.state.DesignDetailModule.designItemDetail
let string = `${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a}`
let string = `${color.rgba.r},${color.rgba.g},${color.rgba.b}`
this.current.color = string
designItemDetail.clothes.forEach((element,index) => {
if(element.id == this.current.id){
@@ -265,6 +272,10 @@ export default defineComponent({
data.designSingleItemDTOList[index].printObject.ifSingle = false
data.designSingleItemDTOList[index].printObject.prints = []
}else if(this.type_ == 3){
if(this.$parent.selectColor?.rgba?.r == undefined){
message.info(this.t('DesignDetailEnd.jsContent2'))
return
}
let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
data.designSingleItemDTOList[index].color = color
}
@@ -474,10 +485,13 @@ export default defineComponent({
.modal_img_item{
margin: 0 1rem 1rem 0;
position: relative;
cursor: pointer;
// cursor: pointer;
border: 0.1rem solid #DCDCEC;
//放8个
height: 8.5rem;
width: 7rem;
// height: 32rem;
// width: 25rem;
overflow: hidden;
@media screen and (max-width: 1440px) {
&.modal_img_item {
@@ -487,11 +501,13 @@ export default defineComponent({
box-sizing: border-box;
.color_content{
width: 100%;
//放8个
height: 4rem;
// height: 25rem;
}
.color_content_body{
.color_des{
font-size: 1.2rem;
// font-size: 1.8rem;
font-weight: 600;
white-space: nowrap;
width: 100%;

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

@@ -61,7 +61,7 @@
</div>
</div>
<div class="subitOkPreviewBtn" @click.stop="setPreview">{{ $t('DesignPrintOperation.preview') }}</div>
<div class="subitOkPreviewBtn Guide_1_25_1" @click.stop="setOK">OK</div>
<div class="subitOkPreviewBtn Guide_1_25_1" :class="[driver__.driver?'hideEvents':'']" @click.stop="setOK">OK</div>
</div>
</div>
@@ -662,16 +662,13 @@ export default defineComponent({
designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
designItemDetail.clothes[index].printObject.prints = this.computeZindex()
designItemDetail.ifSubmit = true
console.log(rv,index);
designItemDetail.clothes.forEach((item,i)=>{
let a
console.log(1);
if(item.layersObject[0].imageCategory.indexOf("back") == -1){
a = item.layersObject[0]
item.layersObject[0] = item.layersObject[1]
item.layersObject[1] = a
}
console.log(2);
item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0].id
item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id
})
@@ -693,6 +690,9 @@ export default defineComponent({
},
setOK(){
this.designOpenrtion = false
if(this.driver__.driver){
driverObj__.moveNext();
}
},
clearModal(){
this.printAmount = 1//显示数量
@@ -795,10 +795,13 @@ export default defineComponent({
.designOpenrtion_entirety_img{
height: 100%;
img{
height: 100%;
max-width: 100%;
max-height: 100%;
object-fit: contain;
position: relative;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
}
}
}

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

@@ -784,10 +784,13 @@ export default defineComponent({
.designOpenrtion_entirety_img{
height: 100%;
img{
height: 100%;
max-width: 100%;
max-height: 100%;
object-fit: contain;
position: relative;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
}
}
}

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

@@ -270,8 +270,14 @@ export default defineComponent({
this.store.commit("addGenerateMaterialFils", imgData);
},
//选择所有的图片
getLibraryList(str:any){
let workspace = this.store.state.Workspace.workspace
async getLibraryList(str:any){
let workspace = JSON.parse(JSON.stringify(this.store.state.Workspace.workspace))
if(this.searchPictureName != this.isOldSearchPictureName || this.workspace?.sex != workspace.sex){
this.imgList = []
this.currentPage = 1
}else{
}
if(str == 'di'){
this.currentPage = this.imgList?.[0]?.id != undefined?this.imgList?.length / this.pageSize+1:1
}
@@ -287,7 +293,7 @@ export default defineComponent({
}
this.isShowLoading = true
Https.axiosPost(Https.httpUrls.queryLibraryPage,data).then(
await Https.axiosPost(Https.httpUrls.queryLibraryPage,data).then(
(rv: any) => {
this.total = rv.total
let aa:any = []
@@ -318,15 +324,13 @@ export default defineComponent({
}
aa.push(item)
});
if(this.searchPictureName != this.isOldSearchPictureName){
this.imgList = []
}else{
}
this.isOldSearchPictureName = this.searchPictureName
if((aa[aa.length-1].id == this.imgList[this.imgList.length-1]?.id) && aa?.[aa.length-1]?.id){
}else{
this.imgList.push(...aa)
}
this.workspace = workspace
// this.imgList = aa
this.isShowLoading = false
}

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

@@ -662,6 +662,7 @@ export default defineComponent({
}
.modal_img_max{
// flex: 1;
width: 57rem;
height: 35rem;
position: relative;
.mark_loading{
@@ -681,6 +682,8 @@ export default defineComponent({
>img{
// height: 100%;
width: 100%;
max-height: 100%;
object-fit: contain;
}
&.active{
flex-direction: row;

1
src/component/HomePage/layout.vue
View File

@@ -725,7 +725,6 @@ export default defineComponent({
flex-direction: column;
flex-wrap: wrap;
align-content: space-around;
width: 50%;
margin: 3rem auto;
overflow: hidden;
// padding: 3rem 0;