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-22 15:42:41 +08:00
parent a51b7f2915
commit 15d0b78a0f
8 changed files with 107 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -497,8 +497,6 @@ export default defineComponent({
back:back,
body:body,
}
console.log(this.frontBack);
},
setDesignCoverage(str:string){
let {design,index,collectionList} = this.parentData

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

@@ -161,6 +161,7 @@ import { Modal,message,Upload} from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { openGuide,driverObj__ } from "@/tool/guide";
import { useI18n } from "vue-i18n";
import { position } from "html2canvas/dist/types/css/property-descriptors/position";
export default defineComponent({
components: {
DownOutlined,
@@ -202,8 +203,17 @@ export default defineComponent({
])
let sex = ref([
])
let position = ref([
{
name:'FemalePosition',
value:[],
},{
name:'MalePosition',
value:[],
},
])
const {t} = useI18n()
return{
systemSeleves,
@@ -215,6 +225,7 @@ export default defineComponent({
workspaceItemName,
singleTypeList,
sex,
position,
t
}
},
@@ -315,6 +326,7 @@ export default defineComponent({
mounted() {
this.getworkspace()
this.getSex()
this.getPosition()
},
directives:{
fade:{
@@ -360,27 +372,32 @@ export default defineComponent({
}
})
},
async getPosition(str:any){
let params
setPosition(str:any){
let num
if(this.workspaceItem.sexEnum.name == 'Female'){
params = 'FemalePosition'
num = 0
}else{
params = 'MalePosition'
num = 1
}
await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
this.singleTypeList = this.position[num].value
this.store.commit("setWorkspacePosition", this.position[num].value);
if(str == 'sex'){
this.workspaceItem.position = this.singleTypeList[0].name
this.workspaceItem.positionEnum = this.singleTypeList[0]
}
},
getPosition(){
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'FemalePosition'}}).then((rv: any) => {
if (rv) {
this.singleTypeList = rv
this.store.commit("setWorkspacePosition", rv);
if(str == 'sex'){
this.workspaceItem.position = this.singleTypeList[0].name
this.workspaceItem.positionEnum = this.singleTypeList[0]
}
this.position[0].value = rv
}
})
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'MalePosition'}}).then((rv: any) => {
if (rv) {
this.position[1].value = rv
}
})
},
setPosition(){
this.workspaceItem.position = this.singleTypeList[0].name
this.workspaceItem.positionEnum = this.singleTypeList[0]
},
getworkspace(){
// Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:3}}).then((rv: any) => {
@@ -405,7 +422,7 @@ export default defineComponent({
if(v.id == (this.workspaceItem.id?this.workspaceItem.id:rv.id)){
this.workspaceItem = v
this.setMannequinsSex()
this.getPosition('')
this.setPosition('')
}
});
this.workspace.id = rv.id
@@ -565,7 +582,7 @@ export default defineComponent({
this.workspaceItem.sex = v.name
this.getMannequins()
this.setMannequinsSex()
this.getPosition('sex')
this.setPosition('sex')
},
//设置single & overall

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

@@ -117,7 +117,7 @@
</div>
<div
class="delete_file_block"
@click="deleteFile(index)"
@click.stop="deleteFile(index)"
>
<span class="icon iconfont icon-shanchu"></span>
</div>
@@ -614,6 +614,7 @@ export default defineComponent({
},
deleteFile(item: any) {
// this.sketchboardList
this.collectionElementid = ''
this.sketchboardList.splice(item, 1);
// if (item.type_ == "generate" || item.type_ == "material") {
// let maxImg = 8

50
src/component/HomePage/NewCollectionReview.vue
View File

@@ -100,9 +100,7 @@ export default defineComponent({
// this.sketchList = []
// this.sketch = [[],[],[]]
// this.sketchList = this.allBoardData.sketchboardFiles
console.log(oldVal,newVal);
if(oldVal && oldVal?.length != 0){
if(oldVal && oldVal?.length != 0 && newVal && newVal?.length != 0){
let oldArr:any = []
let newArr:any = []
oldVal.forEach((item:any,index:any) => {
@@ -129,51 +127,41 @@ export default defineComponent({
},
methods: {
setSketch(){
console.log(123123);
if(!this.imgOpen){
return
}
this.imgOpen = false
this.sketch = [[],[],[]]
let sketchH = [0,0,0]
nextTick().then(async ()=>{
let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
let sketch2:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
let sketch3:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
sketch1.num = 0
sketch2.num = 1
sketch3.num = 2
if(this.sketchList && this.sketchList!=null){
for (let i = 0; i < this.sketchList?.length; i++) {
let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
let sketch2:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
let sketch3:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
sketch1.num = 0
sketch2.num = 1
sketch3.num = 2
let min = Math.min.apply(null, sketchH);
let index = sketchH.indexOf(min);
let arr = [sketch1,sketch2,sketch3]
let image = new Image()
let image:any = new Image()
image.src = this.sketchList[i].urlWithWhiteSide
arr.sort((a,b)=>{
var a_num = a["height"];
var b_num = b["height"];
return a_num - b_num;
})
// console.log(arr);
this.sketch[arr[0].num]?.push(this.sketchList[i])
// arr.sort((a,b)=>{
// var a_num = a["height"];
// var b_num = b["height"];
// return a_num - b_num;
// })
this.sketch[index]?.push(this.sketchList[i])
// this.sketch[arr[0].num]?.push(this.sketchList[i])
let dom = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item'+arr[0].num)[0]
let img = dom.querySelector('.element:last-child')
console.log(img);
// console.log([sketch1.height,sketch2.height,sketch3.height]);
await new Promise((resolve:any)=>{
image.onload = ()=>{
sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
sketch1.num = 0
sketch2.num = 1
sketch3.num = 2
sketchH[index]+=image.height * (300/image.width)
nextTick().then(()=>{
resolve()
setTimeout(()=>{
},500)
})
}
})

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

@@ -575,7 +575,7 @@ export default defineComponent({
level2Type:'',
text:this.captionGeneration,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
version:generage.printModel.num,//为1就是Print
version:generage.printModel.num?generage.printModel.num:1,//为1就是Print
gender:'',
}
if(generateType == 'image'){

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

@@ -172,7 +172,7 @@ export default defineComponent({
//操作移动
layout:{
mounted (el,layout:any,binding) {
el.addEventListener('mousedown',(e: MouseEvent)=>{
let mousedown = function(e: MouseEvent){
e.stopPropagation()
el.parentElement.children.forEach((v:any) => {
v.style.left = v.offsetLeft+'px'
@@ -210,9 +210,16 @@ export default defineComponent({
}
document.onmouseup = function(){
mouse = false
document.onmousemove = ()=>{
}
// el.removeEventListener('mousedown',mousedown)
// el.removeEventListener('mousedown',mousedown)
// document.onmousemove = false;
}
})
}
el.addEventListener('mousedown',mousedown)
},
updated (el,layout) {
@@ -284,6 +291,7 @@ export default defineComponent({
}
document.onmouseup = function(){
mouse = false
document.onmousemove = ()=>{}
}
})
}
@@ -302,7 +310,7 @@ export default defineComponent({
num = Number(transform[3])
}
// 添加鼠标按下事件监听器
el.addEventListener('mousedown', (e:MouseEvent) => {
let mousedown = (e:MouseEvent) => {
e.stopPropagation()
mouse = true;
// let eX = (e.pageX - el.offsetLeft) + el.offsetLeft
@@ -324,12 +332,14 @@ export default defineComponent({
});
// 添加鼠标松开事件监听器
document.addEventListener('mouseup', () => {
mouse = false;
// x = e.pageX
// y = e.pageY
});
});
document.addEventListener('mouseup',mouseup );
}
let mouseup = () => {
mouse = false;
// el.removeEventListener('mousedown',mousedown)
document.removeEventListener('mouseup',mouseup)
}
el.addEventListener('mousedown',mousedown);
//缩放
let timeSwitch = true
el.parentNode.addEventListener('mousemove', (e:MouseEvent) => {
@@ -446,15 +456,17 @@ export default defineComponent({
}
}
// 添加鼠标松开事件监听器
document.addEventListener('mouseup', () => {
mouse = false;
el.removeEventListener('mousemove',mouseMove)
el.parentNode.children.forEach((v:any) =>{
v.classList.remove('eventNode')
})
});
document.addEventListener('mouseup', mouseup);
}
let mouseup = () => {
mouse = false;
el.parentNode.removeEventListener('mousemove',mouseMove)
el.parentNode.children.forEach((v:any) =>{
v.classList.remove('eventNode')
})
document.removeEventListener('mouseup', mouseup);
}
el.parentNode.addEventListener('mousemove', mouseMove);
})
@@ -516,6 +528,7 @@ export default defineComponent({
}
document.onmouseup = function(){
mouse = false
document.onmousemove = ()=>{}
}
})
},

6
src/views/LibraryPage.vue
View File

@@ -248,7 +248,7 @@
</div>
<div class="upload_file_item_content" @click.stop="setSketchboardItem(file)" v-show="file?.status === 'done'">
<img :src="file?.imgUrl" class="upload_img" />
<div class="delete_file_block rightTop" @click="deleteFile(index)" >
<div class="delete_file_block rightTop" @click.stop="deleteFile(index)" >
<span class="icon iconfont icon-shanchu"></span>
</div>
</div>
@@ -433,11 +433,11 @@ export default defineComponent({
let checkbox = ref([
{
name: "image",
type: false,
type: true,
},
{
name: "text",
type: true,
type: false,
},
{
name: "text-image",

21
src/views/LoginPage.vue
View File

@@ -364,9 +364,23 @@ export default defineComponent({
//忘记密码填写完邮箱验证码进行下一步
submitPasswordCode(emailVerifyCode: any) {
this.forgetEmailValue = emailVerifyCode;
this.frogetPasswordStep = 3;
this.clearTimer();
// console.log(123123);
let data = {
email: this.forgetPasswordEmail,
emailVerifyCode: emailVerifyCode,
password: '',
verifyEmail:true,
};
Https.axiosPost(Https.httpUrls.accountResetPwd, data).then(
(rv: any) => {
if (rv) {
this.forgetEmailValue = emailVerifyCode;
this.frogetPasswordStep = 3;
this.clearTimer();
}
}
);
},
//改变勾选是否是机器人
@@ -471,6 +485,7 @@ export default defineComponent({
email: this.forgetPasswordEmail,
emailVerifyCode: this.forgetEmailValue,
password: md5(this.newPassword + "abc"),
verifyEmail:false,
};
Https.axiosPost(Https.httpUrls.accountResetPwd, data).then(
(rv: any) => {