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

fix

Browse Source
This commit is contained in:
X1627315083
2023-12-15 11:10:32 +08:00
parent a917bf66d2
commit a5317551f7
13 changed files with 139 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,7 +253,11 @@ export default defineComponent({
handler: async function(newVal,oldVal) {
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
this.ifSubmit = designItemDetail.ifSubmit?designItemDetail.ifSubmit:false
this.current = JSON?.parse(JSON?.stringify(designItemDetail?.clothes?.[this?.currentIndex]))
if(newVal.clothes.length == 0){
this.current = ''
}else{
this.current = JSON?.parse(JSON?.stringify(designItemDetail?.clothes?.[this?.currentIndex]))
}
if(designItemDetail.others[0].layersObject.length != 0){
this.body = false
}else{
@@ -781,7 +785,22 @@ export default defineComponent({
this.designItemDetail.clothes.forEach((item:any)=>{
item.clothesOpen = false
})
let color = this.designItemDetail.clothes[0].color
let color
if(this.designItemDetail.clothes[0]){
color = this.designItemDetail.clothes[0].color
}else{
color = {
"id": '',
"name": "Brilliant White New",
"tcx": "11-1123",
"r": 255,
"g": 255,
"b": 255,
"h": 0,
"s": 0,
"v": 100
}
}
let aa = {
"id": '',
"type": "",
@@ -802,17 +821,21 @@ export default defineComponent({
// let DesignDetailAlter:any = this.$refs.DesignDetailAlter
// DesignDetailAlter.changePlace()
this.designOrder = true
if(this.designItemDetail.clothes[this.designItemDetail.clothes.length-1].id){
this.designItemDetail.clothes.push(aa)
this.clothesDetail(aa,this.designItemDetail.clothes.length-1)
let DesignDetailAlter:any = this.$refs.DesignDetailAlter
DesignDetailAlter.init(1)
// this.current = aa
// this.designOrder = true
// let DesignDetailAlter:any = this.$refs.DesignDetailAlter
// DesignDetailAlter.changePlace()
}else{
}
this.designItemDetail.clothes.push(aa)
this.clothesDetail(aa,this.designItemDetail.clothes.length-1)
let DesignDetailAlter:any = this.$refs.DesignDetailAlter
DesignDetailAlter.init(1)
// if(this.designItemDetail.clothes?.[this.designItemDetail.clothes.length-1]?.id){
// // this.current = aa
// // this.designOrder = true
// // let DesignDetailAlter:any = this.$refs.DesignDetailAlter
// // DesignDetailAlter.changePlace()
// }else{
// this.designItemDetail.clothes.push(aa)
// this.clothesDetail(aa,this.designItemDetail.clothes.length-1)
// let DesignDetailAlter:any = this.$refs.DesignDetailAlter
// DesignDetailAlter.init(1)
// }
},
//元素替换

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

@@ -1431,12 +1431,23 @@ export default defineComponent({
bottom: -.5rem;
right: .5rem;
border-radius: .5rem;
}
.vc-chrome-fields{
.vc-input__label{
margin-top: 1rem;
}
}
.vc-chrome-fields:nth-child(2){
>:last-of-type {
display: none;
}
}
.vc-chrome-fields:nth-child(3){
>:last-of-type {
display: none;
}
}
}
.vc-chrome-controls{
align-items: center;

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

@@ -251,6 +251,7 @@ export default defineComponent({
})
if(!this.current.id){
data.designSingleItemDTOList[index].priority = zIndex+=1
}
if(this.type_ == 1){
if(data.designSingleItemDTOList[index].path != this.sketchImg.minIOPath && this.sketchImg.id_){
@@ -267,30 +268,7 @@ export default defineComponent({
let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
data.designSingleItemDTOList[index].color = color
}
// if(!bor){
// index = designItemDetail.clothes.length
// let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
// let obj = {
// "color": color,
// "id": this.sketchImg.id_? this.sketchImg.id_:this.current.id_,
// "path": this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath,
// "offset": [
// 0,
// 0
// ],
// "scale": 1,
// "printObject": {
// "ifSingle": false,
// "prints": [
// ]
// },
// priority:zIndex,
// "type": this.sketchImg.type
// }
// // data.designSingleItemDTOList.push(obj)
// // designItemDetail.clothes.push(obj)
// }
// return
data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
this.loadingShow = true
Https.axiosPost(Https.httpUrls.designSingle, data).then(
@@ -310,7 +288,7 @@ export default defineComponent({
}else{
}
if(!designItemDetail.clothes[index].id){
if(!this.current.id ){
designItemDetail.clothes[index].priority = zIndex
}
}

10
src/component/HomePage/ColorboardUpload.vue
View File

@@ -781,6 +781,16 @@ export default defineComponent({
margin-top: 1rem;
}
}
.vc-chrome-fields:nth-child(2){
>:last-of-type {
display: none;
}
}
.vc-chrome-fields:nth-child(3){
>:last-of-type {
display: none;
}
}
}
.vc-chrome-controls{
align-items: center;

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

@@ -658,7 +658,6 @@ export default defineComponent({
},
scaleImage(){
let scaleImage:any = this.$refs.scaleImage
scaleImage.init(this.fileList)
},
closeModal() {

23
src/component/HomePage/PrintboardUpload.vue
View File

@@ -117,6 +117,9 @@
<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
</div>
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage()"></i>
</div>
<div class="pin_block">
<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
</div>
@@ -128,7 +131,7 @@
</div>
</div>
</div>
<scaleImage ref="scaleImage"></scaleImage>
<Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper>
</div>
</template>
@@ -146,12 +149,14 @@ import Generate from "@/component/HomePage/Generate.vue";
import GO from "@/tool/GO";
import { useI18n } from 'vue-i18n';
import { openGuide,driverObj__ } from "@/tool/guide";
import scaleImage from "@/component/HomePage/scaleImage.vue";
export default defineComponent({
components:{
Cropper,
Material,
Generate
Generate,
scaleImage,
},
setup(){
let store:any =useStore()
@@ -164,7 +169,8 @@ export default defineComponent({
})
let openClick: any = ref(1);
let generateCheckbox:any = ref()
let generateList:any = ref([])
let generateList:any = ref([
])
let loadingShow = ref(false)
let inputShow = ref(false)
let inputTime = ref()
@@ -601,6 +607,9 @@ export default defineComponent({
return
}
}
if(generateType == 'image'){
data.text = ''
}
this.loadingShow = true
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
(rv) => {
@@ -712,7 +721,10 @@ export default defineComponent({
})
},
scaleImage(){
let scaleImage:any = this.$refs.scaleImage
scaleImage.init(this.generateList)
},
generageAdd(item:any){
item.type_ = {
type1: "generate",
@@ -912,6 +924,9 @@ export default defineComponent({
text-align: center;
line-height: 3.2rem;
left: auto;
&.left{
left: .9rem;
}
.icon-shanchu{
font-size: 1.6rem;
color: #fff;

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

@@ -27,6 +27,9 @@
<i v-if="imgItem.id == null" class="fi fi-rr-heart" @click.stop="likeFile(imgItem,imgIndex,index)"></i>
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(imgItem,imgIndex,index)"></i>
</div>
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img)"></i>
</div>
</div>
</div>
</div>
@@ -46,11 +49,13 @@
<div class="robot_btn">
<i class="fi fi-ss-paper-plane-top" @click="roborSend"></i>
</div>
</div>
<div class="robot_img">
<img src="@/assets/images/homePage/robot.png" @click="robotBtn">
</div>
</div>
<scaleImage ref="scaleImage"></scaleImage>
</div>
</template>
<script lang="ts">
@@ -61,11 +66,13 @@ import { getCookie,setCookie } from "@/tool/cookie";
import { useStore } from "vuex";
import { message } from "ant-design-vue";
import { openGuide,driverObj__,setDestroy } from "@/tool/guide";
import scaleImage from "@/component/HomePage/scaleImage.vue";
import { useI18n } from "vue-i18n";
export default defineComponent({
components: {
DownOutlined,
UserOutlined,
scaleImage,
},
setup() {
const robotDom = ref<HTMLElement | null>(null);
@@ -224,6 +231,14 @@ export default defineComponent({
}
})
},
scaleImage(img){
let scaleImage:any = this.$refs.scaleImage
img.forEach((item:any) => {
item.imgUrl = item.presignedUrl
});
scaleImage.init(img)
scaleImage.scaleImageMask = true
},
robotmax(){//点击内容就设置为true显示 重置定时器
this.createTimer()
},

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

@@ -239,6 +239,9 @@
<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
</div>
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage()"></i>
</div>
<div class="pin_block">
<a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox>
</div>
@@ -249,6 +252,7 @@
</div>
</div>
</div>
<scaleImage ref="scaleImage"></scaleImage>
<!-- <layout ref="layout" :moodb_className="moodb_className" :flex_direction="flex_direction" @setmoodbClass="setmoodbClass"></layout> -->
@@ -265,16 +269,17 @@ import { useStore } from "vuex";
import { message, Upload } from "ant-design-vue";
import Material from "@/component/HomePage/Material.vue";
import Generate from "@/component/HomePage/Generate.vue";
import scaleImage from "@/component/HomePage/scaleImage.vue";
import { Https } from "@/tool/https";
import { openGuide,driverObj__ } from "@/tool/guide";
import { useI18n } from "vue-i18n";
export default defineComponent({
components: { Material, Generate },
components: { Material, Generate,scaleImage },
setup() {
let fileList: any = ref([]);
let fileList: any = ref([
]);
let openClick: any = ref(1);
let generateList:any = ref([
])
let store:any =useStore()
@@ -429,6 +434,10 @@ export default defineComponent({
})
}
},
scaleImage(){
let scaleImage:any = this.$refs.scaleImage
scaleImage.init(this.generateList)
},
getgenerateCheckbox(value:any){
this.generateCheckbox = value
},
@@ -700,6 +709,9 @@ export default defineComponent({
return
}
}
if(generateType == 'image'){
data.text = ''
}
this.loadingShow = true
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
(rv) => {
@@ -917,6 +929,9 @@ export default defineComponent({
text-align: center;
line-height: 3.2rem;
left: auto;
&.left{
left: .9rem;
}
.icon-shanchu{
font-size: 1.6rem;
color: #fff;

8
src/component/HomePage/scaleImage.vue
View File

@@ -7,7 +7,7 @@
:maskClosable="false"
:centered="true"
:closable="false"
:mask="false"
:mask="scaleImageMask"
:keyboard="false"
:destroyOnClose="true"
>
@@ -66,6 +66,7 @@ export default defineComponent({
let scaleImageList:any = ref([
])
let scaleImageMask:any = ref(false)
let scaleImageIndex:any = ref(0)
return {
scaleImage,
@@ -73,6 +74,7 @@ export default defineComponent({
visible,
setVisible,
scaleImageList,
scaleImageMask,
scaleImageIndex,
};
},
@@ -89,6 +91,8 @@ export default defineComponent({
init(list:any){
this.scaleImage = true
this.scaleImageList = list
console.log(list);
// let scaleImageList = this.store.state.UploadFilesModule.moodboard
},
cancelDsign(){
@@ -177,7 +181,7 @@ export default defineComponent({
.scaleImage_content{
display: flex;
justify-content: center;
height: 100%;
height: 75%;
margin-top: 5rem;
img{
width: auto;