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-07 14:26:21 +08:00
parent 1ffdfba500
commit 6e0cc3156d
11 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,7 +362,7 @@ export default defineComponent({
if(this.driver__.driver){
nextTick().then(()=>{
// driverObj__.moveNext();
driverObj__.moveTo(20);
driverObj__.moveTo(21);
})
}
}

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

@@ -595,7 +595,7 @@ export default defineComponent({
if(this.driver__.driver){
nextTick().then(()=>{
// driverObj__.moveNext();
driverObj__.moveTo(28);
driverObj__.moveTo(29);
})
}

13
src/component/HomePage/Cropper.vue
View File

@@ -1,5 +1,6 @@
<template>
<a-modal class="modal_component cut_pricture_modal"
<a-modal class="modal_component cut_pricture_modal Guide_1_2_2"
:class="[driver__.driver?'showEvents':'']"
v-model:visible="cutPicuterModal"
:footer="null"
width="65%"
@@ -70,15 +71,22 @@
</a-modal>
</template>
<script lang="ts">
import { defineComponent } from 'vue'
import { defineComponent,inject } from 'vue'
import 'vue-cropper/dist/index.css'
import { VueCropper } from "vue-cropper";
import { openGuide,driverObj__ } from "@/tool/guide";
import {base64toFile} from '@/tool/util'
export default defineComponent({
props:['cropperFileData','isUpload'],
components:{
VueCropper,
},
setup(){
let driver__:any = inject('driver__')
return {
driver__
}
},
data(){
return {
cutPicuterModal:false,
@@ -142,6 +150,7 @@ export default defineComponent({
let file = base64toFile(data,this.cropperFileData.name);
this.$emit('handleCropperSuccess',{file:file, fileData:this.cropperFileData})
})
},
closeCropper(){

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

@@ -339,7 +339,7 @@ export default defineComponent({
this.store.commit("addGenerateMaterialFils", data);
// console.log(this.fileList);
let moodboard = this.store.state.UploadFilesModule.moodboard
if(moodboard.length >= 3 && this.driver__.driver){
if(moodboard.length >= 1 && this.driver__.driver){
driverObj__.moveNext()
}
},

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

@@ -109,12 +109,12 @@
></Generate>
</div>
<div v-show="moodboarList.length" class="modal_right">
<div class="modal_layout Guide_1_7" :class="[driver__.driver?'showEvents':'']">
<div class="modal_layout">
<div class="modal_text">
<div>
{{ $t('MoodboardUpload.Thumbnail') }}
</div>
<div class="modal_btn started_btn" @click="layout()">{{ $t('MoodboardUpload.layout') }}</div>
<div class="modal_btn started_btn Guide_1_7" :class="[driver__.driver?'showEvents':'']" @click="layout()">{{ $t('MoodboardUpload.layout') }}</div>
</div>
<div class="modal_img" :class="[driver__.driver?'hideEvents':'']">
<div class="modal_img_item" v-for="item,index in moodboarList" :key="item" @click="deleteFile(item)">

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

@@ -51,7 +51,7 @@
</div>
</div>
<div class="upload_file_item upload_component" v-show="printboardList.length < 8">
<div class="upload_file_item upload_component Guide_1_2_1" :class="[driver__.driver?'showEvents':'']" v-show="printboardList.length < 8">
<a-upload
:action="uploadUrl + '/api/element/upload'"
list-type="picture-card"
@@ -62,7 +62,7 @@
:headers="{Authorization:token}"
v-model:file-list="fileList"
:customRequest="function(){}"
multiple
:multiple="!driver__.driver"
:maxCount="8 - printboardList.length+fileList.length"
accept=".jpg,.png,.jpeg,.bmp"
@change="fileUploadChange"
@@ -132,7 +132,7 @@
</div>
</template>
<script lang="ts">
import { defineComponent,h,ref,computed,inject } from 'vue'
import { defineComponent,h,ref,computed,inject, nextTick } from 'vue'
import { LoadingOutlined } from '@ant-design/icons-vue';
import {getCookie} from '@/tool/cookie'
import {getUploadUrl} from '@/tool/util'
@@ -201,9 +201,9 @@ export default defineComponent({
watch:{
printBoards:{
handler(newVal:any,oldVal:any){
if(newVal.length>=2 && this.driver__.driver && newVal.length!=oldVal.length){
driverObj__.moveTo(7)
}
// if(newVal.length>=2 && this.driver__.driver && newVal.length!=oldVal.length){
// driverObj__.moveTo(7)
// }
}
}
},
@@ -250,17 +250,19 @@ export default defineComponent({
},
fileUploadChange(data:any){
let file = data.file
let res = JSON.parse(file.xhr.response);
// let res = JSON.parse(data?.xhr?.response);
file.id_ = GO.id++
file.type_ = {
type1:'upload',
type2:'Printboard'
};
file.pin = false;
file.id = res.data.id
// file.id = res.data.id?res.data.id:""
let Cropper:any = this.$refs.Cropper
if(this.currentFileNum === 1){
var reader = new FileReader();
reader.onload = (e:any) => {
let data_new;
if (typeof e.target.result === 'object') {
@@ -270,6 +272,8 @@ export default defineComponent({
data_new = e.target.result;
}
Cropper.getOptionImg(data_new)
};
// 转化为base64
// reader.readAsDataURL(file)
@@ -277,7 +281,11 @@ export default defineComponent({
reader.readAsArrayBuffer(file.originFileObj);
this.cropperFileData = file
Cropper.changeShowModal(true)
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
}else{
this.customRequest(file)
}
@@ -445,6 +453,11 @@ export default defineComponent({
this.cropperFileData = {name:'',uid:''}
this.store.commit('setPrintboardFile',fileList)
hide()
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
}
).catch(res=>{
let index = -1

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

@@ -66,6 +66,7 @@
</div>
<div
class="category_list Guide_1_13_1"
:class="[driver__.driver?'showEvents':'']"
v-show="file.categoryShow"
>
<div
@@ -110,7 +111,8 @@
</div>
</div>
<div
class="upload_file_item upload_component"
class="upload_file_item upload_component Guide_1_9"
:class="[driver__.driver?'showEvents':'']"
v-show="sketchboardList.length < 8"
>
<a-upload
@@ -119,10 +121,10 @@
:data="{
...upload,
}"
:multiple="!driver__.driver"
:before-upload="beforeUpload"
:headers="{ Authorization: token }"
v-model:file-list="fileList"
multiple
:maxCount="8 - sketchboardList.length+fileList.length"
accept=".jpg,.png,.jpeg,.bmp"
@change="(file) => fileUploadChange(file)"
@@ -348,7 +350,7 @@ export default defineComponent({
handler(newVal:any,oldVal:any){
if(newVal.length>=2 && this.driver__.driver&& newVal.length!=oldVal.length){
if(this.driver__.driver){
driverObj__.moveTo(16)
driverObj__.moveTo(17)
}
}
}
@@ -423,7 +425,7 @@ export default defineComponent({
this.store.commit("setSketchboardFile", fileList);
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveTo(14)
driverObj__.moveTo(15)
}
})
@@ -462,7 +464,7 @@ export default defineComponent({
file.categoryShow = true;
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveTo(15)
driverObj__.moveTo(16)
}
})