fix
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user