This commit is contained in:
X1627315083
2023-12-15 15:23:34 +08:00
parent 909ea7ac2f
commit fc4403c6ca
48 changed files with 211 additions and 107 deletions

View File

@@ -73,7 +73,7 @@
import { defineComponent,inject } from 'vue'
import 'vue-cropper/dist/index.css'
import { VueCropper } from "vue-cropper";
import { openGuide,driverObj__ } from "@/tool/guide";
// import { openGuide,driverObj__ } from "@/tool/guide";
import {base64toFile} from '@/tool/util'
export default defineComponent({
props:['cropperFileData','isUpload'],

View File

@@ -187,7 +187,7 @@ import { useStore } from "vuex";
import GO from "@/tool/GO";
import { getCookie } from "@/tool/cookie";
import { getUploadUrl } from "@/tool/util";
import { forEach } from "jszip";
// import { forEach } from "jszip";
import scaleImage from "@/component/HomePage/scaleImage.vue";
import { openGuide,driverObj__,driverIndex__ } from "@/tool/guide";
import { useI18n } from "vue-i18n";
@@ -587,6 +587,7 @@ export default defineComponent({
}
if(item.checked){
item.checked = false
this.collectionElementid = ''
}else{
this.sketchboardList.forEach((v:any)=>{
if(v.checked){
@@ -594,8 +595,8 @@ export default defineComponent({
}
})
item.checked = true
this.collectionElementid = item.id
}
this.collectionElementid = item.id
this.level2Type = item.category
if(this.driver__.driver){
driverObj__.moveNext()

View File

@@ -267,17 +267,6 @@ export default defineComponent({
imgData.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
this.store.commit("addGenerateMaterialFils", imgData);
},
//改变页码
changePage(current: number, pageSize: number){
this.currentPage = current
this.pageSize = pageSize
this.getLibraryList('')
},
handleChange(){
this.getLibraryList('')
},
//选择所有的图片
getLibraryList(str:any){
let workspace = this.store.state.Workspace.workspace
@@ -338,15 +327,6 @@ export default defineComponent({
).catch((res)=>{
this.isShowLoading = false
});
},
closeModal(){
this.myMaterialModalShow = false
this.searchPictureName = ''
this.designType = null
this.imgList = []
this.currentPage = 1
this.pageSize = 10
this.total = 0
},
showFileCategory(file: any) {
file.categoryShow = true;

View File

@@ -170,7 +170,6 @@ import GO from "@/tool/GO";
import moodb from "@/tool/moodb";
import { useI18n } from "vue-i18n";
import { openGuide,driverObj__ } from "@/tool/guide";
import { driver } from "driver.js";
export default defineComponent({
components: { Material, MoodTemplate, Generate,layout,layoutMobile },
setup() {

View File

@@ -100,9 +100,14 @@ export default defineComponent({
// this.sketchList = []
// this.sketch = [[],[],[]]
// this.sketchList = this.allBoardData.sketchboardFiles
if(JSON.stringify(newVal)!=JSON.stringify(oldVal)){
if(oldVal){
if(JSON.stringify(newVal)!=JSON.stringify(oldVal)){
this.setSketch()
}
}else{
this.setSketch()
}
},
immediate: true
@@ -126,7 +131,7 @@ export default defineComponent({
sketch1.num = 0
sketch2.num = 1
sketch3.num = 2
if(this.sketchList){
if(this.sketchList && this.sketchList!=null){
for (let i = 0; i < this.sketchList.length; i++) {
let arr = [sketch1,sketch2,sketch3]
let image = new Image()

View File

@@ -578,9 +578,9 @@ export default defineComponent({
version:generage.printModel.num,//为1就是Print
gender:'',
}
if(generateType == 'image'||generateType == 'text-image'){
if(generateType == 'image'){
if(generage?.collectionElementid){
data.text = ''
}else{
message.info(
this.t('PrintboardUpload.jsContent4')
@@ -606,9 +606,28 @@ export default defineComponent({
);
return
}
}
if(generateType == 'image'){
data.text = ''
}else if(generateType == 'text-image'){
if(generage?.collectionElementid){
if(this.captionGeneration){
let arr = this.captionGeneration.split(/\s+/).length
if(arr > 75){
message.info(
this.t('PrintboardUpload.jsContent5')
);
return
}
}else{
message.info(
this.t('PrintboardUpload.jsContent6')
);
return
}
}else{
message.info(
this.t('PrintboardUpload.jsContent4')
);
return
}
}
this.loadingShow = true
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(

View File

@@ -231,7 +231,7 @@ export default defineComponent({
}
})
},
scaleImage(img){
scaleImage(img:any){
let scaleImage:any = this.$refs.scaleImage
img.forEach((item:any) => {
item.imgUrl = item.presignedUrl

View File

@@ -681,37 +681,57 @@ export default defineComponent({
version:1,//为1就是Print
gender:this.workspace.sex,
}
if(generateType == 'image'||generateType == 'text-image'){
if(generateType == 'image'){
if(generage?.collectionElementid){
data.text = ''
}else{
message.info(
this.t('SketchboardUpload.jsContent5')
this.t('PrintboardUpload.jsContent4')
);
return
}
}else if(generateType == 'text'){
// this.beforeUpload(false)
data.collectionElementId = ''
data.level2Type = ''
// this.beforeUpload(false)
if(this.captionGeneration){
let arr = this.captionGeneration.split(/\s+/).length
if(arr > 75){
message.info(
this.t('SketchboardUpload.jsContent6')
this.t('PrintboardUpload.jsContent5')
);
return
}
}else{
message.info(
this.t('PrintboardUpload.jsContent6')
);
return
}
}else if(generateType == 'text-image'){
if(generage?.collectionElementid){
if(this.captionGeneration){
let arr = this.captionGeneration.split(/\s+/).length
if(arr > 75){
message.info(
this.t('PrintboardUpload.jsContent5')
);
return
}
}else{
message.info(
this.t('PrintboardUpload.jsContent6')
);
return
}
}else{
message.info(
this.t('SketchboardUpload.jsContent7')
this.t('PrintboardUpload.jsContent4')
);
return
}
}
if(generateType == 'image'){
data.text = ''
}
this.loadingShow = true
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
(rv) => {

View File

@@ -73,7 +73,7 @@ import {useStore} from 'vuex'
import { openGuide,driverObj__ } from "@/tool/guide";
import GO from "@/tool/GO";
import { useI18n } from 'vue-i18n'
import { position } from 'html2canvas/dist/types/css/property-descriptors/position'
// import { position } from 'html2canvas/dist/types/css/property-descriptors/position'
export default defineComponent({
components:{
Generate,
@@ -230,7 +230,10 @@ export default defineComponent({
top.forEach((positionItem:any) => {
if(item.category == positionItem && item.pin){
numTop++
}else{
}
});
top.forEach((positionItem:any) => {
if(item.category == positionItem && item.pin){
numBottom++
}
});

View File

@@ -106,7 +106,7 @@
<script lang="ts">
import { defineComponent, h, ref ,computed,reactive, nextTick} from "vue";
import { LoadingOutlined } from "@ant-design/icons-vue";
// import { LoadingOutlined } from "@ant-design/icons-vue";
import { useStore } from "vuex";
import GO from "@/tool/GO";
import moodb from "@/tool/moodb";

View File

@@ -50,9 +50,9 @@
<script lang="ts">
import { defineComponent, h, ref ,computed,reactive, nextTick} from "vue";
import { Https } from "@/tool/https";
import { getCookie } from "@/tool/cookie";
import domTurnImg from '@/tool/domTurnImg'
// import { Https } from "@/tool/https";
// import { getCookie } from "@/tool/cookie";
// import domTurnImg from '@/tool/domTurnImg'
import { downloadIamge } from "@/tool/util";
export default defineComponent({