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

修复导出少图片

Browse Source
This commit is contained in:
X1627315083
2023-11-23 15:31:40 +08:00
parent 2e2fe56e1c
commit c5820ca082
12 changed files with 91 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/assets/style/style.css
View File

@@ -385,12 +385,6 @@ li {
.operate_file_block .select_img_type .category_list .category_item:hover {
background: linear-gradient(-137deg, #eeefdb, #e7dbed);
}
.ant-modal-wrap {
z-index: 10001;
}
.ant-select-dropdown {
z-index: 10001;
}
.habit :deep(.ant-btn:hover),
:deep(.ant-btn:focus),
:deep(.ant-btn:active),

12
src/assets/style/style.less
View File

@@ -442,12 +442,12 @@ ul,li{
}
}
}
.ant-modal-wrap{
z-index: 10001;
}
.ant-select-dropdown{
z-index: 10001;
}
// .ant-modal-wrap{
// z-index: 10001;
// }
// .ant-select-dropdown{
// z-index: 10001;
// }
//提示框样式
.ant-modal-root{
.ant-modal-wrap{

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

@@ -61,7 +61,7 @@
<span>{{ $t('ColorboardUpload.UploadImage') }}</span>
</div>
<div class="upload_centetn">
<div class="upload_item">
<div class="upload_item Guide_1_10">
<div class="upload_file_item" v-for="(file) in fileList" :key="file">
<div class="upload_file_item_content" v-show="file.status !== 'done'">
<a-spin :indicator="indicator" tip="Uploading..."/>
@@ -84,7 +84,7 @@
</div>
</a-upload>
</div>
<div class="upload_color">
<div class="upload_color Guide_1_11">
<div v-for="color,index in selectColorList" :key="color" @click="setUplpadColor(color)" class="upload_color_item">
<div class="upload_color_item_bg" :style="{'background-color':`rgba(${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a})`}">
</div>
@@ -127,6 +127,7 @@ import {getUploadUrl,rgbToHsv} from '@/tool/util'
import {useStore} from 'vuex'
import ColorThief from '@/tool/colorthief/colorthief'
import { message,Upload} from 'ant-design-vue';
import { openGuide,driverObj__,driverIndex__ } from "@/tool/guide";
import { useI18n } from 'vue-i18n';
export default defineComponent({
components:{
@@ -368,8 +369,8 @@ export default defineComponent({
});
this.selectColorList = selectColorList
this.getHsvColor(selectColorList)
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
driverObj__.moveNext()
};
},100)
@@ -391,6 +392,7 @@ export default defineComponent({
},
setUplpadColor(color){
this.selectColor = color
driverObj__.moveTo(12)
},
beforeUpload(file){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';

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

@@ -6,7 +6,8 @@
:maskClosable="false"
:centered="true"
:closable="false"
:zIndex="999999"
:mask="false"
>
<div class="collection_title">
<div class="collection_title_text">
@@ -156,8 +157,19 @@ export default defineComponent({
}
})
</script>
<style lang="less">
.component_modal{
}
.cut_pricture_modal{
*{
pointer-events: auto;
}
}
</style>
<style lang="less" scoped>
.cut_pricture_modal{
max-width: 1150px ;
.collection_title{
position: absolute;

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

@@ -1,5 +1,5 @@
<template>
<div class="generate Guide_ Guide_1_6">
<div class="generate Guide_1_6">
<div v-if="type_.type2 == 'Sketchboard'|| type_.type2 == 'Printboard'" class="generate_checkbox">
<div>
<label>
@@ -40,7 +40,7 @@
</ul>
</div>
</div>
<div v-else class="input_box Guide_ Guide_1_5" :class="[inputShow?'active':'',]">
<div v-else class="input_box Guide_1_5" :class="[inputShow?'active':'',]">
<input
class="search_input"
@input="ifMaximumLength"
@@ -79,7 +79,7 @@
class="select_category"
@click.stop="showFileCategory(file)"
>
{{ file.category }}
{{ file.categoryValue }}
<div
:class="[
'icon',
@@ -98,7 +98,7 @@
<div
:class="[
'category_item',
file.category == cate.value
file.category == cate.name
? 'select_category_item'
: '',
]"
@@ -108,7 +108,7 @@
:key="index"
@click.stop="selectFileCategory(file, cate)"
>
{{ cate.label }}
{{ cate.value }}
</div>
</div>
</div>
@@ -489,7 +489,8 @@ export default defineComponent({
file.resData = res.data;
file.type_ = "upload";
file.id_ = GO.id++;
file.category = this.sketchCatecoryList?.[0]?.value;
file.category = this.sketchCatecoryList?.[0]?.name;
file.categoryValue = this.sketchCatecoryList?.[0]?.value;
let fileList = this.sketchboardList.filter(
(v: any) => v.status === "done"
);
@@ -517,7 +518,7 @@ export default defineComponent({
document.addEventListener("click", this.hiddenFileCategory);
},
selectFileCategory(file: any, cate: any) {
file.category = cate.value;
file.category = cate.name;
file.categoryShow = false
// this.store.commit("setSketchboardFile", this.sketchboardList);
},

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

@@ -299,7 +299,7 @@ export default defineComponent({
let arr
if(this.type_.type2 == 'Sketchboard'){
arr = this.store.state.UploadFilesModule.sketchMaterialFiles
item.categoryValue = item.level2Type;
item.categoryValue = item.level2TypeEnum.value;
item.category = item.level2Type;
item.categoryShow = false;
}else if(this.type_.type2 == 'Moodboard'){

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

@@ -18,7 +18,7 @@
</div>
<div
@click.stop="open(3)"
class="switch_type_item Guide_ Guide_1_4"
class="switch_type_item Guide_1_4"
:class="[openClick == 3 ? 'select_swtich' : '']"
>
<span>{{ $t('MoodboardUpload.Generate') }}</span>
@@ -109,7 +109,7 @@
></Generate>
</div>
<div v-show="moodboarList.length" class="modal_right">
<div class="modal_layout Guide_ Guide_1_7">
<div class="modal_layout Guide_1_7">
<div class="modal_text">
<div>
{{ $t('MoodboardUpload.Thumbnail') }}

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

@@ -144,6 +144,7 @@ import Material from '@/component/HomePage/Material.vue'
import Generate from "@/component/HomePage/Generate.vue";
import GO from "@/tool/GO";
import { useI18n } from 'vue-i18n';
import { openGuide,driverObj__ } from "@/tool/guide";
export default defineComponent({
components:{
@@ -156,7 +157,10 @@ export default defineComponent({
let fileList:any = ref([]),//选中的文件id数据
printImgList:any = ref([]), //print的印花图片
moodBoards:any = computed(()=>{return store.state.UploadFilesModule.moodboard}),
printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
printBoards:any = computed(()=>{
return store.state.UploadFilesModule.printboard
})
let openClick: any = ref(1);
let generateCheckbox:any = ref()
let generateList:any = ref([])
@@ -192,6 +196,15 @@ export default defineComponent({
}
},
watch:{
printBoards:{
handler(newVal:any,oldVal:any){
if(newVal.length>=2){
driverObj__.moveTo(9)
}
}
}
},
data(){
return {
swtich_type:'upload',

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

@@ -262,6 +262,7 @@ import { message, Upload } from "ant-design-vue";
import Material from "@/component/HomePage/Material.vue";
import Generate from "@/component/HomePage/Generate.vue";
import { Https } from "@/tool/https";
import { openGuide,driverObj__ } from "@/tool/guide";
import { useI18n } from "vue-i18n";
export default defineComponent({
components: { Material, Generate },
@@ -271,6 +272,8 @@ export default defineComponent({
let generateList:any = ref([
])
let store:any =useStore()
let generateCheckbox:any = ref()
let loadingShow = ref(false)
@@ -278,19 +281,24 @@ export default defineComponent({
let workspace:any = ref({})
let inputShow = ref(false)
let inputTime = ref()
let sketchboardList:any = computed(()=>{
return store.state.UploadFilesModule.sketchboard
})
let {t} = useI18n()
let isTest = ref()
return {
fileList,
openClick,
generateList,
store,
generateCheckbox,
loadingShow,
sketchCatecoryList,
workspace,
inputShow,
inputTime,
sketchboardList,
t,
isTest,
};
@@ -311,11 +319,7 @@ export default defineComponent({
},
token: "",
uploadUrl: "",
store: useStore(),
captionGeneration:'',
sketchboardList:computed(()=>{
return useStore().state.UploadFilesModule.sketchboard
}),
workspaceCom:{}
};
},
@@ -338,6 +342,13 @@ export default defineComponent({
this.workspace = newVal
this.getPosition()
},
sketchboardList:{
handler(newVal:any,oldVal:any){
if(newVal.length>=2){
driverObj__.moveTo(14)
}
}
}
},
mounted() {
this.token = getCookie("token") || "";

11
src/component/HomePage/collectionModal.vue
View File

@@ -1,6 +1,6 @@
<template>
<div v-if="showCollectionModal">
<a-modal class="modal_component collection_modal Guide_ Guide_1_2"
<a-modal class="modal_component collection_modal Guide_1_2"
v-model:visible="showCollectionModal"
:footer="null"
width="65%"
@@ -26,19 +26,19 @@
</div>
</div>
<div class="collection_closeIcon" @click.stop="cancelDsign()">
<div class="collection_closeIcon" :class="[driver__.driver?'hideEvents':'']">
<!-- <div class="header_right_block" @click.stop="">
<div class="header_cancel_button" >Cancel</div>
</div> -->
<i class="fi fi-rr-cross-small"></i>
<i class="fi fi-rr-cross-small" @click.stop="cancelDsign()"></i>
</div>
<div class="collection_page" :class="[driver__.driver?'hideEvents':'']">
<!-- <div v-if="collectionStep < 5" class="next_step_button" @click.stop="nextStep()">Next Step</div> -->
<!-- <div v-else class="next_step_button" @click.stop="finishCollection()">Finish</div> -->
<i v-show="collectionStep > 1" class="fi fi-rr-arrow-small-left" @click="lastStep()"></i>
<i v-if="collectionStep < 4" class="fi fi-rr-arrow-small-right Guide_ Guide_1_8" @click.stop="nextStep()"></i>
<i v-if="collectionStep < 4" class="fi fi-rr-arrow-small-right Guide_1_8" @click.stop="nextStep()"></i>
<!-- <i v-else class="fi fi-rr-arrow-small-right" @click.stop="finishCollection()"></i> -->
<i v-else class="fi fi-rr-check" @click.stop="finishCollection()"></i>
<i v-else class="fi fi-rr-check Guide_1_14" @click.stop="finishCollection()"></i>
<!-- <span class="icon iconfont icon-fanhui header_icon_fanhui" @click="lastStep()"></span> -->
</div>
@@ -176,6 +176,7 @@ export default defineComponent({
this.showCollectionModal =false
this.collectionStep = 1
this.$emit('finishCollection')
driverObj__.moveNext()
}
}
})

15
src/tool/guide.js
View File

@@ -4,6 +4,7 @@ import { useStore } from "vuex";
//版本一
let driverIndex__ = 0
let store
let element
const driverObj__ = driver({
steps: [
{ element: '#Guide_1_1', popover: { title: 'Title', description: 'Description' } },
@@ -15,6 +16,14 @@ const driverObj__ = driver({
{ element: '.Guide_1_7', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_8', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_8', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_10', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_11', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_8', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_14', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_15', popover: { title: 'Title', description: 'Description' } },
],
// showProgress: true,//控制总页数和当前页数是否显示
allowClose:false,
@@ -27,6 +36,9 @@ const driverObj__ = driver({
overlay: true,
onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
// console.log(popover,options);
if(element){
element.classList.remove('Guide_')
}
popover.previousButton.style.display = 'none'
if(options.state.activeIndex >= 1 && options.state.activeIndex <= 2){
popover.footer.style.display = 'block'
@@ -42,6 +54,9 @@ const driverObj__ = driver({
driver:true,
}
store?.commit("setGuide", data);
element = options.state.activeElement
element.classList.add('Guide_')
},
// onNextClick:(element, step, options) =>{
// console.log(element,step,options);

8
src/views/HomeView.vue
View File

@@ -49,7 +49,7 @@
<div class="right_top">
<div class="right_top_left">
<div class="button_second" @click="designNewCollection()">
<div class="button_second Guide_1_15" @click="designNewCollection()">
{{ $t('HomeView.Design') }}
</div>
<div class="button_first button_margin_14" v-show="designCollectionId"
@@ -910,9 +910,10 @@ export default defineComponent({
let num = 0
for (let key in allBoardData) {
if (key !== "colorBoards" && key !== "moodTemplateId") {
if(!this.exportNav[num]?.change){
}else{
if(this.exportNav[num]?.change || key == 'disposeMoodboard'){
for (let item of allBoardData[key]) {
if(key == 'disposeMoodboard'){
}
let nameTail = item?.imgUrl?.split(".").pop().split("?").shift();
let data = {
imgUrl: item.imgUrl,
@@ -925,6 +926,7 @@ export default defineComponent({
img.push(data);
index++;
}
}else{
}
num++
}